transaction test for bulkDelete

lib/dao-factory.js

@@ -685,7 +685,6 @@ module.exports = (function() {
             }
             }
 
 
             daos[i] = newValues || daos[i]
             daos[i] = newValues || daos[i]
-            console.log('....................')
             daos[i].save({ transaction: options.transaction }).error(function(err) {
             daos[i].save({ transaction: options.transaction }).error(function(err) {
               emitter.emit('error', err)
               emitter.emit('error', err)
             }).success(function() {
             }).success(function() {

lib/query-interface.js

@@ -617,7 +617,7 @@ module.exports = (function() {
     return new Utils.CustomEventEmitter(function(emitter) {
     return new Utils.CustomEventEmitter(function(emitter) {
       var chainer = new Utils.QueryChainer()
       var chainer = new Utils.QueryChainer()
 
 
-      chainer.add(self, 'queryAndEmit', [sql, 'bulkDelete', options])
+      chainer.add(self, 'queryAndEmit', [[sql, null, options], 'bulkDelete', options])
 
 
       chainer.runSerially()
       chainer.runSerially()
       .success(function(results){
       .success(function(results){

test/dao-factory.test.js

@@ -1398,20 +1398,21 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
   })
   })
 
 
   describe('destroy', function() {
   describe('destroy', function() {
-    it('deletes a record from the database if dao is not paranoid', function(done) {
-      var UserDestroy = this.sequelize.define('UserDestroy', {
-          name: Sequelize.STRING,
-          bio: Sequelize.TEXT
-        })
+    it('supports transactions', function(done) {
+      Support.prepareTransactionTest(dialect, this.sequelize, function(sequelize) {
+        var User = sequelize.define('User', { username: Sequelize.STRING })
 
 
-      UserDestroy.sync({ force: true }).success(function() {
-        UserDestroy.create({name: 'hallo', bio: 'welt'}).success(function(u) {
-          UserDestroy.all().success(function(users) {
-            expect(users.length).to.equal(1)
-            u.destroy().success(function() {
-              UserDestroy.all().success(function(users) {
-                expect(users.length).to.equal(0)
-                done()
+        User.sync({ force: true }).success(function() {
+          User.create({ username: 'foo' }).success(function() {
+            sequelize.transaction(function(t) {
+              User.destroy({}, { transaction: t }).success(function() {
+                User.count().success(function(count1) {
+                  User.count({ transaction: t }).success(function(count2) {
+                    expect(count1).to.equal(1)
+                    expect(count2).to.equal(0)
+                    t.rollback().success(done)
+                  })
+                })
               })
               })
             })
             })
           })
           })
@@ -1419,26 +1420,6 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
       })
       })
     })
     })
 
 
-    it('allows sql logging of delete statements', function(done) {
-      var UserDelete = this.sequelize.define('UserDelete', {
-          name: Sequelize.STRING,
-          bio: Sequelize.TEXT
-        })
-
-      UserDelete.sync({ force: true }).success(function() {
-        UserDelete.create({name: 'hallo', bio: 'welt'}).success(function(u) {
-          UserDelete.all().success(function(users) {
-            expect(users.length).to.equal(1)
-            u.destroy().on('sql', function(sql) {
-              expect(sql).to.exist
-              expect(sql.toUpperCase().indexOf("DELETE")).to.be.above(-1)
-              done()
-            })
-          })
-        })
-      })
-    })
-
     it('deletes values that match filter', function(done) {
     it('deletes values that match filter', function(done) {
       var self = this
       var self = this
         , data = [{ username: 'Peter', secretValue: '42' },
         , data = [{ username: 'Peter', secretValue: '42' },

test/dao.test.js

@@ -1275,4 +1275,47 @@ describe(Support.getTestDialectTeaser("DAO"), function () {
       })
       })
     })
     })
   })
   })
+
+  describe('destroy', function() {
+    it('deletes a record from the database if dao is not paranoid', function(done) {
+      var UserDestroy = this.sequelize.define('UserDestroy', {
+          name: Sequelize.STRING,
+          bio: Sequelize.TEXT
+        })
+
+      UserDestroy.sync({ force: true }).success(function() {
+        UserDestroy.create({name: 'hallo', bio: 'welt'}).success(function(u) {
+          UserDestroy.all().success(function(users) {
+            expect(users.length).to.equal(1)
+            u.destroy().success(function() {
+              UserDestroy.all().success(function(users) {
+                expect(users.length).to.equal(0)
+                done()
+              })
+            })
+          })
+        })
+      })
+    })
+
+    it('allows sql logging of delete statements', function(done) {
+      var UserDelete = this.sequelize.define('UserDelete', {
+          name: Sequelize.STRING,
+          bio: Sequelize.TEXT
+        })
+
+      UserDelete.sync({ force: true }).success(function() {
+        UserDelete.create({name: 'hallo', bio: 'welt'}).success(function(u) {
+          UserDelete.all().success(function(users) {
+            expect(users.length).to.equal(1)
+            u.destroy().on('sql', function(sql) {
+              expect(sql).to.exist
+              expect(sql.toUpperCase().indexOf("DELETE")).to.be.above(-1)
+              done()
+            })
+          })
+        })
+      })
+    })
+  })
 })
 })