Merge pull request #1665 from LJ1102/1.7.0

Fix foreign key type for has-many associations, retrofits 71068a11

lib/associations/has-many.js

@@ -190,7 +190,10 @@ module.exports = (function() {
       }
       }
     } else {
     } else {
       var newAttributes = {}
       var newAttributes = {}
-      newAttributes[this.identifier] = { type: this.options.keyType || DataTypes.INTEGER }
+        , sourceKeys = Object.keys(this.source.primaryKeys)
+        , keyType = ((this.source.hasPrimaryKeys && sourceKeys.length === 1) ? this.source.rawAttributes[sourceKeys[0]].type : DataTypes.INTEGER)
+
+      newAttributes[this.identifier] = { type: this.options.keyType || keyType}
       Helpers.addForeignKeyConstraints(newAttributes[this.identifier], this.source, this.target, this.options)
       Helpers.addForeignKeyConstraints(newAttributes[this.identifier], this.source, this.target, this.options)
       Utils._.defaults(this.target.rawAttributes, newAttributes)
       Utils._.defaults(this.target.rawAttributes, newAttributes)
     }
     }

test/associations/has-many.test.js

@@ -1509,5 +1509,24 @@ describe(Support.getTestDialectTeaser("HasMany"), function() {
         })
         })
       })
       })
     })
     })
+
+    it('infers the keyType if none provided', function(done) {
+      var User = this.sequelize.define('User', {
+        id: { type: DataTypes.STRING, primaryKey: true },
+        username: DataTypes.STRING
+      })
+      , Task = this.sequelize.define('Task', {
+        title: DataTypes.STRING
+      })
+
+      User.hasMany(Task)
+
+      this.sequelize.sync({ force: true }).success(function() {
+        expect(Task.rawAttributes.UserId.type.toString())
+          .to.equal(DataTypes.STRING.toString())
+
+        done()
+      })
+    })
   })
   })
 })
 })