Merge pull request #1974 from LJ1102/fix-hasmany-set-custom-primary-keys-master

Fix hasmany set custom primary keys

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

@@ -87,13 +87,13 @@ module.exports = (function() {
 
     unassociatedObjects = newAssociations.filter(function(obj) {
       return !Utils._.find(oldAssociations, function(old) {
-        return (!!obj[foreignIdentifier] && !!old[foreignIdentifier] ? obj[foreignIdentifier] === old[foreignIdentifier] : obj.id === old.id);
+        return (!!obj[foreignIdentifier] ? obj[foreignIdentifier] === old[foreignIdentifier] : (!!obj[targetKeys[0]] ? obj[targetKeys[0]] === old[targetKeys[0]] : obj.id === old.id));
       });
     });
 
     oldAssociations.forEach(function(old) {
       var newObj = Utils._.find(newAssociations, function(obj) {
-        return (!!obj[foreignIdentifier] && !!old[foreignIdentifier] ? obj[foreignIdentifier] === old[foreignIdentifier] : obj.id === old.id);
+        return (!!obj[foreignIdentifier] ? obj[foreignIdentifier] === old[foreignIdentifier] : (!!obj[targetKeys[0]] ? obj[targetKeys[0]] === old[targetKeys[0]] : obj.id === old.id));
       });
 
       if (!newObj) {

test/associations/has-many.test.js

@@ -978,6 +978,32 @@ describe(Support.getTestDialectTeaser("HasMany"), function() {
         })
       })
 
+      it("should be able to set twice with custom primary keys", function (done) {
+        var User = this.sequelize.define('User', { uid: { type:DataTypes.INTEGER, primaryKey:true, autoIncrement: true }, username: DataTypes.STRING })
+          , Task = this.sequelize.define('Task', { tid: { type:DataTypes.INTEGER, primaryKey:true, autoIncrement: true }, title: DataTypes.STRING })
+          
+        User.hasMany(Task)
+        Task.hasMany(User)
+
+        this.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 () {
+                User.create({ username: 'bar' }).success(function (user2) {
+                  user2.user_has_task = {usertitle: "Something"};
+                  task.setUsers([ user, user2 ]).success(function () {
+                    task.getUsers().success(function (_users) {
+                      expect(_users).to.have.length(2)
+                      done()
+                    })
+                  })
+                })
+              })
+            })
+          })
+        })
+      })
+
       it("joins an association with custom primary keys", function(done) {
         var Group = this.sequelize.define('group', {
             group_id: {type: DataTypes.INTEGER, primaryKey: true},