Fix handling of INTEGER PRIMARY KEY for sqlite (remove length, unsigned etc.)

lib/dialects/sqlite/query-generator.js

@@ -93,12 +93,17 @@ module.exports = (function() {
             modifierLastIndex = -1
             modifierLastIndex = -1
           }
           }
 
 
-          if (Utils._.includes(dataType, 'PRIMARY KEY') && needsMultiplePrimaryKeys) {
-            primaryKeys.push(attr)
-            attrStr.push(this.quoteIdentifier(attr) + " " + dataType.replace(/PRIMARY KEY/, 'NOT NULL'))
-          } else {
-            attrStr.push(this.quoteIdentifier(attr) + " " + dataType)
+          if (Utils._.includes(dataType, 'PRIMARY KEY')) {
+            if (Utils._.includes(dataType, 'INTEGER')) {
+              dataType = 'INTEGER PRIMARY KEY' // Only INTEGER is allowed for primary key, see https://github.com/sequelize/sequelize/issues/969 (no lenght, unsigned etc)
+            }
+
+            if (needsMultiplePrimaryKeys) {
+              primaryKeys.push(attr)
+              dataType = dataType.replace(/PRIMARY KEY/, 'NOT NULL')
+            }
           }
           }
+          attrStr.push(this.quoteIdentifier(attr) + " " + dataType)
         }
         }
       }
       }
 
 

test/sqlite/query-generator.test.js

@@ -91,8 +91,8 @@ if (dialect === 'sqlite') {
           expectation: "CREATE TABLE IF NOT EXISTS `myTable` (`title` VARCHAR(255), `name` VARCHAR(255));"
           expectation: "CREATE TABLE IF NOT EXISTS `myTable` (`title` VARCHAR(255), `name` VARCHAR(255));"
         },
         },
         {
         {
-          arguments: ['myTable', {title: 'VARCHAR(255) BINARY', number: 'INTEGER(5) UNSIGNED PRIMARY KEY '}],
-          expectation: "CREATE TABLE IF NOT EXISTS `myTable` (`title` VARCHAR BINARY(255), `number` INTEGER UNSIGNED(5) PRIMARY KEY);"
+          arguments: ['myTable', {title: 'VARCHAR(255) BINARY', number: 'INTEGER(5) UNSIGNED PRIMARY KEY '}], // length and unsigned are not allowed on primary key
+          expectation: "CREATE TABLE IF NOT EXISTS `myTable` (`title` VARCHAR BINARY(255), `number` INTEGER PRIMARY KEY);"
         },
         },
         {
         {
           arguments: ['myTable', {title: 'ENUM("A", "B", "C")', name: 'VARCHAR(255)'}],
           arguments: ['myTable', {title: 'ENUM("A", "B", "C")', name: 'VARCHAR(255)'}],