fix: transaction should unset itself from cls on cleanup, closes #3375

lib/transaction.js

@@ -152,7 +152,15 @@ Transaction.prototype.setIsolationLevel = function() {
 };
 };
 
 
 Transaction.prototype.cleanup = function() {
 Transaction.prototype.cleanup = function() {
+  var cls = this.sequelize.constructor.cls;
+
   this.connection.uuid = undefined;
   this.connection.uuid = undefined;
 
 
+  if (cls) {
+    if (cls.get('transaction') === this) {
+      cls.set('transaction', null);
+    }
+  }
+
   return this.sequelize.connectionManager.releaseConnection(this.connection);
   return this.sequelize.connectionManager.releaseConnection(this.connection);
 };
 };

test/integration/cls.test.js

@@ -113,6 +113,18 @@ if (current.dialect.supports.transactions) {
           expect(this.ns.get('transaction')).not.to.be.ok;
           expect(this.ns.get('transaction')).not.to.be.ok;
         });
         });
       });
       });
+
+      it('does not leak outside findOrCreate', function () {
+        var self = this;
+
+        return this.User.findOrCreate({
+          where: {
+            name: 'Kafka'
+          }
+        }).then(function () {
+          return self.User.findAll();
+        });
+      });
     });
     });
 
 
     describe('sequelize.query integration', function () {
     describe('sequelize.query integration', function () {