From 57271878c0107ce50add73b7c9305a91ff3d79bc Mon Sep 17 00:00:00 2001
From: Hannah Wolfe <erisds@gmail.com>
Date: Thu, 24 Mar 2016 16:33:16 +0000
Subject: [PATCH] Make it possible to override `useNullAsDefault`

refs #6623, #6637

- this was supposed to be in the original
---
 core/server/data/db/connection.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/server/data/db/connection.js b/core/server/data/db/connection.js
index d70c782b89..397446d4ba 100644
--- a/core/server/data/db/connection.js
+++ b/core/server/data/db/connection.js
@@ -23,7 +23,7 @@ function configure(dbConfig) {
     }
 
     if (client === 'sqlite3') {
-        dbConfig.useNullAsDefault = false;
+        dbConfig.useNullAsDefault = dbConfig.useNullAsDefault || false;
     }
 
     return dbConfig;