Skip to content
This repository was archived by the owner on Jan 20, 2020. It is now read-only.

Commit d591a5d

Browse files
author
Luciano Nooijen
committed
Improved database instance creation structure
1 parent e8c1974 commit d591a5d

File tree

8 files changed

+9
-117
lines changed

8 files changed

+9
-117
lines changed

‎database/generate-knexfile.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ const generateKnexConfig = (nodeBlogConfig = {}) => {
6161
},
6262
migrations: {
6363
tableName: 'knex_migrations',
64-
directory: './migrations',
64+
directory: './database/migrations',
6565
},
6666
debug: getConfigEntry('debug', debug),
6767
asyncStackTraces: getConfigEntry('debug', debug),
6868
seeds: {
69-
directory: './seeds',
69+
directory: './database/seeds',
7070
},
7171
};
7272

‎helpers/generate-knex-config.js‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎helpers/helpers.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@
33
module.exports = {
44
knex: require('./knex'),
55
logger: require('./logger'),
6-
generateKnexConfig: require('./generate-knex-config'),
76
};

‎helpers/knex.js‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,9 @@
11
require('dotenv').config();
2-
const getKnexInstance = require('knex');
3-
4-
const knexfileNormal = require('../knexfile');
5-
const knexfileTest = require('../knexfile-test');
62

7-
const getKnexfile = NODE_ENV => {
8-
const knexFile = NODE_ENV === 'test' ? knexfileTest : knexfileNormal;
9-
return knexFile;
10-
};
3+
const getKnexInstance = require('knex');
4+
const generateKnexfile = require('../database/generate-knexfile');
115

12-
const db = (NODE_ENV = process.env.NODE_ENV) => {
13-
const knexfile = getKnexfile(NODE_ENV);
14-
const knex = getKnexInstance(knexfile);
15-
return knex;
16-
};
6+
const knexfile = generateKnexfile();
7+
const knex = getKnexInstance(knexfile);
178

18-
const knex = db();
199
module.exports = knex;

‎knexfile-test.js‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎knexfile.js‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎src/nodeblog-class.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// TODO: Make this work and stuff
22

33
const getKnexInstance = require('knex');
4-
const { generateKnexConfig } = require('../helpers');
4+
const { generateKnexfile } = require('../database');
55

66
class NodeBlog {
77
constructor(client, host, database, user, password, debug) {
@@ -12,7 +12,7 @@ class NodeBlog {
1212
this.password = password;
1313
this.debug = debug;
1414
this.knexConfig = { client, host, database, user, password, debug }; // eslint-disable-line
15-
this.knex = getKnexInstance(generateKnexConfig);
15+
this.knex = getKnexInstance(generateKnexfile);
1616
this.knex.migrate.latest(); // TODO: Clean up
1717
}
1818
}

‎tests/knexfile-generator.test.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ describe('Knexfile generator', () => {
7979
expect(developmentDefaults).not.toEqual(testDefaults);
8080
expect(developmentDefaults).toEqual(productionDefaults);
8181
expect(developmentDefaults.client).toBe(DB_CLIENT);
82+
expect(testDefaults.client).toBe(DB_CLIENT_TEST);
8283
expect(developmentDefaults.host).toBe(DB_HOST);
8384
expect(developmentDefaults.database).toBe(DB_NAME);
8485
expect(developmentDefaults.user).toBe(DB_USER);

0 commit comments

Comments
 (0)