Merge pull request #679 from stueynz/master

Ensure hasMany() associations work when properties have mapsTo

Author: dxg

lib/Associations/Many.js

@@ -149,9 +149,19 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 
 			options.__merge = {
 				from:   { table: association.mergeTable, field: Object.keys(association.mergeAssocId) },
-				to: { table: association.model.table, field: association.model.id },
+				to: { table: association.model.table, field: association.model.id.slice(0) },   // clone model id
 				where:  [ association.mergeTable, {} ]
 			};
+
+        // Loop through the (cloned) association model id fields ... some of them may've been mapped to different
+        // names in the actual database - if so update to the mapped database column name
+        for(i=0; i<options.__merge.to.field.length; i++) {
+          var idProp = association.model.properties[options.__merge.to.field[i]];
+          if(idProp && idProp.mapsTo) {
+            options.__merge.to.field[i] = idProp.mapsTo;
+          }
+        }
+
 			options.extra = association.props;
 			options.extra_info = {
 				table: association.mergeTable,
@@ -231,12 +241,22 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 
 			options.__merge = {
 				from  : { table: association.mergeTable, field: Object.keys(association.mergeAssocId) },
-				to    : { table: association.model.table, field: association.model.id },
+				to    : { table: association.model.table, field: association.model.id.slice(0) }, // clone model id
 				where : [ association.mergeTable, {} ]
 			};
-			options.extra = association.props;
-			options.extra_info = {
-				table: association.mergeTable,
+
+        // Loop through the (cloned) association model id fields ... some of them may've been mapped to different
+        // names in the actual database - if so update to the mapped database column name
+        for(i=0; i<options.__merge.to.field.length; i++) {
+          var idProp = association.model.properties[options.__merge.to.field[i]];
+          if(idProp && idProp.mapsTo) {
+            options.__merge.to.field[i] = idProp.mapsTo;
+          }
+        }
+
+		  options.extra = association.props;
+		  options.extra_info = {
+			   table: association.mergeTable,
 				id: util.values(Instance, Model.id),
 				id_prop: Object.keys(association.mergeId),
 				assoc_prop: Object.keys(association.mergeAssocId)