Don't pretend like composite primary keys work: they need to be handled at table…

… level, not attribute level

lib/associations/belongs-to.js

@@ -26,10 +26,14 @@ module.exports = (function() {
     newAttributes[this.identifier] = { type: DataTypes.INTEGER }
 
     if(this.options.foreignKeyConstraint || this.options.onDelete || this.options.onUpdate) {
-      newAttributes[this.identifier].references = this.target.tableName,
-      newAttributes[this.identifier].referencesKeys = Utils._.filter(Utils._.keys(this.target.rawAttributes), function(key) { return this.target.rawAttributes[key].primaryKey }, this)
-      newAttributes[this.identifier].onDelete = this.options.onDelete,
-      newAttributes[this.identifier].onUpdate = this.options.onUpdate
+      var primaryKeys = Utils._.filter(Utils._.keys(this.target.rawAttributes), function(key) { return this.target.rawAttributes[key].primaryKey }, this)
+
+        if(primaryKeys.length == 1) { // composite keys not supported with this approach
+          newAttributes[this.identifier].references = this.target.tableName,
+          newAttributes[this.identifier].referencesKey = primaryKeys[0]
+          newAttributes[this.identifier].onDelete = this.options.onDelete,
+          newAttributes[this.identifier].onUpdate = this.options.onUpdate
+        }
     }
 
     Utils._.defaults(this.source.rawAttributes, newAttributes)

lib/associations/has-many.js

@@ -67,10 +67,14 @@ module.exports = (function() {
       newAttributes[this.identifier] = { type: DataTypes.INTEGER }
 
       if(this.options.foreignKeyConstraint || this.options.onDelete || this.options.onUpdate) {
-        newAttributes[this.identifier].references = this.source.tableName
-        newAttributes[this.identifier].referencesKeys = Utils._.filter(Utils._.keys(this.source.rawAttributes), function(key) { return this.source.rawAttributes[key].primaryKey }, this)
-        newAttributes[this.identifier].onDelete = this.options.onDelete
-        newAttributes[this.identifier].onUpdate = this.options.onUpdate
+        var primaryKeys = Utils._.filter(Utils._.keys(this.source.rawAttributes), function(key) { return this.source.rawAttributes[key].primaryKey }, this)
+
+        if(primaryKeys.length == 1) { // composite keys not supported with this approach
+          newAttributes[this.identifier].references = this.source.tableName
+          newAttributes[this.identifier].referencesKey = primaryKeys[0]
+          newAttributes[this.identifier].onDelete = this.options.onDelete
+          newAttributes[this.identifier].onUpdate = this.options.onUpdate
+        }
       }
 
       Utils._.defaults(this.target.rawAttributes, newAttributes)

lib/associations/has-one.js

@@ -31,10 +31,14 @@ module.exports = (function() {
     newAttributes[this.identifier] = { type: DataTypes.INTEGER }
 
     if(this.options.foreignKeyConstraint || this.options.onDelete || this.options.onUpdate) {
-      newAttributes[this.identifier].references = this.source.tableName,
-      newAttributes[this.identifier].referencesKeys = Utils._.filter(Utils._.keys(this.source.rawAttributes), function(key) { return this.source.rawAttributes[key].primaryKey }, this)
-      newAttributes[this.identifier].onDelete = this.options.onDelete,
-      newAttributes[this.identifier].onUpdate = this.options.onUpdate
+      var primaryKeys = Utils._.filter(Utils._.keys(this.source.rawAttributes), function(key) { return this.source.rawAttributes[key].primaryKey }, this)
+
+        if(primaryKeys.length == 1) { // composite keys not supported with this approach
+        newAttributes[this.identifier].references = this.source.tableName,
+        newAttributes[this.identifier].referencesKey = primaryKeys[0]
+        newAttributes[this.identifier].onDelete = this.options.onDelete,
+        newAttributes[this.identifier].onUpdate = this.options.onUpdate
+      }
     }
 
     Utils._.defaults(this.target.rawAttributes, newAttributes)

lib/dialects/mysql/query-generator.js

@@ -454,9 +454,8 @@ module.exports = (function() {
             template += " REFERENCES " + Utils.addTicks(dataType.references)
 
 
-            if(dataType.referencesKeys) {
-              // TODO: This isn't really right - for composite primary keys we need a different approach
-              template += " (" + dataType.referencesKeys.map(Utils.addTicks).join(', ') + ")"
+            if(dataType.referencesKey) {
+              template += " (" + Utils.addTicks(dataType.referencesKey) + ")"
             } else {
               template += " (" + Utils.addTicks('id') + ")"
             }

lib/dialects/postgres/query-generator.js

@@ -557,14 +557,13 @@ module.exports = (function() {
           }
 
           if(dataType.references) {
-            template += " REFERENCES <%= referencesTable %> (<%= referencesKeys %>)"
+            template += " REFERENCES <%= referencesTable %> (<%= referencesKey %>)"
             replacements.referencesTable = QueryGenerator.addQuotes(dataType.references)
 
-            if(dataType.referencesKeys) {
-              // TODO: This isn't really right - for composite primary keys we need a different approach
-              replacements.referencesKeys = dataType.referencesKeys.map(QueryGenerator.addQuotes).join(', ')
+            if(dataType.referencesKey) {
+              replacements.referencesKey = QueryGenerator.addQuotes(dataType.referencesKey)
             } else {
-              replacements.referencesKeys = QueryGenerator.addQuotes('id')
+              replacements.referencesKey = QueryGenerator.addQuotes('id')
             }
 
             if(dataType.onDelete) {

lib/dialects/sqlite/query-generator.js

@@ -218,14 +218,13 @@ module.exports = (function() {
           }
 
           if(dataType.references) {
-            template += " REFERENCES <%= referencesTable %> (<%= referencesKeys %>)"
+            template += " REFERENCES <%= referencesTable %> (<%= referencesKey %>)"
             replacements.referencesTable = Utils.addTicks(dataType.references)
 
-            if(dataType.referencesKeys) {
-              // TODO: This isn't really right - for composite primary keys we need a different approach
-              replacements.referencesKeys = dataType.referencesKeys.map(Utils.addTicks).join(', ')
+            if(dataType.referencesKey) {
+              replacements.referencesKey = Utils.addTicks(dataType.referencesKey)
             } else {
-              replacements.referencesKeys = Utils.addTicks('id')
+              replacements.referencesKey = Utils.addTicks('id')
             }
 
             if(dataType.onDelete) {

spec-jasmine/mysql/query-generator.spec.js

@@ -49,7 +49,7 @@ describe('QueryGenerator', function() {
         expectation: {id: 'INTEGER REFERENCES `Bar` (`id`)'}
       },
       {
-        arguments: [{id: {type: 'INTEGER', references: 'Bar', referencesKeys: ['pk']}}],
+        arguments: [{id: {type: 'INTEGER', references: 'Bar', referencesKey: 'pk'}}],
         expectation: {id: 'INTEGER REFERENCES `Bar` (`pk`)'}
       },
       {

spec-jasmine/postgres/query-generator.spec.js

@@ -53,7 +53,7 @@ describe('QueryGenerator', function() {
         expectation: {id: 'INTEGER REFERENCES "Bar" ("id")'}
       },
       {
-        arguments: [{id: {type: 'INTEGER', references: 'Bar', referencesKeys: ['pk']}}],
+        arguments: [{id: {type: 'INTEGER', references: 'Bar', referencesKey: 'pk'}}],
         expectation: {id: 'INTEGER REFERENCES "Bar" ("pk")'}
       },
       {

spec-jasmine/sqlite/query-generator.spec.js

@@ -48,7 +48,7 @@ describe('QueryGenerator', function() {
         expectation: {id: 'INTEGER REFERENCES `Bar` (`id`)'}
       },
       {
-        arguments: [{id: {type: 'INTEGER', references: 'Bar', referencesKeys: ['pk']}}],
+        arguments: [{id: {type: 'INTEGER', references: 'Bar', referencesKey: 'pk'}}],
         expectation: {id: 'INTEGER REFERENCES `Bar` (`pk`)'}
       },
       {