Better normalization of passed-in association names

geddy · Jul 1, 2013 · 15c506d · 15c506d
1 parent c798215
commit 15c506d
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -49,6 +49,8 @@ var util = require('util') // Native Node util module
   , Query
   , query; // Lazy-load query; it depends on model/index
 
+var _foreignKeyCreators = [];
+
 utils.mixin(model, new (function () {
 
   this.ModelBase = function () {};
@@ -935,6 +937,13 @@ utils.mixin(model, new (function () {
     return this[name];
   };
 
+  this.createForeignKeys = function () {
+    var creator;
+    while((creator = _foreignKeyCreators.pop())) {
+      creator();
+    }
+  };
+
 })());
 
 model.ModelDefinitionBase = function (name) {
@@ -993,8 +1002,8 @@ model.ModelDefinitionBase = function (name) {
         , modelName = opts.model || name;
 
       // Normalize inflection; we don't care which they use
-      assnName = utils.inflection.singularize(assnName);
-      modelName = utils.inflection.singularize(modelName);
+      assnName = utils.string.getInflection(assnName, 'constructor', 'singular');
+      modelName = utils.string.getInflection(modelName, 'constructor', 'singular');
 
       assn[assnName] = {
         model: modelName
@@ -1046,7 +1055,7 @@ model.ModelDefinitionBase = function (name) {
       // Should probably listen for an event that signals
       // base models are set up
       if (!opts.through) {
-        setTimeout(createForeignKey(assnName), 0);
+        _foreignKeyCreators.push(createForeignKey(assnName));
       }
     };
   });