Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-10-27 11:02:16 +01:00
Code Issues Projects Releases Wiki Activity

use options obj

Browse Source
This commit is contained in:
sveisvei 2016-11-13 15:15:33 +01:00 committed by Ivar Conradi Østhus
parent 7894ddda7d
commit cad07cc6ec
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/db/db-pool.js
View File

@ -2,12 +2,12 @@
const knex = require('knex'); const knex = require('knex');
module.exports.createDb = function (databaseConnection, schema = 'public') { module.exports.createDb = function ({ databaseUri, poolMin = 2, poolMax = 20, databaseSchema = 'public' }) {
const db = knex({ const db = knex({
client: 'pg', client: 'pg',
connection: databaseConnection, connection: databaseUri,
pool: { min: 2, max: 20 }, pool: { min: poolMin, max: poolMax },
searchPath: schema, searchPath: databaseSchema,
}); });
return db; return db;

2
lib/db/index.js
View File

@ -9,7 +9,7 @@ const ClientMetricsStore = require('./client-metrics-store');
const ClientStrategyStore = require('./client-strategy-store'); const ClientStrategyStore = require('./client-strategy-store');
module.exports.createStores = (config) => { module.exports.createStores = (config) => {
const db = createDb(config.databaseUri, config.databaseSchema); const db = createDb(config);
const eventStore = new EventStore(db); const eventStore = new EventStore(db);
return { return {

13
migrator.js
View File

@ -1,13 +1,12 @@
'use strict'; 'use strict';
const DBMigrate = require('db-migrate'); const { getInstance } = require('db-migrate');
const path = require('path');
const parseDbUrl = require('parse-database-url'); const parseDbUrl = require('parse-database-url');
function migrateDb (dbUrl, schema = "public") { function migrateDb ({ databaseUri, databaseSchema = 'public' }) {
const custom = parseDbUrl(dbUrl); const custom = parseDbUrl(databaseUri);
custom.schema = schema; custom.schema = databaseSchema;
const dbmigrate = DBMigrate.getInstance(true, { const dbmigrate = getInstance(true, {
cwd: __dirname, cwd: __dirname,
config: { custom }, config: { custom },
env: 'custom' } env: 'custom' }
@ -15,4 +14,4 @@ function migrateDb (dbUrl, schema = "public") {
return dbmigrate.up(); return dbmigrate.up();
} }
module.exports = migrateDb; module.exports = migrateDb;