TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-04 04:10:33 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6959 from kirrg001/improvement/db-connection

Browse Source 
improvement: improve db/connection.js readability
This commit is contained in:
Hannah Wolfe 2016-06-10 10:17:38 +01:00 committed by GitHub
commit 015802b6eb
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/server/data/db/connection.js
View File

@ -1,6 +1,5 @@
var knex = require('knex'),
config = require('../../config'),
dbConfig = config.database,
knexInstance;
function configure(dbConfig) {
@ -47,8 +46,8 @@ function configure(dbConfig) {
return dbConfig;
}
if (!knexInstance && dbConfig && dbConfig.client) {
knexInstance = knex(configure(dbConfig));
if (!knexInstance && config.database && config.database.client) {
knexInstance = knex(configure(config.database));
}
module.exports = knexInstance;