Merge pull request TryGhost#6637 from ErisDS/knex-config

Disable knex useNullAsDefault warning
glynco · Mar 24, 2016 · e72dddb · e72dddb
2 parents a8fc296 + 8c74f55
commit e72dddb
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/core/server/data/db/connection.js b/core/server/data/db/connection.js
@@ -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;