db-migrate 1.0.0-beta.37 → 1.0.0-beta.38

package/lib/executors/versioned/v2.js

@@ -61,6 +61,21 @@ const recoveryMode = (file, interrupted) => {
  * Revert the steps executed by an interrupted run. A step started but not
  * done did not change the database, so its reverse operation is dropped.
  */
+/**
+ * Keep the reverse operations of the steps executed on the database. The
+ * failed step only changed the database, if its main statement went through
+ * before failing, signaled by the driver (e.g. a foreign key of createTable
+ * failed after the table was created).
+ */
+const executedSteps = (internals, failed, signaled) => {
+  const done = internals.migrationDone;
+
+  internals.modSchema.s = internals.modSchema.s.filter(
+    entry =>
+      entry.n <= done || (signaled && failed > done && entry.n === failed)
+  );
+};
+
 const recoverByRollback = async (context, driver, file, interrupted) => {
   const internals = context.internals;
   const pdriver = context._pdriver;
@@ -129,6 +144,8 @@ const execUnit = {
       }
     }
 
+    context.internals.migrationDone = chain.recovery ? chain.recovery.done : 0;
+
     // startMigration - needs secondary instance since we can not afford to
     // loose state and the transaction start will include these for roll back
     // we will disable them probably at all from DDL when the driver does not
@@ -140,10 +157,13 @@ const execUnit = {
         dbm: context.internals.safeOptions.dbmigrate
       });
     } catch (err) {
-      context.internals.rollback = true;
-
       // transfer last state
       chain.transferInt();
+      executedSteps(
+        context.internals,
+        chain.op,
+        chain.udriver._counter.previousSignal() === true
+      );
 
       log.error(
         'An error occured. No alternative failure strategy defined. Rolling back!',

package/lib/learn.js

@@ -175,7 +175,8 @@ class STD {
       }
     }
 
-    this.modS[t] = {};
+    // keep the columns removed before from the same table
+    if (!this.modS[t]) this.modS[t] = {};
 
     if (columns[c].notNull === true && !this.unlearn) {
       switch (o.columnStrategy) {
@@ -300,7 +301,7 @@ class STD {
 
     alter.i[t] = {};
     alter.i[t][i] = this.indizies[t][i];
-    this.modI[t] = {};
+    if (!this.modI[t]) this.modI[t] = {};
     this.modI[t][i] = this.indizies[t][i];
     delete this.indizies[t][i];
 
@@ -345,10 +346,12 @@ class STD {
 
     alter.f[t] = {};
     alter.f[t][k] = this.foreign[t][k];
-    this.modF[t] = {};
+    if (!this.modF[t]) this.modF[t] = {};
     this.modF[t][k] = this.foreign[t][k];
     delete this.foreign[t][k];
 
+    this.modC.push({ t: 1, a: 'addForeignKey', c: [t, k] });
+
     return Promise.resolve(alter);
   }
 

package/lib/methods/v2/statedone.js

@@ -8,6 +8,8 @@ module.exports = {
   getInterface: (context, file, driver, internals, pdriver) => {
     const done = () =>
       function () {
+        // in memory first, a failing write must not hide the executed step
+        internals.migrationDone = internals.migrationOp;
         return State.done(pdriver, internals.migrationOp, internals);
       };
 

package/lib/methods/v2/translatestate.js

@@ -46,6 +46,11 @@ const methods = {
     return driver.changeColumn(t, c, internals.modSchema.c[t][c]);
   },
 
+  addForeignKey: async (driver, [t, k], internals) => {
+    const foreign = internals.modSchema.f[t][k];
+    return driver.addForeignKey(t, foreign.rt, k, foreign.m, foreign.r);
+  },
+
   addIndex: async (driver, [t, i], internals) => {
     if (!internals.modSchema.i[t][i]) {
       log.warn(

package/package.json

@@ -31,7 +31,7 @@
     "programable",
     "api"
   ],
-  "version": "1.0.0-beta.37",
+  "version": "1.0.0-beta.38",
   "engines": {
     "node": ">=8.0.0"
   },