Removed a couple of places with transaction: null, added CLS as dev-d…

…ependency and fixed cls test for sqlite

lib/instance.js

@@ -832,9 +832,9 @@ module.exports = (function() {
       , where;
 
     if (countOrOptions === undefined) {
-      countOrOptions = { by: 1, transaction: null };
+      countOrOptions = { by: 1 };
     } else if (typeof countOrOptions === 'number') {
-      countOrOptions = { by: countOrOptions, transaction: null };
+      countOrOptions = { by: countOrOptions };
     }
 
     countOrOptions = Utils._.extend({
@@ -892,9 +892,9 @@ module.exports = (function() {
     });
 
     if (countOrOptions === undefined) {
-      countOrOptions = { by: 1, transaction: null };
+      countOrOptions = { by: 1 };
     } else if (typeof countOrOptions === 'number') {
-      countOrOptions = { by: countOrOptions, transaction: null };
+      countOrOptions = { by: countOrOptions };
     }
 
     if (countOrOptions.by === undefined) {

lib/query-interface.js

@@ -46,7 +46,6 @@ module.exports = (function() {
     var self = this;
 
     options = Utils._.extend({
-      transaction: null,
       raw: true
     }, options || {});
 
@@ -285,7 +284,6 @@ module.exports = (function() {
   QueryInterface.prototype.showAllTables = function(options) {
     var self = this;
     options = Utils._.extend({
-      transaction: null,
       raw: true,
       type: QueryTypes.SHOWTABLES
     }, options || {});

lib/sequelize.js

@@ -1075,25 +1075,23 @@ module.exports = (function() {
       }
 
       return new Promise(transactionResolver);
-    } else {
-      if (ns) {
-        var context = ns.createContext();
+    } else if (ns) {
+      var context = ns.createContext();
 
-        return ns.bind(function () {
-          var ret =  transaction.prepareEnvironment().return(transaction);
+      return ns.bind(function () {
+        var ret = transaction.prepareEnvironment().return(transaction);
 
-          ret.then = function (didFulfill, didReject, didProgress) {
-            // We manually pass a context here, because the right context has to be available even though the .then callback is not strictly within the same callback chain
-            didFulfill = ns.bind(didFulfill, context);
+        ret.then = function (didFulfill, didReject, didProgress) {
+          // We manually pass a context here, because the right context has to be available even though the .then callback is not strictly within the same callback chain
+          didFulfill = ns.bind(didFulfill, context);
 
-            return Sequelize.Promise.prototype.then.call(this, didFulfill, didReject, didProgress);
-          };
+          return Sequelize.Promise.prototype.then.call(this, didFulfill, didReject, didProgress);
+        };
 
-          return ret;
-        }, context)();
-      } else {
-        return transaction.prepareEnvironment().return(transaction);
-      }
+        return ret;
+      }, context)();
+    } else {
+      return transaction.prepareEnvironment().return(transaction);
     }
   };
 
@@ -1104,7 +1102,7 @@ module.exports = (function() {
 
     if (last && Utils._.isPlainObject(last) && last.hasOwnProperty('logging')) {
       options = last;
-      
+
       // remove options from set of logged arguments
       args.splice(args.length-1, 1);
     } else {

package.json

@@ -43,6 +43,7 @@
     "validator": "~3.22.1"
   },
   "devDependencies": {
+    "continuation-local-storage": "3.1.2",
     "chai-as-promised": "^4.1.1",
     "sqlite3": "~3.0.0",
     "mysql": "~2.5.0",

test/cls.test.js

@@ -13,8 +13,10 @@ chai.config.includeStack = true;
 
 describe(Support.getTestDialectTeaser("Continuation local storage"), function () {
   before(function () {
-    this.sequelize = Support.createSequelizeInstance({
+    return Support.prepareTransactionTest(Support.createSequelizeInstance({
       namespace: cls.createNamespace('sequelize')
+    })).bind(this).then(function (sequelize) {
+      this.sequelize = sequelize;
     });
   });
 
@@ -91,7 +93,7 @@ describe(Support.getTestDialectTeaser("Continuation local storage"), function ()
             });
           });
 
-          // Wait for 500 ms - should be enough time to get everything set up
+          // Wait for 400 ms - should be enough time to get everything set up
           return Promise.delay(400).bind(this).then(function () {
             expect(transactionSetup).to.be.ok;
             expect(transactionEnded).not.to.be.ok;