fix: Run "ADD COLUMN" operations before "MODIFY/CHANGE COLUMN" operations

Fixes a bug where a migration would fail if an existing column was modified and a new column was added just before the modified column.

Author: nwoltman

lib/Operation.js

@@ -16,9 +16,9 @@ const Operation = {
     DROP_KEY: 11,
     DROP_COLUMN: 12,
     MODIFY_TABLE_OPTIONS: 13,
-    MODIFY_COLUMN: 14,
+    ADD_COLUMN: 14,
     CHANGE_COLUMN: 15,
-    ADD_COLUMN: 16,
+    MODIFY_COLUMN: 16,
     ADD_KEY: 17,
   },
 

test/integration/addBeforeModify.test.js

@@ -0,0 +1,87 @@
+'use strict';
+
+const MySQLPlus = require('../../lib/MySQLPlus');
+
+const config = require('../config');
+
+const ColTypes = MySQLPlus.ColTypes;
+
+describe('adding a column before a modified column should work', function() {
+
+  const pool = MySQLPlus.createPool(config);
+  const pool2 = MySQLPlus.createPool(config);
+
+  pool.defineTable('add_before_modify', {
+    columns: {
+      id: ColTypes.int().notNull().primaryKey(),
+      modified: ColTypes.int().notNull(),
+    },
+  });
+
+  pool2.defineTable('add_before_modify', {
+    columns: {
+      id: ColTypes.int().notNull().primaryKey(),
+      added: ColTypes.int().notNull(),
+      modified: ColTypes.bigint().notNull(),
+    },
+  });
+
+  before(done => {
+    pool.sync(err => {
+      if (err) {
+        throw err;
+      }
+
+      pool.end(done);
+    });
+  });
+
+  after(done => {
+    pool2.end(done);
+  });
+
+  it('should not error', done => {
+    pool2.sync(done);
+  });
+
+});
+
+describe('adding a column before a changed column should work', function() {
+
+  const pool = MySQLPlus.createPool(config);
+  const pool2 = MySQLPlus.createPool(config);
+
+  pool.defineTable('add_before_change', {
+    columns: {
+      id: ColTypes.int().notNull().primaryKey(),
+      changed: ColTypes.int().notNull(),
+    },
+  });
+
+  pool2.defineTable('add_before_change', {
+    columns: {
+      id: ColTypes.int().notNull().primaryKey(),
+      added: ColTypes.int().notNull(),
+      changedName: ColTypes.int().notNull().oldName('changed'),
+    },
+  });
+
+  before(done => {
+    pool.sync(err => {
+      if (err) {
+        throw err;
+      }
+
+      pool.end(done);
+    });
+  });
+
+  after(done => {
+    pool2.end(done);
+  });
+
+  it('should not error', done => {
+    pool2.sync(done);
+  });
+
+});

test/unit/TableDefinition.test.js

@@ -140,8 +140,8 @@ describe('TableDefinition', () => {
             sql:
               'ALTER TABLE `' + existingTableName + '`\n' +
               '  DROP PRIMARY KEY,\n' +
-              '  MODIFY COLUMN `id` int unsigned NOT NULL FIRST,\n' +
-              '  ADD COLUMN `newCol` tinyint AFTER `id`',
+              '  ADD COLUMN `newCol` tinyint AFTER `id`,\n' +
+              '  MODIFY COLUMN `id` int unsigned NOT NULL FIRST',
             columns: undefined,
           },
         ];