Fixed hasMany custom primary key injectSetter and injectAdder to use correct keys

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

@@ -59,28 +59,32 @@ module.exports = (function() {
       , association         = self.__factory.target.associations[self.__factory.associationAccessor]
       , foreignIdentifier   = association.isSelfAssociation ? association.foreignIdentifier : association.identifier;
 
+    var sourceKeys = Object.keys(self.__factory.source.primaryKeys);
+    var targetKeys = Object.keys(self.__factory.target.primaryKeys);
+
     var obsoleteAssociations = oldAssociations.filter(function (old) {
-          // Return only those old associations that are not found in new
-          return !Utils._.find(newAssociations, function (obj) {
-            return (!!obj[foreignIdentifier] && !!old[foreignIdentifier] ? obj[foreignIdentifier] === old[foreignIdentifier] : obj.id === old.id)
-          })
-        })
-     , 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 only those old associations that are not found in new
+      return !Utils._.find(newAssociations, function (obj) {
+        return ((targetKeys.length === 1) ? obj[targetKeys[0]] === old[targetKeys[0]] : obj.id === old.id)
+        //return (!!obj[foreignIdentifier] && !!old[foreignIdentifier] ? obj[foreignIdentifier] === old[foreignIdentifier] : obj.id === old.id)
+      })
+    })
+
+    var unassociatedObjects = newAssociations.filter(function (obj) {
+      return !Utils._.find(oldAssociations, function (old) {
+        return ((targetKeys.length === 1) ? obj[targetKeys[0]] === old[targetKeys[0]] : obj.id === old.id)
+        //return (!!obj[foreignIdentifier] && !!old[foreignIdentifier] ? obj[foreignIdentifier] === old[foreignIdentifier] : obj.id === old.id)
+      })
+    })
 
     if (obsoleteAssociations.length > 0) {
       var foreignIds = obsoleteAssociations.map(function (associatedObject) {
-            return associatedObject.id
-          })
-        , primaryKeys      = Object.keys(self.__factory.connectorDAO.rawAttributes)
-        , foreignKey       = primaryKeys.filter(function(pk) { return pk != self.__factory.identifier })[0]
+        return ((targetKeys.length === 1) ? associatedObject[targetKeys[0]] : associatedObject.id)
+      })
 
       var where = {}
-      where[self.__factory.identifier] = self.instance[self.__factory.identifier] || self.instance.id
-      where[foreignKey] = foreignIds
+      where[self.__factory.identifier] = ((sourceKeys.length === 1) ? self.instance[sourceKeys[0]] : self.instance.id)
+      where[foreignIdentifier] = foreignIds
 
       chainer.add(self.__factory.connectorDAO.destroy(where))
     }
@@ -88,8 +92,8 @@ module.exports = (function() {
     if (unassociatedObjects.length > 0) {
       var bulk = unassociatedObjects.map(function(unassociatedObject) {
         var attributes = {}
-        attributes[self.__factory.identifier] = self.instance[self.__factory.identifier] || self.instance.id
-        attributes[foreignIdentifier] = unassociatedObject[foreignIdentifier] || unassociatedObject.id
+        attributes[self.__factory.identifier] = ((sourceKeys.length === 1) ? self.instance[sourceKeys[0]] : self.instance.id)
+        attributes[foreignIdentifier] = ((targetKeys.length === 1) ? unassociatedObject[targetKeys[0]] : unassociatedObject.id)
 
         return attributes
       })
@@ -109,8 +113,11 @@ module.exports = (function() {
       , association         = this.__factory.target.associations[this.__factory.associationAccessor]
       , foreignIdentifier   = association.isSelfAssociation ? association.foreignIdentifier : association.identifier;
 
-    attributes[this.__factory.identifier] = this.instance[this.__factory.identifier] || this.instance.id
-    attributes[foreignIdentifier] = newAssociation[foreignIdentifier] || newAssociation.id
+    var sourceKeys = Object.keys(this.__factory.source.primaryKeys);
+    var targetKeys = Object.keys(this.__factory.target.primaryKeys);
+
+    attributes[this.__factory.identifier] = ((sourceKeys.length === 1) ? this.instance[sourceKeys[0]] : this.instance.id)
+    attributes[foreignIdentifier] = ((targetKeys.length === 1) ? newAssociation[targetKeys[0]] : newAssociation.id)
 
     this.__factory.connectorDAO.create(attributes)
       .success(function() { emitterProxy.emit('success', newAssociation) })