fix: remove knex file from database folder

Greenstand · Mar 15, 2022 · a635b1c · a635b1c
1 parent e96b93a
commit a635b1c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 32 deletions.
diff --git a/database/knex.js b/database/knex.js
diff --git a/server/database/knex.js b/server/database/knex.js
@@ -1,19 +1,26 @@
+require('dotenv').config();
+const expect = require('expect-runtime');
+const knex = require('knex');
 const log = require('loglevel');
+const connection = require('../../config/config').connectionString;
+
+expect(connection).to.match(/^postgresql:\//);
 
 const knexConfig = {
   client: 'pg',
   debug: process.env.NODE_LOG_LEVEL === 'debug',
-  connection: process.env.DATABASE_URL,
-  pool: { min: 0, max: 100 },
+  connection,
+  pool: {
+    min: 0,
+    max: 100,
+  },
 };
 
 log.debug(process.env.DATABASE_SCHEMA);
 if (process.env.DATABASE_SCHEMA) {
   log.info('setting a schema');
-  knexConfig.searchPath = [process.env.DATABASE_SCHEMA, 'public'];
+  knexConfig.searchPath = [process.env.DATABASE_SCHEMA];
 }
 log.debug(knexConfig.searchPath);
 
-const knex = require('knex')(knexConfig);
-
-module.exports = knex;
+module.exports = knex(knexConfig);