fix prisma

Author: aster-void

Makefile

@@ -16,7 +16,6 @@ setup-ci:
 	make generate-sql
 
 sync: sync-server sync-web sync-root sync-common
-	bunx lefthook install || true
 	@echo '----------------------------------------------------------------------------------------------------------'
 	@echo '| Most work is done. now running prisma-generate-sql (which might fail if .env.dev is not set configured)|'
 	@echo '----------------------------------------------------------------------------------------------------------'
@@ -56,7 +55,7 @@ docker-watch:
 	docker compose up --build --watch
 
 seed:
-	cd server; bunx prisma db seed
+	cd server; if command -v prisma; then prisma db seed; else bunx prisma db seed; fi
 
 ## server/.envをDATABASE_URL=postgres://user:password@localhost:5432/databaseにしてから行う
 dev-db: export DATABASE_URL=$(LOCAL_DB)
@@ -76,7 +75,9 @@ dev-db:
 		sleep 1; \
 	done
 	@echo "PostgreSQL is ready. Running seed..."
-	@cd server; bunx prisma generate; bunx prisma db push; cd ..
+	@cd server; if command -v prisma; then \
+		prisma generate; prisma db push; else \
+		bunx prisma generate; bunx prisma db push; fi
 	@make seed;
 	@echo "Seeding completed."
 
@@ -88,7 +89,7 @@ sync-web:
 
 sync-server:
 	cd server; bun install --frozen-lockfile
-	cd server; bunx prisma generate
+	cd server; if command -v prisma; then prisma generate; else bunx prisma generate; fi
 	# copy .env.sample -> .env only if .env is not there
 
 sync-root:

flake.nix

@@ -27,6 +27,7 @@
             biome
             pkg-config
             openssl
+            pkgs.prisma
           ] ++ [
             rust-pkgs
           ];

package.json

@@ -4,7 +4,8 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "prepare": "lefthook install"
   },
   "keywords": [],
   "author": "",

server/prisma/schema.prisma

@@ -70,7 +70,6 @@ model Interest {
   subject   InterestSubject @relation(fields: [subjectId], references: [id])
 
   @@unique([userId, subjectId])
->>>>>>> main
 }
 
 // enum Gender {