Fix for smart_associations

notheotherben · notheotherben · commit 6a74796750f6 · 2013-07-16T00:26:25.000+02:00
Fixes an issue with generating the names and determining the types of
fields on target models for hasOne associations.
Handle `id: [...]` correctly by transferring it to keys instead of just
blindly wrapping everything in an array.

Also increased the timeout for hasMany associations tests, since they seemed
to intermittently timeout.
diff --git a/lib/Associations/One.js b/lib/Associations/One.js
@@ -35,7 +35,7 @@ exports.prepare = function (Model, associations, association_properties, model_f
 		assocName = ucfirst(association.name);
 
 		if (!association.hasOwnProperty("field")) {
-		    association.field = util.formatField(Model, association.name, association.required, association.reversed);
+		    association.field = util.formatField(association.model, association.name, association.required, association.reversed);
 		} else if(!association.extension) {
 		    association.field = util.wrapFieldObject(association.field, Model, Model.table, Model.properties);
 		}
diff --git a/lib/Model.js b/lib/Model.js
@@ -25,7 +25,11 @@ function Model(opts) {
 	opts = opts || {};
 
 	if ((!Array.isArray(opts.keys) || opts.keys.length < 2) && !opts.extension) {
-		opts.keys = [ opts.id ];
+	    if (Array.isArray(opts.id)) {
+	        opts.keys = opts.id;
+	    } else {
+	        opts.keys = [opts.id];
+	    }
 	} else {
 		opts.id = null;
 	}
diff --git a/lib/Utilities.js b/lib/Utilities.js
@@ -112,7 +112,7 @@ exports.wrapFieldObject = function (obj, model, altName, alternatives) {
 exports.formatField = function (model, name, required, reversed) {
     var fields = {};
     var keys;
-    if (model.keys instanceof Array) {
+    if (Array.isArray(model.keys)) {
         keys = model.keys;
     }
     else {
@@ -129,8 +129,8 @@ exports.formatField = function (model, name, required, reversed) {
             required: required
         };
 
-        if (model.properties.hasOwnProperty(model.keys[i])) {
-            var p = model.properties[model.keys[i]];
+        if (model.properties.hasOwnProperty(keys[i])) {
+            var p = model.properties[keys[i]];
             fieldOpts = {
                 type: p.type || "number",
                 size: p.size || 4,
diff --git a/test/integration/association-hasmany.js b/test/integration/association-hasmany.js
@@ -2,7 +2,8 @@ var should = require('should');
 var helper = require('../support/spec_helper');
 var ORM    = require('../../');
 
-describe("hasMany", function() {
+describe("hasMany", function () {
+	this.timeout(4000);
 	var db     = null;
 	var Person = null;
 	var Pet    = null;

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ exports.prepare = function (Model, associations, association_properties, model_f`
`35`	`35`	`assocName = ucfirst(association.name);`
`36`	`36`
`37`	`37`	`if (!association.hasOwnProperty("field")) {`
`38`		`- association.field = util.formatField(Model, association.name, association.required, association.reversed);`
	`38`	`+ association.field = util.formatField(association.model, association.name, association.required, association.reversed);`
`39`	`39`	`} else if(!association.extension) {`
`40`	`40`	`association.field = util.wrapFieldObject(association.field, Model, Model.table, Model.properties);`
`41`	`41`	`}`