Fix shell model hasOne bug

dxg · dxg · commit 29e8f8616d60 · 2013-06-18T12:44:58.000+10:00
diff --git a/lib/Associations/One.js b/lib/Associations/One.js
@@ -132,8 +132,8 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {
 					cb(null);
 				}
 			} else {
-				if (!Instance.hasOwnProperty(association.field)) {
-					association.model.get(Instance[Model.id], function (err, instance) {
+				if (Instance.isShell()) {
+					Model.get(Instance[Model.id], function (err, instance) {
 						if (err || !instance[association.field]) {
 							return cb(null);
 						}
diff --git a/lib/Instance.js b/lib/Instance.js
@@ -478,11 +478,17 @@ function Instance(opts) {
 		enumerable: false
 	});
 	Object.defineProperty(instance, "isPersisted", {
-		value: function() {
+		value: function () {
 			return !opts.is_new;
 		},
 		enumerable: false
 	});
+	Object.defineProperty(instance, "isShell", {
+		value: function () {
+			return opts.isShell;
+		},
+		enumerable: false
+	});
 	Object.defineProperty(instance, "validate", {
 		value: function (cb) {
 			handleValidations(cb);
diff --git a/lib/Model.js b/lib/Model.js
@@ -66,6 +66,7 @@ function Model(opts) {
 			id                     : opts.id,
 			keys                   : opts.keys,
 			is_new                 : inst_opts.is_new || false,
+			isShell                : inst_opts.isShell || false,
 			data                   : data,
 			autoSave               : inst_opts.autoSave || false,
 			extra                  : inst_opts.extra,
@@ -108,7 +109,7 @@ function Model(opts) {
 			var data2 = {};
 			data2[opts.id] = data;
 
-			return createInstance(data2);
+			return createInstance(data2, { isShell: true });
 		} else if (typeof data == "undefined") {
 			data = {};
 		}
diff --git a/test/integration/deprecated/test-get-association-hasone.js b/test/integration/deprecated/test-get-association-hasone.js
@@ -13,7 +13,6 @@ common.createConnection(function (err, db) {
 			TestModel.hasOne("assoc");
 
 			TestModel(1).getAssoc(function (err, Test2) {
-				console.log(err, Test2);
 				assert.equal(err, null);
 				assert.equal(typeof Test2, "object");
 				assert.equal(Test2.id, 2);
diff --git a/test/integration2/association-hasone.js b/test/integration2/association-hasone.js
@@ -9,6 +9,9 @@ describe("hasOne", function() {
 	var Tree  = null;
 	var Stalk = null;
 	var Leaf  = null;
+	var leafId = null;
+	var treeId = null;
+	var stalkId = null;
 
 	var setup = function (opts) {
 		opts = opts || {};
@@ -28,12 +31,16 @@ describe("hasOne", function() {
 			return helper.dropSync([Tree, Stalk, Leaf], function() {
 				Tree.create({ type: 'pine' }, function (err, tree) {
 					should.not.exist(err);
+					treeId = tree.id;
 					Leaf.create({ size: 14 }, function (err, leaf) {
 						should.not.exist(err);
-						leaf.setTree(tree, function () {
+						leafId = leaf.id;
+						leaf.setTree(tree, function (err) {
+							should.not.exist(err);
 							Stalk.create({ length: 20 }, function (err, stalk) {
 								should.not.exist(err);
 								should.exist(stalk);
+								stalkId = stalk.id;
 								done();
 							});
 						});
@@ -65,6 +72,15 @@ describe("hasOne", function() {
 			});
 		});
 
+		it("get should get the association with a shell model", function (done) {
+			Leaf(leafId).getTree(function (err, tree) {
+				should.not.exist(err);
+				should.exist(tree);
+				should.equal(tree.id, treeId);
+				done();
+			});
+		});
+
 		it("has should indicate if there is an association present", function (done) {
 			Leaf.one({ size: 14 }, function (err, leaf) {
 				should.not.exist(err);

Original file line number	Diff line number	Diff line change
`@@ -132,8 +132,8 @@ function extendInstance(Model, Instance, Driver, association, opts, cb) {`
`132`	`132`	`cb(null);`
`133`	`133`	`}`
`134`	`134`	`} else {`
`135`		`- if (!Instance.hasOwnProperty(association.field)) {`
`136`		`- association.model.get(Instance[Model.id], function (err, instance) {`
	`135`	`+ if (Instance.isShell()) {`
	`136`	`+ Model.get(Instance[Model.id], function (err, instance) {`
`137`	`137`	`if (err \|\| !instance[association.field]) {`
`138`	`138`	`return cb(null);`
`139`	`139`	`}`