🔧 Rename association methods

leonis · Dec 19, 2017 · 8f971a9 · 8f971a9
1 parent 479ff34
commit 8f971a9
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/lib/associations/belongs-to-many.js b/lib/associations/belongs-to-many.js
@@ -193,8 +193,8 @@ var BelongsToMany = function(source, target, options) {
   this.associationAccessor = this.as;
 
   // Get singular and plural names, trying to uppercase the first letter, unless the model forbids it
-  var plural = Utils.uppercaseFirst(this.options.name.plural)
-    , singular = Utils.uppercaseFirst(this.options.name.singular);
+  var plural = Utils.camelize(Utils.uppercaseFirst(this.options.name.plural))
+    , singular = Utils.camelize(Utils.uppercaseFirst(this.options.name.singular));
 
   this.accessors = {
     /**

diff --git a/lib/associations/belongs-to.js b/lib/associations/belongs-to.js
@@ -69,7 +69,7 @@ var BelongsTo = function(source, target, options) {
   this.options.useHooks = options.useHooks;
 
   // Get singular name, trying to uppercase the first letter, unless the model forbids it
-  var singular = Utils.uppercaseFirst(this.options.name.singular);
+  var singular = Utils.camelize(Utils.uppercaseFirst(this.options.name.singular));
 
   this.accessors = {
     /**

diff --git a/lib/associations/has-many.js b/lib/associations/has-many.js
@@ -87,8 +87,8 @@ var HasMany = function(source, target, options) {
   this.associationAccessor = this.as;
 
   // Get singular and plural names, trying to uppercase the first letter, unless the model forbids it
-  var plural = Utils.uppercaseFirst(this.options.name.plural)
-    , singular = Utils.uppercaseFirst(this.options.name.singular);
+  var plural = Utils.camelize(Utils.uppercaseFirst(this.options.name.plural))
+    , singular = Utils.camelize(Utils.uppercaseFirst(this.options.name.singular));
 
   this.accessors = {
     /**

diff --git a/lib/associations/has-one.js b/lib/associations/has-one.js
@@ -66,7 +66,7 @@ var HasOne = function(srcModel, targetModel, options) {
   }
 
   // Get singular name, trying to uppercase the first letter, unless the model forbids it
-  var singular = Utils.uppercaseFirst(this.options.name.singular);
+  var singular = Utils.camelize(Utils.uppercaseFirst(this.options.name.singular));
 
   this.accessors = {
     /**

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sequelize",
   "description": "Multi dialect ORM for Node.JS/io.js",
-  "version": "3.25.0-p6",
+  "version": "3.25.0-p7",
   "author": "Sascha Depold <sascha@depold.com>",
   "contributors": [
     {