Bugfix: when querying a reverse association, one of the two columns in the 'JOIN...ON' clause was not the right one (fixes dresende#446)

charlie · dxg · commit cdc3356c1ff6 · 2014-03-13T19:57:55.000+11:00
diff --git a/lib/Associations/One.js b/lib/Associations/One.js
@@ -94,7 +94,7 @@ exports.prepare = function (Model, associations, association_properties, model_f
 			}
 
 			options.__merge = {
-				from  : { table: association.model.table, field: association.model.id },
+				from  : { table: association.model.table, field: association.reversed ? Object.keys(association.field) : association.model.id },
 				to    : { table: Model.table, field: Object.keys(association.field) },
 				where : [ association.model.table, conditions ],
 				table : Model.table

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ exports.prepare = function (Model, associations, association_properties, model_f`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`options.__merge = {`
`97`		`- from : { table: association.model.table, field: association.model.id },`
	`97`	`+ from : { table: association.model.table, field: association.reversed ? Object.keys(association.field) : association.model.id },`
`98`	`98`	`to : { table: Model.table, field: Object.keys(association.field) },`
`99`	`99`	`where : [ association.model.table, conditions ],`
`100`	`100`	`table : Model.table`