Fix SQLite dropColumn doesn't work for last column (fixes #544)

knex · Feb 25, 2015 · 18072c0 · 18072c0
1 parent bebbb1a
commit 18072c0
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/lib/dialects/sqlite3/schema/ddl.js b/lib/dialects/sqlite3/schema/ddl.js
@@ -147,8 +147,18 @@ SQLite3_DDL.prototype.dropColumn = Promise.method(function(column) {
     .then(this.getTableSql)
     .then(function(sql) {
       var createTable = sql[0];
-      var a = this.formatter.wrap(column) + ' ' + currentCol.type + ', ';
-      if (createTable.sql.indexOf(a) === -1) {
+      var a;
+      var a0 = this.formatter.wrap(column) + ' ' + currentCol.type;
+      var al = a0 + ', ';
+       if (createTable.sql.indexOf(al) !== -1) {
+         a = al;
+       } else {
+         var af = ', ' + a0;
+         if (createTable.sql.indexOf(af) !== -1) {
+           a = af;
+         }
+       }
+      if (!a) {
         throw new Error('Unable to find the column to change');
       }
       return Promise.bind(this)