Merge pull request TryGhost#538 from lvivier/json

Mithgol · Mithgol · commit ecb4f3c87c94 · 2015-11-01T10:22:49.000+03:00
Enable json1 extension by default
diff --git a/deps/sqlite3.gyp b/deps/sqlite3.gyp
@@ -80,6 +80,7 @@
         'defines': [
           'SQLITE_THREADSAFE=1',
           'SQLITE_ENABLE_FTS3',
+          'SQLITE_ENABLE_JSON1',
           'SQLITE_ENABLE_RTREE'
         ],
       },
@@ -91,6 +92,7 @@
         '_REENTRANT=1',
         'SQLITE_THREADSAFE=1',
         'SQLITE_ENABLE_FTS3',
+        'SQLITE_ENABLE_JSON1',
         'SQLITE_ENABLE_RTREE'
       ],
       'export_dependent_settings': [
diff --git a/test/json.test.js b/test/json.test.js
@@ -0,0 +1,13 @@
+var sqlite3 = require('..');
+
+describe('json', function() {
+    var db;
+
+    before(function(done) {
+        db = new sqlite3.Database(':memory:', done);
+    });
+
+    it('should select JSON', function(done) {
+        db.run('SELECT json(?)', JSON.stringify({ok:true}), done);
+    });
+});
