Merge pull request #213 from innofluence/master

Fix for issue 210

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

@@ -15,7 +15,7 @@ module.exports = (function() {
 
 
   HasManySingleLinked.prototype.injectSetter = function(emitter, oldAssociations, newAssociations) {
   HasManySingleLinked.prototype.injectSetter = function(emitter, oldAssociations, newAssociations) {
     var self    = this
     var self    = this
-      , options = this.options || {}
+      , options = this.__factory.options
 
 
     // clear the old associations
     // clear the old associations
     oldAssociations.forEach(function(associatedObject) {
     oldAssociations.forEach(function(associatedObject) {

spec/associations/has-many.spec.js

@@ -162,6 +162,33 @@ describe('HasMany', function() {
         })
         })
       })
       })
     })
     })
+
+    it("clears associations when passing null to the set-method with omitNull set to true", function(done) {
+      sequelize.options.omitNull = true;
+      var User = sequelize.define('User', { username: Sequelize.STRING })
+        , Task = sequelize.define('Task', { title: Sequelize.STRING })
+
+      Task.hasMany(User)
+
+      sequelize.sync({ force: true }).success(function() {
+        User.create({ username: 'foo' }).success(function(user) {
+          Task.create({ title: 'task' }).success(function(task) {
+            task.setUsers([ user ]).success(function() {
+              task.getUsers().success(function(_users) {
+                expect(_users.length).toEqual(1)
+
+                task.setUsers(null).success(function() {
+                  task.getUsers().success(function(_users) {
+                    expect(_users.length).toEqual(0)
+                    done()
+                  })
+                })
+              })
+            })
+          })
+        })
+      })
+    })
   })
   })
 
 
   describe('(N:M)', function() {
   describe('(N:M)', function() {