transaction support for 1:N associations

lib/associations/has-many-single-linked.js

-var Utils = require('./../utils')
+var Utils       = require('./../utils')
+  , Transaction = require('./../transaction')
 
 module.exports = (function() {
   var HasManySingleLinked = function(definition, instance) {
@@ -28,23 +29,29 @@ module.exports = (function() {
     return this.__factory.target.all(options)
   }
 
-  HasManySingleLinked.prototype.injectSetter = function(emitter, oldAssociations, newAssociations) {
-    var self    = this
-      , associationKeys = Object.keys((oldAssociations[0] || newAssociations[0] || {daoFactory: {primaryKeys: {}}}).daoFactory.primaryKeys || {})
-      , associationKey = associationKeys.length === 1 ? associationKeys[0] : 'id'
-      , chainer = new Utils.QueryChainer()
+  HasManySingleLinked.prototype.injectSetter = function(emitter, oldAssociations, newAssociations, defaultAttributes) {
+    var self                 = this
+      , associationKeys      = Object.keys((oldAssociations[0] || newAssociations[0] || {daoFactory: {primaryKeys: {}}}).daoFactory.primaryKeys || {})
+      , associationKey       = (associationKeys.length === 1) ? associationKeys[0] : 'id'
+      , chainer              = new Utils.QueryChainer()
+      , options              = {}
       , obsoleteAssociations = oldAssociations.filter(function (old) {
           return !Utils._.find(newAssociations, function (obj) {
             return obj[associationKey] === old[associationKey]
           })
         })
-      , unassociatedObjects = newAssociations.filter(function (obj) {
+      , unassociatedObjects  = newAssociations.filter(function (obj) {
           return !Utils._.find(oldAssociations, function (old) {
             return obj[associationKey] === old[associationKey]
           })
         })
       , update
 
+    if ((defaultAttributes || {}).transaction instanceof Transaction) {
+      options.transaction = defaultAttributes.transaction
+      delete defaultAttributes.transaction
+    }
+
     if (obsoleteAssociations.length > 0) {
       // clear the old associations
       var obsoleteIds = obsoleteAssociations.map(function(associatedObject) {
@@ -54,21 +61,26 @@ module.exports = (function() {
 
       update = {}
       update[self.__factory.identifier] = null
+
       var primaryKeys = Object.keys(this.__factory.target.primaryKeys)
-        , primaryKey = primaryKeys.length === 1 ? primaryKeys[0] : 'id'
+        , primaryKey  = primaryKeys.length === 1 ? primaryKeys[0] : 'id'
         , updateWhere = {}
 
       updateWhere[primaryKey] = obsoleteIds
-      chainer.add(this.__factory.target.update(update, updateWhere, {allowNull: [self.__factory.identifier]}))
+      chainer.add(this.__factory.target.update(
+        update,
+        updateWhere,
+        Utils._.extend(options, { allowNull: [self.__factory.identifier] })
+      ))
     }
 
     if (unassociatedObjects.length > 0) {
       // For the self.instance
-      var pkeys = Object.keys(self.instance.daoFactory.primaryKeys)
-        , pkey = pkeys.length === 1 ? pkeys[0] : 'id'
+      var pkeys       = Object.keys(self.instance.daoFactory.primaryKeys)
+        , pkey        = pkeys.length === 1 ? pkeys[0] : 'id'
         // For chainer
         , primaryKeys = Object.keys(this.__factory.target.primaryKeys)
-        , primaryKey = primaryKeys.length === 1 ? primaryKeys[0] : 'id'
+        , primaryKey  = primaryKeys.length === 1 ? primaryKeys[0] : 'id'
         , updateWhere = {}
 
       // set the new associations
@@ -77,10 +89,15 @@ module.exports = (function() {
         return associatedObject[associationKey]
       })
 
-      update = {}
+      update                            = {}
       update[self.__factory.identifier] = (newAssociations.length < 1 ? null : self.instance[pkey] || self.instance.id)
-      updateWhere[primaryKey] = unassociatedIds
-      chainer.add(this.__factory.target.update(update, updateWhere, {allowNull: [self.__factory.identifier]}))
+      updateWhere[primaryKey]           = unassociatedIds
+
+      chainer.add(this.__factory.target.update(
+        update,
+        updateWhere,
+        Utils._.extend(options, { allowNull: [self.__factory.identifier] })
+      ))
     }
 
     chainer

lib/associations/has-many.js

@@ -128,26 +128,26 @@ module.exports = (function() {
       var instance = this;
       var customEventEmitter = new Utils.CustomEventEmitter(function() {
         instance[self.accessors.get]()
-        .error(function(err){ customEventEmitter.emit('error', err)})
-        .success(function(associatedObjects) {
-          customEventEmitter.emit('success',
-            Utils._.all(objects, function(o) {
-              return Utils._.any(associatedObjects, function(associatedObject) {
-                return Utils._.all(associatedObject.identifiers, function(key, identifier) {
-                  return o[identifier] == associatedObject[identifier];
-                });
+          .error(function(err) { customEventEmitter.emit('error', err) })
+          .success(function(associatedObjects) {
+            customEventEmitter.emit('success',
+              Utils._.all(objects, function(o) {
+                return Utils._.any(associatedObjects, function(associatedObject) {
+                  return Utils._.all(associatedObject.identifiers, function(key, identifier) {
+                    return o[identifier] == associatedObject[identifier];
+                  });
+                })
               })
-            })
-          )
-        })
+            )
+          })
       })
       return customEventEmitter.run()
     }
 
-    obj[this.accessors.hasSingle] = function(o) {
-      var instance = this;
+    obj[this.accessors.hasSingle] = function(o, options) {
+      var instance           = this
       var customEventEmitter = new Utils.CustomEventEmitter(function() {
-        instance[self.accessors.get]()
+        instance[self.accessors.get](options)
         .error(function(err){ customEventEmitter.emit('error', err)})
         .success(function(associatedObjects) {
           customEventEmitter.emit('success',

test/associations/has-many.test.js

@@ -41,6 +41,37 @@ describe(Support.getTestDialectTeaser("HasMany"), function() {
         })
       })
 
+      it('supports transactions', function(done) {
+        Support.prepareTransactionTest(this.sequelize, function(sequelize) {
+          var Article = sequelize.define('Article', { 'title': DataTypes.STRING })
+            , Label   = sequelize.define('Label', { 'text': DataTypes.STRING })
+
+          Article.hasMany(Label)
+
+          sequelize.sync({ force: true }).success(function() {
+            Article.create({ title: 'foo' }).success(function(article) {
+              Label.create({ text: 'bar' }).success(function(label) {
+                sequelize.transaction(function(t) {
+                  article.setLabels([ label ], { transaction: t }).success(function() {
+                    Article.all({ transaction: t }).success(function(articles) {
+                      articles[0].hasLabel(label).success(function(hasLabel) {
+                        expect(hasLabel).to.be.false
+                        Article.all({ transaction: t }).success(function(articles) {
+                          articles[0].hasLabel(label, { transaction: t }).success(function(hasLabel) {
+                            expect(hasLabel).to.be.true
+                            t.rollback().success(function() { done() })
+                          })
+                        })
+                      })
+                    })
+                  })
+                })
+              })
+            })
+          })
+        })
+      })
+
       it('does not have any labels assigned to it initially', function(done) {
         var chainer = new Sequelize.Utils.QueryChainer([
           this.Article.create({ title: 'Articl2e' }),