fixed multiple primary keys in sqlite => many-to-many associations are now correctly working *meep*

lib/dialects/sqlite/query-generator.js

@@ -25,15 +25,21 @@ module.exports = (function() {
     createTableQuery: function(tableName, attributes, options) {
     createTableQuery: function(tableName, attributes, options) {
       options = options || {}
       options = options || {}
 
 
-      var query   = "CREATE TABLE IF NOT EXISTS <%= table %> (<%= attributes%>)"
-        , attrStr = []
+      var query       = "CREATE TABLE IF NOT EXISTS <%= table %> (<%= attributes%>)"
+        , primaryKeys = []
+        , needsMultiplePrimaryKeys = (Utils._.values(attributes).filter(function(definition) {
+                    return Utils._.includes(definition, 'PRIMARY KEY')
+                  }).length > 1)
+        , attrStr     = []
+
 
 
       for (var attr in attributes) {
       for (var attr in attributes) {
         if (attributes.hasOwnProperty(attr)) {
         if (attributes.hasOwnProperty(attr)) {
           var dataType = attributes[attr]
           var dataType = attributes[attr]
 
 
-          if (Utils._.includes(dataType, 'PRIMARY KEY')) {
-            attrStr.push(Utils.addTicks(attr) + " " + dataType)
+          if (Utils._.includes(dataType, 'PRIMARY KEY') && needsMultiplePrimaryKeys) {
+            primaryKeys.push(attr)
+            attrStr.push(Utils.addTicks(attr) + " " + dataType.replace(/PRIMARY KEY/, 'NOT NULL'))
           } else {
           } else {
             attrStr.push(Utils.addTicks(attr) + " " + dataType)
             attrStr.push(Utils.addTicks(attr) + " " + dataType)
           }
           }
@@ -45,6 +51,11 @@ module.exports = (function() {
         attributes: attrStr.join(", "),
         attributes: attrStr.join(", "),
         charset: (options.charset ? "DEFAULT CHARSET=" + options.charset : "")
         charset: (options.charset ? "DEFAULT CHARSET=" + options.charset : "")
       }
       }
+      , pkString = primaryKeys.map(function(pk) { return Utils.addTicks(pk) }).join(", ")
+
+      if (pkString.length > 0) {
+        values.attributes += ", PRIMARY KEY (" + pkString + ")"
+      }
 
 
       return Utils._.template(query)(values).trim() + ";"
       return Utils._.template(query)(values).trim() + ";"
     },
     },
@@ -112,16 +123,26 @@ module.exports = (function() {
           var template     = "<%= type %>"
           var template     = "<%= type %>"
             , replacements = { type: dataType.type }
             , replacements = { type: dataType.type }
 
 
-          if(dataType.hasOwnProperty('allowNull') && !dataType.allowNull && !dataType.primaryKey)
+          if (dataType.hasOwnProperty('allowNull') && !dataType.allowNull && !dataType.primaryKey) {
             template += " NOT NULL"
             template += " NOT NULL"
+          }
 
 
           if(dataType.defaultValue != undefined) {
           if(dataType.defaultValue != undefined) {
             template += " DEFAULT <%= defaultValue %>"
             template += " DEFAULT <%= defaultValue %>"
             replacements.defaultValue = Utils.escape(dataType.defaultValue)
             replacements.defaultValue = Utils.escape(dataType.defaultValue)
           }
           }
 
 
-          if(dataType.unique) template += " UNIQUE"
-          if(dataType.primaryKey) template += " PRIMARY KEY"
+          if (dataType.unique) {
+            template += " UNIQUE"
+          }
+
+          if (dataType.primaryKey) {
+            template += " PRIMARY KEY"
+
+            if (dataType.autoIncrement) {
+              template += ' AUTOINCREMENT'
+            }
+          }
 
 
           result[name] = Utils._.template(template)(replacements)
           result[name] = Utils._.template(template)(replacements)
         } else {
         } else {
@@ -139,7 +160,7 @@ module.exports = (function() {
         if (factory.attributes.hasOwnProperty(name)) {
         if (factory.attributes.hasOwnProperty(name)) {
           var definition = factory.attributes[name]
           var definition = factory.attributes[name]
 
 
-          if (definition && (definition.indexOf('INTEGER PRIMARY KEY') === 0)) {
+          if (definition && (definition.indexOf('INTEGER PRIMARY KEY AUTOINCREMENT') === 0)) {
             fields.push(name)
             fields.push(name)
           }
           }
         }
         }