Fix hasMany custom keys join table (dresende#510)

dxg · dxg · commit c6c6628a53e7 · 2014-05-27T22:43:19.000+10:00
diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,6 @@
+### v2.1.?? - ???
+- Fix hasMany join tables with custom id columns (#510)
+
 ### v2.1.14 - 22 May 2014
 - Allow explicitly specifying `key: true` on properties rather than passing in an array of ids.
 - Fix Property.mapsTo (#506)
diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
@@ -44,14 +44,14 @@ exports.prepare = function (db, Model, associations) {
 		makeKey = opts.key || Settings.defaults().hasMany.key;
 
 		mergeId = util.convertPropToJoinKeyProp(
-			util.wrapFieldObject(opts.mergeId, OtherModel, Model.table, OtherModel.properties) ||
-			util.formatField(OtherModel, Model.table, true, opts.reversed),
+			util.wrapFieldObject(opts.mergeId, Model, Model.table, Model.properties) ||
+			util.formatField(Model, Model.table, true, opts.reversed),
 			{ makeKey: makeKey, required: true }
 		);
 
 		mergeAssocId = util.convertPropToJoinKeyProp(
-			util.wrapFieldObject(opts.mergeAssocId, Model, name, Model.properties) ||
-			util.formatField(Model, name, true, opts.reversed),
+			util.wrapFieldObject(opts.mergeAssocId, OtherModel, name, OtherModel.properties) ||
+			util.formatField(OtherModel, name, true, opts.reversed),
 			{ makeKey: makeKey, required: true }
 		)
 
diff --git a/test/integration/association-hasmany.js b/test/integration/association-hasmany.js
