Skip to content

remove: prisma exec #639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aster-void merged 2 commits into from
Feb 11, 2025
Merged

remove: prisma exec #639

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0f75cf
remove: prisma exec
aster-void Feb 11, 2025
66e2b1a
Merge branch 'main' into remove-prisma-exec
aster-void Feb 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand All @@ -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."

Expand All @@ -95,8 +89,8 @@ sync-web:
# copy .env.sample -> .env only if .env is not there

sync-server:
cd server; bun install
cd server; if command -v prisma; then prisma generate; else bunx prisma generate; fi
cd server; bun install --frozen-lockfile
cd server; bun prisma generate
# copy .env.sample -> .env only if .env is not there

sync-root:
Expand Down