feat(db): cleanup Makefile database handling and env vars

Author: djMax

src/dependencies.ts

@@ -48,6 +48,7 @@ export function devDependencies({ features }: { features: string[] }) {
   };
   if (features.includes('db')) {
     Object.assign(deps, {
+      'run-pg-sql': '^1.1.0',
       'db-migrate': '^0.11.13',
       'db-migrate-pg': '^1.3.0',
       'kysely-codegen': '^0.10.0',

templates/all/Makefile

@@ -4,9 +4,9 @@
 src_files := $(shell find src -name '*.ts')
 build_files := $(patsubst src/%.ts,build/%.js,$(src_files))
 
-PGUSER := postgres
-PGPASSWORD := postgres
-PGHOST := localhost
+export PGUSER ?= postgres
+export PGPASSWORD ?= postgres
+export PGHOST ?= localhost
 
 all: service {{#inArray features 'db'}}dbi {{/inArray}}$(word 1, $(build_files))
 
@@ -22,19 +22,25 @@ service: src/generated/service/index.ts
 
 {{#inArray features 'db'}}
 db-ci:
-	PGHOST=$(PGHOST) PGUSER=$(PGUSER) PGPASSWORD=$(PGPASSWORD) yarn dlx run-pg-sql -q postgres ./migrations/setup/ci_setup.sql
-	PGHOST=$(PGHOST) PGUSER=$(PGUSER) PGPASSWORD=$(PGPASSWORD) yarn dlx run-pg-sql -q postgres ./migrations/setup/db_setup.sql
+	yarn run-pg-sql -q postgres ./migrations/setup/ci_setup.sql
+	yarn run-pg-sql -q postgres ./migrations/setup/db_setup.sql
 	yarn migration:apply
-	PGHOST=$(PGHOST) PGUSER=$(PGUSER) PGPASSWORD=$(PGPASSWORD) yarn dlx run-pg-sql {{dbName}} ./migrations/setup/dev_setup.sql
+	yarn run-pg-sql {{dbName}} ./migrations/setup/dev_setup.sql
 
 db-drop:
-	PGHOST=$(PGHOST) PGUSER=$(PGUSER) PGPASSWORD=$(PGPASSWORD) yarn dlx run-pg-sql -q {{dbName}} ./migrations/setup/db_clean.sql || true
+	yarn run-pg-sql -q {{dbName}} ./migrations/setup/db_clean.sql || true
+
+db+:
+	yarn migration:apply
+
+db-:
+	yarn migration:undo
 
 db-clean: db-drop db-ci
 
 dbi:
 	echo "Generating database types"
-	DATABASE_URL=postgres://postgres:postgres@localhost/{{dbName}} yarn kysely-codegen \
+	DATABASE_URL=postgres://$(PGUSER):$(PGPASSWORD)@$(PGHOST)/{{dbName}} yarn kysely-codegen \
 		--dialect postgres --schema public \
 		--out-file src/generated/database.ts
 {{/inArray}}