Junction table now has correct types when using non-'id' primary keys with non-integer types

lib/associations/has-many.js

@@ -54,9 +54,12 @@ module.exports = (function() {
 
       // define a new model, which connects the models
       var combinedTableAttributes = {}
-      var keyType = this.options.keyType || DataTypes.INTEGER
-      combinedTableAttributes[this.identifier] = {type: keyType, primaryKey: true}
-      combinedTableAttributes[this.foreignIdentifier] = {type: keyType, primaryKey: true}
+      var sourceKeys = Object.keys(this.source.primaryKeys);
+      var sourceKeyType = ((!this.source.hasPrimaryKeys || sourceKeys.length !== 1) ? DataTypes.INTEGER : this.source.rawAttributes[sourceKeys[0]].type)
+      var targetKeys = Object.keys(this.target.primaryKeys);
+      var targetKeyType = ((!this.target.hasPrimaryKeys || targetKeys.length !== 1) ? DataTypes.INTEGER : this.target.rawAttributes[targetKeys[0]].type)
+      combinedTableAttributes[this.identifier] = {type: sourceKeyType, primaryKey: true}
+      combinedTableAttributes[this.foreignIdentifier] = {type: targetKeyType, primaryKey: true}
 
       this.connectorDAO = this.source.daoFactoryManager.sequelize.define(this.combinedName, combinedTableAttributes, this.options)