use Model.name and not Model.tableName for association aliases and foreignkeys

lib/associations/belongs-to.js

@@ -10,7 +10,7 @@ module.exports = (function() {
     this.target               = target
     this.options              = options
     this.isSingleAssociation  = true
-    this.isSelfAssociation    = (this.source.tableName == this.target.tableName)
+    this.isSelfAssociation    = (this.source.name == this.target.name)
     this.as                   = this.options.as
 
     if (this.isSelfAssociation && !this.options.foreignKey && !!this.as) {
@@ -20,15 +20,11 @@ module.exports = (function() {
     if (this.as) {
       this.isAliased = true
     } else {
-      this.as = Utils.singularize(this.target.tableName, this.target.options.language)
-      // Hotfix
-      if (this.as === this.target.tableName) {
-        this.as = Utils.singularize(this.target.name, this.target.options.language)
-      }
+      this.as = Utils.singularize(this.target.name, this.target.options.language)
     }
 
     this.associationAccessor = this.isSelfAssociation
-      ? Utils.combineTableNames(this.target.tableName, this.as)
+      ? Utils.combineTableNames(this.target.name, this.as)
       : this.as
 
     this.options.useHooks = options.useHooks
@@ -46,7 +42,7 @@ module.exports = (function() {
       , targetKeys     = Object.keys(this.target.primaryKeys)
       , keyType        = ((this.target.hasPrimaryKeys && targetKeys.length === 1) ? this.target.rawAttributes[targetKeys[0]].type : DataTypes.INTEGER)
 
-    this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.target.tableName, this.target.options.language) + "Id", this.source.options.underscored)
+    this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.target.name, this.target.options.language) + "Id", this.source.options.underscored)
 
     newAttributes[this.identifier] = { type: this.options.keyType || keyType }
     Helpers.addForeignKeyConstraints(newAttributes[this.identifier], this.target, this.source, this.options)

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 = Utils.pluralize(this.target.name, this.target.options.language)
     }
     
     this.accessors = {
@@ -137,14 +137,14 @@ module.exports = (function() {
       , self              = this
       , primaryKeyDeleted = false
 
-    this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.source.tableName, this.source.options.language) + "Id", this.source.options.underscored)
+    this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.source.name, this.source.options.language) + "Id", this.source.options.underscored)
 
     // is there already a single sided association between the source and the target?
     // or is the association on the model itself?
     if ((this.isSelfAssociation && Object(this.through) === this.through) || doubleLinked) {
       // remove the obsolete association identifier from the source
       if (this.isSelfAssociation) {
-        this.foreignIdentifier = Utils._.underscoredIf((this.options.as || this.target.tableName) + 'Id', this.target.options.underscored)
+        this.foreignIdentifier = Utils._.underscoredIf((this.options.as || this.target.name) + 'Id', this.target.options.underscored)
       } else {
         this.foreignIdentifier = this.targetAssociation.identifier
         this.targetAssociation.foreignIdentifier = this.identifier

lib/associations/has-one.js

@@ -10,7 +10,7 @@ module.exports = (function() {
     this.target               = targetDAO
     this.options              = options
     this.isSingleAssociation  = true
-    this.isSelfAssociation    = (this.source.tableName == this.target.tableName)
+    this.isSelfAssociation    = (this.source.name == this.target.name)
     this.as = this.options.as
 
     if (this.isSelfAssociation && !this.options.foreignKey && !!this.as) {
@@ -20,11 +20,11 @@ module.exports = (function() {
     if (this.as) {
       this.isAliased = true
     } else {
-      this.as = Utils.singularize(this.target.tableName, this.target.options.language)
+      this.as = Utils.singularize(this.target.name, this.target.options.language)
     }
 
     this.associationAccessor = this.isSelfAssociation
-      ? Utils.combineTableNames(this.target.tableName, this.as)
+      ? Utils.combineTableNames(this.target.name, this.as)
       : this.as
 
     this.options.useHooks = options.useHooks
@@ -42,7 +42,7 @@ module.exports = (function() {
       , sourceKeys    = Object.keys(this.source.primaryKeys)
       , keyType       = ((this.source.hasPrimaryKeys && sourceKeys.length === 1) ? this.source.rawAttributes[sourceKeys[0]].type : DataTypes.INTEGER)
 
-    this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.source.tableName, this.source.options.language) + "Id", this.source.options.underscored)
+    this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.source.name, this.source.options.language) + "Id", this.source.options.underscored)
     newAttributes[this.identifier] = { type: this.options.keyType || keyType }
     Utils._.defaults(this.target.rawAttributes, newAttributes)
     Helpers.addForeignKeyConstraints(this.target.rawAttributes[this.identifier], this.source, this.target, this.options)