Merge pull request dresende#122 from dresende/has_one_fix

dxg · dxg · commit e980ea57962d · 2013-04-15T05:48:51.000-07:00
hasOne reverse model should not have association field
diff --git a/lib/Associations/One.js b/lib/Associations/One.js
@@ -24,7 +24,9 @@ exports.prepare = function (Model, associations, association_properties, model_f
 		};
 		associations.push(association);
 		association_properties.push(association.field);
-		model_fields.push(association.field);
+		if(!opts.reversed) {
+			model_fields.push(association.field);
+		}
 
 		if (opts.reverse) {
 			OtherModel.hasOne(opts.reverse, Model, {
diff --git a/test/integration/test-association-hasone-reverse.js b/test/integration/test-association-hasone-reverse.js
@@ -2,22 +2,39 @@ var common     = require('../common');
 var assert     = require('assert');
 
 common.createConnection(function (err, db) {
-	common.createModel2Table('test_association_hasone_reverse', db.driver.db, function () {
-			common.insertModel2Data('test_association_hasone_reverse', db.driver.db, [
-				{ id : 1, name : 'test1', assoc: 2 },
-				{ id : 2, name : 'test2', assoc: 0 }
-			], function (err) {
-			if (err) throw err;
+	common.createModelTable('test_association_hasone_reverse_parent', db.driver.db, function() {
+		common.createModel2Table('test_association_hasone_reverse_child', db.driver.db, function () {
+			common.insertModelData('test_association_hasone_reverse_parent', db.driver.db, [
+					{ id : 1, name : 'parent 1' },
+					{ id : 2, name : 'parent 2' }
+				], function (err) {
+				if (err) throw err;
+				common.insertModel2Data('test_association_hasone_reverse_child', db.driver.db, [
+						{ id : 1, name : 'child 1', assoc: 2 },
+						{ id : 2, name : 'child 2', assoc: 1 }
+					], function (err) {
+					if (err) throw err;
 
-			var TestModel = db.define('test_association_hasone_reverse', common.getModelProperties());
-			TestModel.hasOne("assoc", TestModel, { reverse: "reverseassoc" });
+					var TestModelParent = db.define('test_association_hasone_reverse_parent', common.getModelProperties());
+					var TestModelChild  = db.define('test_association_hasone_reverse_child',  common.getModelProperties());
+					TestModelChild.hasOne("assoc", TestModelParent, { reverse: "reverseassoc" });
 
-			TestModel(2).getReverseassoc(function (err, Tests) {
-				assert.equal(err, null);
-				assert.equal(Array.isArray(Tests), true);
-				assert.equal(typeof Tests[0], "object");
-				assert.equal(Tests[0].id, 1);
-				db.close();
+					TestModelParent(2).getReverseassoc(function (err, children) {
+						assert.equal(err, null);
+						assert.equal(Array.isArray(children), true);
+						assert.equal(typeof children[0], "object");
+						assert.equal(children[0].id, 1);
+
+						// Make sure the association field hasn't been erroneously added to the reverse association model.
+						TestModelParent.find({}, function (err, parents) {
+							assert.equal(err, null);
+							assert.equal(parents[0].hasOwnProperty('name'), true);
+							assert.equal(parents[0].hasOwnProperty('assoc_id'), false);
+
+							db.close();
+						});
+					});
+				});
 			});
 		});
 	});
