Merge pull request #3520 from jd78/master

Sqlite: AUTOINCREMENT wasn't present in the create statement when field is primary key.

lib/dialects/sqlite/query-generator.js

@@ -42,15 +42,16 @@ module.exports = (function() {
       for (var attr in attributes) {
         if (attributes.hasOwnProperty(attr)) {
           var dataType = attributes[attr];
+          var containsAutoIncrement = Utils._.includes(dataType, 'AUTOINCREMENT');
 
-          if (Utils._.includes(dataType, 'AUTOINCREMENT')) {
+          if (containsAutoIncrement) {
             dataType = dataType.replace(/BIGINT/, 'INTEGER');
           }
 
           var dataTypeString = dataType;
           if (Utils._.includes(dataType, 'PRIMARY KEY')) {
-            if (Utils._.includes(dataType, 'INTEGER')) {
-              dataTypeString = 'INTEGER PRIMARY KEY'; // Only INTEGER is allowed for primary key, see https://github.com/sequelize/sequelize/issues/969 (no lenght, unsigned etc)
+            if (Utils._.includes(dataType, 'INTEGER')) { // Only INTEGER is allowed for primary key, see https://github.com/sequelize/sequelize/issues/969 (no lenght, unsigned etc)
+              dataTypeString = containsAutoIncrement ? 'INTEGER PRIMARY KEY AUTOINCREMENT' : 'INTEGER PRIMARY KEY';
             }
 
             if (needsMultiplePrimaryKeys) {

test/integration/dialects/sqlite/query-generator.test.js

@@ -105,6 +105,10 @@ if (dialect === 'sqlite') {
         {
           arguments: ['myTable', {title: 'VARCHAR(255)', name: 'VARCHAR(255)', otherId: 'INTEGER REFERENCES `otherTable` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION'}],
           expectation: 'CREATE TABLE IF NOT EXISTS `myTable` (`title` VARCHAR(255), `name` VARCHAR(255), `otherId` INTEGER REFERENCES `otherTable` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION);'
+        },
+        {
+          arguments: ['myTable', {id: 'INTEGER PRIMARY KEY AUTOINCREMENT', name: 'VARCHAR(255)'}],
+          expectation: 'CREATE TABLE IF NOT EXISTS `myTable` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` VARCHAR(255));'
         }
       ],