Fixes hasOne reversed associations not having setAccessor, fixes bug …

…using wrong ID prop instead of the one defined in Model (#55)
dresende · Mar 4, 2013 · 9297815 · 9297815
1 parent 0723188
commit 9297815
Showing 1 changed file with 20 additions and 8 deletions.
diff --git a/lib/Associations/One.js b/lib/Associations/One.js
@@ -102,23 +102,35 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 		},
 		enumerable: false
 	});
-	if (!association.reversed) {
-		Object.defineProperty(Instance, association.setAccessor, {
-			value: function (OtherInstance, cb) {
+	Object.defineProperty(Instance, association.setAccessor, {
+		value: function (OtherInstance, cb) {
+			if (association.reversed) {
+				Instance.save(function (err) {
+					if (err) {
+						return cb(err);
+					}
+
+					OtherInstance[association.field] = Instance[Model.id];
+
+					return OtherInstance.save(cb);
+				});
+			} else {
 				OtherInstance.save(function (err) {
 					if (err) {
 						return cb(err);
 					}
 
-					Instance[association.field] = OtherInstance.id;
+					Instance[association.field] = OtherInstance[association.model.id];
 
 					return Instance.save(cb);
 				});
+			}
 
-				return this;
-			},
-			enumerable: false
-		});
+			return this;
+		},
+		enumerable: false
+	});
+	if (association.reversed) {
 		Object.defineProperty(Instance, association.delAccessor, {
 			value: function (cb) {
 				Instance[association.field] = 0;