Merge pull request #1058 from janmeier/sqliteweirdness

Make the logic for manipulating sqlite data types a bit more solid

lib/dialects/sqlite/query-generator.js

@@ -81,8 +81,15 @@ module.exports = (function() {
             var length = dataType.match(/\(\s*\d+(\s*,\s*\d)?\s*\)/)
             var length = dataType.match(/\(\s*\d+(\s*,\s*\d)?\s*\)/)
             if (length && length.index < modifierLastIndex) {
             if (length && length.index < modifierLastIndex) {
               dataType = dataType.replace(length[0], '')
               dataType = dataType.replace(length[0], '')
-              dataType = Utils._.insert(dataType, modifierLastIndex, length[0])
+
+              // Since the legnth was placed before the modifier, removing the legnth has changed the index
+              if (length.index < modifierLastIndex) {
+                modifierLastIndex -= length[0].length
+              }
+              dataType = Utils._.insert(dataType, modifierLastIndex, length[0]).trim()
             }
             }
+
+            modifierLastIndex = -1
           }
           }
 
 
           if (Utils._.includes(dataType, 'PRIMARY KEY') && needsMultiplePrimaryKeys) {
           if (Utils._.includes(dataType, 'PRIMARY KEY') && needsMultiplePrimaryKeys) {

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'}],
-          expectation: "CREATE TABLE IF NOT EXISTS `myTable` (`title` VARCHAR BINARY(255), `number` INTEGER UNSIGNED(5));"
+          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: 'ENUM("A", "B", "C")', name: 'VARCHAR(255)'}],
           arguments: ['myTable', {title: 'ENUM("A", "B", "C")', name: 'VARCHAR(255)'}],