Merge pull request #1208 from mickhansen/fk-test

Fix it so foreignKeys dont get overwritten on hasOne/belongsTo call targ...

lib/associations/has-one.js

@@ -39,8 +39,8 @@ module.exports = (function() {
 
 
     this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.source.tableName, this.source.options.language) + "Id", this.options.underscored)
     this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.source.tableName, this.source.options.language) + "Id", this.options.underscored)
     newAttributes[this.identifier] = { type: this.options.keyType || keyType }
     newAttributes[this.identifier] = { type: this.options.keyType || keyType }
-    Helpers.addForeignKeyConstraints(newAttributes[this.identifier], this.source, this.target, this.options)
     Utils._.defaults(this.target.rawAttributes, newAttributes)
     Utils._.defaults(this.target.rawAttributes, newAttributes)
+    Helpers.addForeignKeyConstraints(this.target.rawAttributes[this.identifier], this.source, this.target, this.options)
 
 
     // Sync attributes and setters/getters to DAO prototype
     // Sync attributes and setters/getters to DAO prototype
     this.target.refreshAttributes()
     this.target.refreshAttributes()