Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-24 23:48:13 -05:00
Code Issues Activity

Merge pull request #6637 from ErisDS/knex-config

Browse source 
Disable knex useNullAsDefault warning
This commit is contained in:
Jason Williams 2016-03-24 08:15:06 -05:00
commit e72dddbf97
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/server/data/db/connection.js
View file

@ -3,8 +3,9 @@ var knex = require('knex'),
dbConfig = config.database,
knexInstance;
function configureDriver(client) {
var pg;
function configure(dbConfig) {
var client = dbConfig.client,
pg;
if (client === 'pg' || client === 'postgres' || client === 'postgresql') {
try {
@ -20,11 +21,16 @@ function configureDriver(client) {
return val === null ? null : parseInt(val, 10);
});
}
if (client === 'sqlite3') {
dbConfig.useNullAsDefault = false;
}
return dbConfig;
}
if (!knexInstance && dbConfig && dbConfig.client) {
configureDriver(dbConfig.client);
knexInstance = knex(dbConfig);
knexInstance = knex(configure(dbConfig));
}
module.exports = knexInstance;