chore(db): update migrations to use DATABASE_URL

diff --git a/knexfile.ts b/knexfile.ts
index 8a898f88b092da809527dc75e678190637620362..92d17cdafe2da9cc72330be8d44320ef0623188d 100644 (file)
--- a/knexfile.ts
+++ b/knexfile.ts
@@ -2,14 +2,13 @@ import { config as dotenv } from 'dotenv';
 import type { Knex } from "knex";
 
 dotenv();
+
+const connectionUrl = process.env.DATABASE_URL;
+
 const config: { [key: string]: Knex.Config } = {
   development: {
     client: "pg",
-    connection: {
-      database: process.env.PG_DATABASE,
-      user: process.env.PG_USER,
-      password: process.env.PG_PASSWORD
-    },
+    connection: connectionUrl,
     pool: {
       min: 2,
       max: 10
@@ -21,11 +20,7 @@ const config: { [key: string]: Knex.Config } = {
 
   production: {
     client: "pg",
-    connection: {
-      database: process.env.PG_DATABASE,
-      user: process.env.PG_USER,
-      password: process.env.PG_PASSWORD
-    },
+    connection: connectionUrl,
     pool: {
       min: 2,
       max: 10

diff --git a/package.json b/package.json
index c48c9548d7a44c7f9b1b774e7c7cf99b2d1e0c5b..e692d29f8801ecea307f177883e9cb914a2594d8 100644 (file)
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "build": "npx tsc && npx webpack",
     "postbuild": "cp -R public dist/",
     "migrate": "npx ts-node ./node_modules/knex/bin/cli.js migrate:latest",
-    "migrate:prod": "echo $DATABASE_URL && NODE_ENV=production npx ts-node ./node_modules/knex/bin/cli.js migrate:latest",
+    "migrate:prod": "NODE_ENV=production npx ts-node ./node_modules/knex/bin/cli.js migrate:latest",
     "seed": "npx ts-node ./node_modules/knex/bin/cli.js seed:run",
     "seed:prod": "NODE_ENV=production npm run seed",
     "dev:client": "npx webpack -w",