test for sqlite query options

Author: refractalize

.gitignore

@@ -1,3 +1,3 @@
 /node_modules
 *.sw?
-test/test.sql
+test/test.db

readme.md

@@ -557,7 +557,7 @@ db.query(sql, parameters, [options])
 ```
 
 * SQLite3
-  `exec` runs the `exec()` method on the connection, see [exec](https://github.com/mapbox/node-sqlite3/wiki/API#databaseexecsql-callback). Note that this method ignores any query `parameters` passed in.
+  * `multiline` or `exec` runs the `exec()` method on the connection which executes multiple lines, see [exec](https://github.com/mapbox/node-sqlite3/wiki/API#databaseexecsql-callback). Note that this method ignores any query `parameters` passed in.
 
 # Development
 

sqliteDriver.js

@@ -19,15 +19,15 @@ module.exports = function() {
       if (options && (options.statement || options.insert)) {
         return new Promise(function (fulfil, reject) {
           debug(query, sqliteParams);
-          self.connection.run(query, sqliteParams, function (error, result) {
+          self.connection.run(query, sqliteParams, function (error) {
             if (error) {
               reject(error);
             } else {
               fulfil({lastId: this.lastID});
             }
           });
         });
-      } else if (options && options.exec) {
+      } else if (options && (options.exec || options.multiline)) {
         return promisify(function (cb) {
           debug(query, sqliteParams);
           self.connection.exec(query, cb);

test/describeDatabase.js

@@ -6,7 +6,7 @@ var chaiAsPromised = require("chai-as-promised");
 chai.use(chaiAsPromised);
 var _ = require("underscore");
 
-module.exports = function(name, config, database) {
+module.exports = function(name, config, database, otherTests) {
   describe(name, function() {
     describe("missing modules", function() {
       var moduleName = __dirname + "/../node_modules/" + database.driverModuleName;
@@ -52,6 +52,10 @@ module.exports = function(name, config, database) {
           }));
         }
 
+        if (otherTests) {
+          otherTests();
+        }
+
         beforeEach(function() {
           db = sworm.db(config);
           statements = [];

test/sqliteSpec.js

@@ -1,4 +1,6 @@
 var describeDatabase = require('./describeDatabase');
+var expect = require('chai').expect;
+var sworm = require('..');
 
 var database = {
   createTables: function(db, tables) {
@@ -55,7 +57,30 @@ var database = {
   driverModuleName: "sqlite3"
 };
 
-describeDatabase("sqlite", {
+var config = {
   driver: "sqlite",
   config: { filename: __dirname + "/test.db" }
-}, database);
+};
+
+describeDatabase("sqlite", config, database, function () {
+  describe('options', function () {
+    it.only('can pass options to query', function () {
+      var db = sworm.db(config);
+
+      return db.query('delete from blah').then(() => {
+        return db.query(`
+          create table if not exists blah ( x integer not null, y integer not null );
+          insert into blah (x, y) values (1, 2);
+          insert into blah (x, y) values (2, 3);
+        `, {}, {multiline: true});
+      }).then(() => {
+        return db.query('select * from blah').then(rows => {
+          expect(rows).to.eql([
+            { x: 1, y: 2 },
+            { x: 2, y: 3 } 
+          ]);
+        });
+      });
+    });
+  });
+});