Use model names not singularised table names pt1

lib/associations/has-many-double-linked.js

@@ -43,7 +43,7 @@ module.exports = (function() {
       options.include = options.include || [];
       options.include = options.include || [];
       options.include.push({
       options.include.push({
         model: through.model,
         model: through.model,
-        as: Utils.singularize(through.model.tableName),
+        as: through.model.name,
         attributes: options.joinTableAttributes,
         attributes: options.joinTableAttributes,
         association: {
         association: {
           isSingleAssociation: true,
           isSingleAssociation: true,

lib/model.js

@@ -1854,7 +1854,7 @@ module.exports = (function() {
 
 
         include.through = Utils._.defaults(include.through || {}, {
         include.through = Utils._.defaults(include.through || {}, {
           model: through.model,
           model: through.model,
-          as: Utils.singularize(through.model.tableName),
+          as: through.model.name,
           association: {
           association: {
             isSingleAssociation: true
             isSingleAssociation: true
           },
           },

test/associations/has-many.test.js

@@ -939,9 +939,9 @@ describe(Support.getTestDialectTeaser("HasMany"), function() {
         }).then(function(projects) {
         }).then(function(projects) {
           expect(projects).to.have.length(1);
           expect(projects).to.have.length(1);
           var project = projects[0];
           var project = projects[0];
-          expect(project.ProjectUser).to.be.defined;
+          expect(project.ProjectUsers).to.be.defined;
           expect(project.status).not.to.exist;
           expect(project.status).not.to.exist;
-          expect(project.ProjectUser.status).to.equal('active');
+          expect(project.ProjectUsers.status).to.equal('active');
         });
         });
       });
       });
     });
     });
@@ -1778,8 +1778,8 @@ describe(Support.getTestDialectTeaser("HasMany"), function() {
 
 
             expect(project.UserProjects).to.be.defined;
             expect(project.UserProjects).to.be.defined;
             expect(project.status).not.to.exist;
             expect(project.status).not.to.exist;
-            expect(project.UserProject.status).to.equal('active');
-            expect(project.UserProject.data).to.equal(42);
+            expect(project.UserProjects.status).to.equal('active');
+            expect(project.UserProjects.data).to.equal(42);
           });
           });
         });
         });
 
 
@@ -1796,8 +1796,8 @@ describe(Support.getTestDialectTeaser("HasMany"), function() {
 
 
             expect(project.UserProjects).to.be.defined;
             expect(project.UserProjects).to.be.defined;
             expect(project.status).not.to.exist;
             expect(project.status).not.to.exist;
-            expect(project.UserProject.status).to.equal('active');
-            expect(project.UserProject.data).not.to.exist;
+            expect(project.UserProjects.status).to.equal('active');
+            expect(project.UserProjects.data).not.to.exist;
           });
           });
         });
         });
       });
       });