Merge branch 'ryanking8215-test/issue_2238'

lib/model.js

@@ -1141,7 +1141,7 @@ module.exports = (function() {
           return [instance, false];
           return [instance, false];
         });
         });
       });
       });
-    }).tap(function () {
+    }).finally(function () {
       if (internalTransaction) {
       if (internalTransaction) {
         // If we created a transaction internally, we should clean it up
         // If we created a transaction internally, we should clean it up
         return this.transaction.commit();
         return this.transaction.commit();

test/dao-factory/create.test.js

@@ -31,6 +31,10 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
       this.Account = this.sequelize.define('Account', {
       this.Account = this.sequelize.define('Account', {
         accountName: DataTypes.STRING
         accountName: DataTypes.STRING
       });
       });
+      this.Student = this.sequelize.define('Student', {
+          no:     {type:DataTypes.INTEGER,primaryKey:true},
+          name: {type:DataTypes.STRING,allowNull:false},
+      })
 
 
       return this.sequelize.sync({ force: true });
       return this.sequelize.sync({ force: true });
     });
     });
@@ -133,6 +137,30 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
       })
       })
     })
     })
 
 
+    it("should release transaction when meeting errors", function(){
+        var self = this
+
+        var test = function(times) {
+            if (times > 10) {
+                return true;
+            }
+            return self.Student.findOrCreate({
+              where: {
+                no: 1
+              }
+            })
+            .timeout(1000)
+            .catch(Promise.TimeoutError,function(e){
+                throw new Error(e)
+            })
+            .catch(Sequelize.ValidationError,function(err){
+                return test(times+1);
+            })
+        }
+
+        return test(0);
+    })
+
     describe('several concurrent calls', function () {
     describe('several concurrent calls', function () {
       it('works with a transaction', function () {
       it('works with a transaction', function () {
         return this.sequelize.transaction().bind(this).then(function (transaction) {
         return this.sequelize.transaction().bind(this).then(function (transaction) {