bug(assoc:BTM) Fix for plural and singular as in belongsToMany.Closes #3796

lib/associations/belongs-to-many.js

@@ -22,6 +22,24 @@ var BelongsToMany = function(source, target, options) {
   this.isSelfAssociation = this.source === this.target;
   this.isSelfAssociation = this.source === this.target;
   this.doubleLinked = false;
   this.doubleLinked = false;
   this.as = this.options.as;
   this.as = this.options.as;
+
+  if (this.as) {
+    this.isAliased = true;
+
+    if (Utils._.isPlainObject(this.as)) {
+      this.options.name = this.as;
+      this.as = this.as.plural;
+    } else {
+      this.options.name = {
+        plural: this.as,
+        singular: Utils.singularize(this.as)
+      };
+    }
+  } else {
+    this.as = this.target.options.name.plural;
+    this.options.name = this.target.options.name;
+  }
+
   this.combinedTableName = Utils.combineTableNames(
   this.combinedTableName = Utils.combineTableNames(
     this.source.tableName,
     this.source.tableName,
     this.isSelfAssociation ? (this.as || this.target.tableName) : this.target.tableName
     this.isSelfAssociation ? (this.as || this.target.tableName) : this.target.tableName
@@ -137,23 +155,6 @@ var BelongsToMany = function(source, target, options) {
 
 
   this.options.tableName = this.combinedName = (this.through.model === Object(this.through.model) ? this.through.model.tableName : this.through.model);
   this.options.tableName = this.combinedName = (this.through.model === Object(this.through.model) ? this.through.model.tableName : this.through.model);
 
 
-  if (this.as) {
-    this.isAliased = true;
-
-    if (Utils._.isPlainObject(this.as)) {
-      this.options.name = this.as;
-      this.as = this.as.plural;
-    } else {
-      this.options.name = {
-        plural: this.as,
-        singular: Utils.singularize(this.as)
-      };
-    }
-  } else {
-    this.as = this.target.options.name.plural;
-    this.options.name = this.target.options.name;
-  }
-
   this.associationAccessor = this.as;
   this.associationAccessor = this.as;
 
 
   // Get singular and plural names, trying to uppercase the first letter, unless the model forbids it
   // Get singular and plural names, trying to uppercase the first letter, unless the model forbids it

test/unit/associations/belongs-to-many.test.js

+'use strict';
+
+/* jshint -W030 */
+var chai = require('chai')
+  , expect = chai.expect
+  , Support   = require(__dirname + '/../support')
+  , current   = Support.sequelize;
+
+describe(Support.getTestDialectTeaser('Associations'), function() {
+  describe('belongsToMany', function () {
+    it('works with singular and plural name for self-associations', function () {
+      // Models taken from https://github.com/sequelize/sequelize/issues/3796
+      var Service = current.define('service', {})
+        , Instance = Service.Instance;
+
+      Service.belongsToMany(Service, {through: 'Supplements', as: 'supplements'});
+      Service.belongsToMany(Service, {through: 'Supplements', as: {singular: 'supplemented', plural: 'supplemented'}});
+
+      expect(Instance.prototype).to.have.property('getSupplements').which.is.a.function;
+
+      expect(Instance.prototype).to.have.property('addSupplement').which.is.a.function;
+      expect(Instance.prototype).to.have.property('addSupplements').which.is.a.function;
+
+      expect(Instance.prototype).to.have.property('getSupplemented').which.is.a.function;
+      expect(Instance.prototype).not.to.have.property('getSupplementeds').which.is.a.function;
+
+      expect(Instance.prototype).to.have.property('addSupplemented').which.is.a.function;
+      expect(Instance.prototype).not.to.have.property('addSupplementeds').which.is.a.function;
+    });
+  });
+});