From c0f75cf16f3e8b8cef4d3f84eda1e4f4543a8ea6 Mon Sep 17 00:00:00 2001 From: aster <137767097+aster-void@users.noreply.github.com> Date: Tue, 11 Feb 2025 18:14:22 +0900 Subject: [PATCH] remove: prisma exec --- Makefile | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 0e1075ce..f5ec3b97 100644 --- a/Makefile +++ b/Makefile @@ -22,11 +22,7 @@ sync: sync-server sync-web sync-root sync-common make generate-sql || true generate-sql: - @cd server; \ - if command -v dotenv && command -v prisma; \ - then dotenv -e .env.dev -- prisma generate --sql; \ - else bunx dotenv -e .env.dev -- bunx prisma generate --sql; \ - fi + @cd server; bunx dotenv -e .env.dev -- bunx prisma generate --sql start: start-all # build -> serve build: build-server build-web @@ -62,7 +58,7 @@ docker-watch: docker compose up --build --watch seed: - cd server; if command -v prisma; then prisma db seed; else bunx prisma db seed; fi + cd server; bunx prisma db seed ## server/.envをDATABASE_URL=postgres://user:password@localhost:5432/databaseにしてから行う dev-db: export DATABASE_URL=$(LOCAL_DB) @@ -82,9 +78,7 @@ dev-db: sleep 1; \ done @echo "PostgreSQL is ready. Running seed..." - @cd server; if command -v prisma; then \ - prisma generate; prisma db push; else \ - bunx prisma generate; bunx prisma db push; fi + @cd server; bunx prisma generate; bunx prisma db push @make seed @echo "Seeding completed." @@ -96,7 +90,7 @@ sync-web: sync-server: cd server; bun install --frozen-lockfile - cd server; if command -v prisma; then prisma generate; else bunx prisma generate; fi + cd server; bun prisma generate # copy .env.sample -> .env only if .env is not there sync-root: