Merge pull request #1989 from rogerc/1.7.0

Option to not pluralize associated table names (branch 1.7.0)

lib/associations/has-many.js

@@ -116,7 +116,7 @@ module.exports = (function() {
     if (this.as) {
       this.isAliased = true
     } else {
-      this.as = Utils.pluralize(this.target.tableName, this.target.options.language)
+      this.as = (this.options.freezeAssociations ? this.target.tableName : Utils.pluralize(this.target.tableName, this.target.options.language));      
     }
     
     this.accessors = {

lib/dao-factory.js

@@ -18,6 +18,7 @@ module.exports = (function() {
       classMethods: {},
       validate: {},
       freezeTableName: false,
+      freezeAssociations: false,
       underscored: false,
       syncOnAssociation: true,
       paranoid: false,