Allow the datatype override for autogenerated relational keys

lib/associations/belongs-to.js

@@ -24,7 +24,7 @@ module.exports = (function() {
     var newAttributes  = {}
 
     this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.target.tableName) + "Id", this.source.options.underscored)
-    newAttributes[this.identifier] = { type: DataTypes.INTEGER }
+    newAttributes[this.identifier] = { type: this.options.keyType || DataTypes.INTEGER }
     Helpers.addForeignKeyConstraints(newAttributes[this.identifier], this.target, this.source, this.options)
     Utils._.defaults(this.source.rawAttributes, newAttributes)
 

lib/associations/has-many.js

@@ -51,8 +51,9 @@ module.exports = (function() {
 
       // define a new model, which connects the models
       var combinedTableAttributes = {}
-      combinedTableAttributes[this.identifier] = {type:DataTypes.INTEGER, primaryKey: true}
-      combinedTableAttributes[this.foreignIdentifier] = {type:DataTypes.INTEGER, primaryKey: true}
+      var keyType = this.options.keyType || DataTypes.INTEGER;
+      combinedTableAttributes[this.identifier] = {type: keyType, primaryKey: true}
+      combinedTableAttributes[this.foreignIdentifier] = {type: keyType, primaryKey: true}
 
       this.connectorDAO = this.source.daoFactoryManager.sequelize.define(this.combinedName, combinedTableAttributes, this.options)
 
@@ -65,7 +66,7 @@ module.exports = (function() {
       }
     } else {
       var newAttributes = {}
-      newAttributes[this.identifier] = { type: DataTypes.INTEGER }
+      newAttributes[this.identifier] = { type: this.options.keyType || DataTypes.INTEGER }
       Helpers.addForeignKeyConstraints(newAttributes[this.identifier], this.source, this.target, this.options)
       Utils._.defaults(this.target.rawAttributes, newAttributes)
     }

lib/associations/has-one.js

@@ -29,7 +29,7 @@ module.exports = (function() {
     var newAttributes = {}
 
     this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.source.tableName) + "Id", this.options.underscored)
-    newAttributes[this.identifier] = { type: DataTypes.INTEGER }
+    newAttributes[this.identifier] = { type: this.options.keyType || DataTypes.INTEGER }
     Helpers.addForeignKeyConstraints(newAttributes[this.identifier], this.source, this.target, this.options)
     Utils._.defaults(this.target.rawAttributes, newAttributes)
 

spec/associations/belongs-to.spec.js

@@ -179,4 +179,29 @@ describe(Helpers.getTestDialectTeaser("BelongsTo"), function() {
 
   })
 
+  describe("Association options", function() {
+    it('can specify data type for autogenerated relational keys', function(done) {
+      var User = this.sequelize.define('UserXYZ', { username: Sequelize.STRING })
+        , dataTypes = [Sequelize.INTEGER, Sequelize.BIGINT, Sequelize.STRING]
+        , self = this
+
+      dataTypes.forEach(function(dataType) {
+        var tableName = 'TaskXYZ_' + dataType.toString()
+          , Task = self.sequelize.define(tableName, { title: Sequelize.STRING })
+
+        Task.belongsTo(User, { foreignKey: 'userId', keyType: dataType })
+
+        self.sequelize.sync({ force: true }).success(function() {
+          expect(Task.rawAttributes.userId.type.toString())
+            .toEqual(dataType.toString())
+
+          dataTypes.splice(dataTypes.indexOf(dataType), 1);
+          if (!dataTypes.length) {
+            done()
+          }
+        })
+      })
+    })
+  })
+
 })

spec/associations/has-many.spec.js

@@ -455,4 +455,30 @@ describe(Helpers.getTestDialectTeaser("HasMany"), function() {
     })
 
   })
+
+  describe("Association options", function() {
+    it('can specify data type for autogenerated relational keys', function(done) {
+      var User = this.sequelize.define('UserXYZ', { username: Sequelize.STRING })
+        , dataTypes = [Sequelize.INTEGER, Sequelize.BIGINT, Sequelize.STRING]
+        , self = this
+
+      dataTypes.forEach(function(dataType) {
+        var tableName = 'TaskXYZ_' + dataType.toString()
+          , Task = self.sequelize.define(tableName, { title: Sequelize.STRING })
+
+        User.hasMany(Task, { foreignKey: 'userId', keyType: dataType })
+
+        self.sequelize.sync({ force: true }).success(function() {
+          expect(Task.rawAttributes.userId.type.toString())
+            .toEqual(dataType.toString())
+
+          dataTypes.splice(dataTypes.indexOf(dataType), 1);
+          if (!dataTypes.length) {
+            done()
+          }
+        })
+      })
+    })
+  })
+
 })

spec/associations/has-one.spec.js

@@ -179,4 +179,29 @@ describe(Helpers.getTestDialectTeaser("HasOne"), function() {
 
   })
 
+  describe("Association options", function() {
+    it('can specify data type for autogenerated relational keys', function(done) {
+      var User = this.sequelize.define('UserXYZ', { username: Sequelize.STRING })
+        , dataTypes = [Sequelize.INTEGER, Sequelize.BIGINT, Sequelize.STRING]
+        , self = this
+
+      dataTypes.forEach(function(dataType) {
+        var tableName = 'TaskXYZ_' + dataType.toString()
+          , Task = self.sequelize.define(tableName, { title: Sequelize.STRING })
+
+        User.hasOne(Task, { foreignKey: 'userId', keyType: dataType })
+
+        self.sequelize.sync({ force: true }).success(function() {
+          expect(Task.rawAttributes.userId.type.toString())
+            .toEqual(dataType.toString())
+
+          dataTypes.splice(dataTypes.indexOf(dataType), 1);
+          if (!dataTypes.length) {
+            done()
+          }
+        })
+      })
+    })
+  })
+
 })