db-migrate 1.0.0-beta.26 → 1.0.0-beta.28

package/connect.js

@@ -9,7 +9,9 @@ var path = require('path');
 var log = require('db-migrate-shared').log;
 const Promise = require('bluebird');
 
-exports.connect = function (config, PassedClass) {
+Promise.promisifyAll(driver);
+
+exports.connect = async function (config, PassedClass) {
   var internals = {};
   var prefix = 'migration';
   if (config.config) {
@@ -18,6 +20,8 @@ exports.connect = function (config, PassedClass) {
     config = config.config;
   }
 
+  const db2 = await driver.connectAsync(config, internals);
+
   return Promise.fromCallback(callback => {
     driver.connect(config, internals, function (err, db) {
       if (err) {
@@ -25,6 +29,14 @@ exports.connect = function (config, PassedClass) {
         return;
       }
 
+      const realClose = db.close;
+      // close both lines with one disconnect action
+      db.close = function (cb) {
+        db2.close(function () {});
+        db.close = realClose;
+        db.close(cb);
+      };
+
       var dirPath = path.resolve(
         internals.argv['migrations-dir'] || 'migrations'
       );
@@ -59,7 +71,8 @@ exports.connect = function (config, PassedClass) {
                   dirPath,
                   internals.mode !== 'static',
                   internals,
-                  prefix
+                  prefix,
+                  { db2 }
                 )
               );
             });
@@ -100,6 +113,7 @@ exports.connect = function (config, PassedClass) {
                 db,
                 oldClose,
                 prefix,
+                db2,
                 cb
               );
             };
@@ -115,7 +129,8 @@ exports.connect = function (config, PassedClass) {
             dirPath,
             internals.mode !== 'static',
             internals,
-            prefix
+            prefix,
+            { db2 }
           )
         );
       }
@@ -142,6 +157,7 @@ function migrationFiles (
   db,
   close,
   prefix,
+  db2,
   cb
 ) {
   var file;
@@ -187,7 +203,8 @@ function migrationFiles (
         internals.argv['migrations-dir'],
         internals.mode !== 'static',
         internals,
-        prefix
+        prefix,
+        { db2 }
       )
     );
 

package/lib/chain.js

@@ -55,10 +55,11 @@ const dbmControl = {
 };
 
 class Chain {
-  constructor (context, file, driver, internals) {
+  constructor (context, file, driver, internals, pdriver) {
     this.file = file;
     this.context = context;
     this.driver = context;
+    this.pdriver = pdriver;
     this.udriver = driver;
     if (this.udriver._dbmControl !== true) {
       this.udriver._counter = dbmControl;
@@ -113,7 +114,8 @@ class Chain {
         this.context,
         this.file,
         this.udriver,
-        this.internals
+        this.internals,
+        this.pdriver
       );
     }
 
@@ -136,6 +138,7 @@ class Chain {
         this._step.useState(ret);
       }
 
+      // need to check if we still want this
       if (this._step.hasModification) {
         const ret = this._step.modify(
           this.context,

package/lib/executors/versioned/v2.js

@@ -29,7 +29,7 @@ const execUnit = {
 
   up: async function (context, driver, file) {
     const _file = file.get();
-    const chain = new Chain(context._driver, file, driver, context.internals);
+    const chain = new Chain(context._driver, file, driver, context.internals, context._pdriver);
     if (!_file._meta.noDefaultColumn) {
       chain.addChain(AddConventions);
     }
@@ -37,7 +37,7 @@ const execUnit = {
     chain.addChain(StateTravel);
     chain.addChain(Migrate);
 
-    await State.startMigration(context._driver, file, context.internals);
+    await State.startMigration(context._pdriver, file, context.internals);
     // 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
@@ -62,20 +62,20 @@ const execUnit = {
       throw err;
     }
     await Promise.promisify(context.writeMigrationRecord.bind(context))(file);
-    return State.endMigration(context._driver, file, context.internals);
+    return State.endMigration(context._pdriver, file, context.internals);
     // end migration, same as start migration
   },
 
   fix: async function (context, driver, file) {
     const _file = file.get();
-    const chain = new Chain(context._driver, file, driver, context.internals);
+    const chain = new Chain(context._driver, file, driver, context.internals, context._pdriver);
     if (!_file._meta.noDefaultColumn) {
       chain.addChain(AddConventions);
     }
     chain.addChain(Learn);
-    // chain.addChain(StateTravel);
+    chain.addChain(StateTravel);
 
-    await State.startMigration(context._driver, file, context.internals);
+    await State.startMigration(context._pdriver, file, context.internals);
     // 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
@@ -99,17 +99,16 @@ const execUnit = {
       await execUnit.down(context, driver, file);
       throw err;
     }
-    await Promise.promisify(context.writeMigrationRecord.bind(context))(file);
-    await State.endMigration(context._driver, file, context.internals);
+    await State.endMigration(context._pdriver, file, context.internals);
     log.verbose(`[fix] current schema`, util.inspect(context.internals.schema, false, null, true));
     // end migration, same as start migration
   },
 
   down: async function (context, driver, file) {
     // start migration, see up comments
-    await State.startMigration(context._driver, file, context.internals);
-    await TranslateState(context._driver, file, driver, context.internals);
-    await State.endMigration(context._driver, file, context.internals);
+    await State.startMigration(context._pdriver, file, context.internals);
+    await TranslateState(context._driver, file, driver, context.internals, context._pdriver);
+    await State.endMigration(context._pdriver, file, context.internals);
     return Promise.promisify(context.deleteMigrationRecord.bind(context))(file);
     // end migration, see up comments
   }

package/lib/methods/v2/statetravel.js

@@ -18,16 +18,17 @@ const DEFAULT = {
 };
 
 class StateTravel {
-  constructor (internals, file, driver) {
+  constructor (internals, file, driver, pdriver) {
     this.file = file;
     this.internals = internals;
     this.driver = driver;
+    this.pdriver = pdriver;
     this._counter = 0;
     this._default = async function _default () {
-      await State.step(this.driver, ++this._counter, this.internals);
+      await State.step(this.pdriver, ++this._counter, this.internals);
 
       return State.update(
-        this.driver,
+        this.pdriver,
         this.file,
         this.internals.modSchema,
         this.internals
@@ -49,9 +50,9 @@ const noTravelError = prop => {
 };
 
 module.exports = {
-  getInterface: (context, file, driver, internals) => {
+  getInterface: (context, file, driver, internals, pdriver) => {
     if (context.learnable) {
-      const st = new StateTravel(internals, file, context);
+      const st = new StateTravel(internals, file, context, pdriver);
       return Shadow.overshadow(
         driver,
         Object.assign(st, context.statechanger),

package/lib/methods/v2/translatestate.js

@@ -72,6 +72,7 @@ async function processEntry (
   file,
   driver,
   internals,
+  pdriver,
   { t: type, a: action, c: args }
 ) {
   let skip = false;
@@ -79,7 +80,7 @@ async function processEntry (
   if (
     internals.rollback === true &&
     internals.rollbackContinue !== true &&
-    driver.udriver._meta.signalColumns.indexOf(action) !== -1
+    driver.udriver._meta?.signalColumns?.indexOf(action) !== -1
   ) {
     internals.rollbackContinue = true;
     skip = driver.udriver._counter.previousSignal() === null;
@@ -101,20 +102,20 @@ async function processEntry (
   }
 
   internals.modSchema.s.shift();
-  await State.update(context, file, internals.modSchema, internals);
+  await State.update(pdriver, file, internals.modSchema, internals);
 }
 
-module.exports = async (context, file, driver, internals) => {
+module.exports = async (context, file, driver, internals, pdriver) => {
   const mod = internals.modSchema;
 
-  const chain = new Chain(context, file, driver, internals);
+  const chain = new Chain(context, file, driver, internals, pdriver);
   internals.unlearn = true;
 
   chain.addChain(Learn);
   chain.addChain(Migrate);
   await Promise.resolve(mod.s.reverse()).each(args =>
-    processEntry(context, file, chain, internals, args)
+    processEntry(context, file, chain, internals, pdriver, args)
   );
 
-  await State.deleteState(context, file, internals);
+  await State.deleteState(pdriver, file, internals);
 };

package/lib/state.js

@@ -1,12 +1,25 @@
 const MSTATE = '__dbmigrate_state__';
 const SSTATE = '__dbmigrate_schema__';
+const RUNON = 'run_on';
+
 const log = require('db-migrate-shared').log;
 const fs = require('fs').promises;
 const path = require('path');
+const crypto = require('crypto');
+
+const ID = crypto.randomBytes(32).toString('base64');
+let owner = false;
 
 module.exports = {
+  /**
+   * Lock state will add the basic state controller an ID
+   * and a process controlled date.
+   * It is important that all systems are in sync. We will use the
+   * database clock instead if possible.
+   */
   lockState: async function (driver, state, internals) {
     if (!state) {
+      owner = true;
       return driver._insertKV(
         internals.migrationState,
         MSTATE,
@@ -14,23 +27,48 @@ module.exports = {
           s: {
             step: 0,
             fin: 0,
+            ID,
             date: new Date()
           }
         })
       );
     } else {
+      let runOn = state.run_on;
       state = state.value;
       state = JSON.parse(state);
-      state.s.date = new Date();
-      return driver._updateKV(
+
+      if (!state.s.ID || state.s.ID !== ID) {
+        owner = true;
+        state.s.ID = ID;
+      }
+
+      const d = new Date();
+
+      state.s.date = d;
+      await driver._updateKVC(
         internals.migrationState,
         MSTATE,
-
-        JSON.stringify(state)
+        JSON.stringify(state),
+        RUNON,
+        runOn
       );
+
+      state = await driver._getKV(internals.migrationState, MSTATE);
+
+      runOn = state.run_on;
+      state = state.value;
+      state = JSON.parse(state);
+
+      if (state.s.ID !== ID) {
+        owner = false;
+      }
     }
   },
 
+  isOwner: function () {
+    return owner;
+  },
+
   init: async function (driver, internals, { emptyState, backupState }) {
     await driver._createKV(internals.migrationState);
     const _schema = await driver._getKV(internals.migrationState, SSTATE);
@@ -47,6 +85,7 @@ module.exports = {
 
         log.info(`[state] Created a backup of ${internals.migrationState} by renaming table to ${newName}`);
         await driver._createKV(internals.migrationState);
+        await driver._insertKV(internals.migrationState, SSTATE, '{}');
       }
     }
 
@@ -96,7 +135,7 @@ module.exports = {
       return Promise.resolve();
     }
 
-    await driver._updateKV(internals.migrationState, SSTATE, internals.schema);
+    await driver._updateKV(internals.migrationState, SSTATE, JSON.stringify(internals.schema));
 
     return driver._updateKV(
       internals.migrationState,
@@ -114,17 +153,40 @@ module.exports = {
       return Promise.resolve();
     }
 
-    let { value: state } = await driver._getKV(
+    let state = await driver._getKV(
       internals.migrationState,
       MSTATE
     );
+
+    let runOn = state.run_on;
+    state = state.value;
     state = JSON.parse(state);
-    state.s.date = new Date();
-    return driver._updateKV(
+
+    if (!state.s.ID || state.s.ID !== ID) {
+      owner = true;
+      state.s.ID = ID;
+    }
+
+    const d = new Date();
+
+    state.s.date = d;
+    await driver._updateKVC(
       internals.migrationState,
       MSTATE,
-      JSON.stringify(state)
+      JSON.stringify(state),
+      RUNON,
+      runOn
     );
+
+    state = await driver._getKV(internals.migrationState, MSTATE);
+
+    runOn = state.run_on;
+    state = state.value;
+    state = JSON.parse(state);
+
+    if (state.s.ID !== ID) {
+      owner = false;
+    }
   },
 
   step: async function (driver, step, internals) {
@@ -164,6 +226,9 @@ module.exports = {
     state.s.date = new Date();
     state.s.fin = 1;
 
+    // unlock from current process
+    state.s.ID = 0;
+
     return driver._updateKV(
       internals.migrationState,
       MSTATE,

package/lib/walker.js

@@ -24,10 +24,12 @@ const INTERFACES = {
   'static-seed': require('./interface/seederInterface.js')
 };
 
-const Walker = function (driver, directory, mode, intern, prefix) {
+const Walker = function (driver, directory, mode, intern, prefix, opts = {}) {
   this.driver = dbmUtil.reduceToInterface(driver, INTERFACES[prefix]);
   this._driver = driver;
+  this._pdriver = opts.db2;
   Promise.promisifyAll(this._driver);
+  Promise.promisifyAll(this._pdriver);
   this.directory = directory;
   this.internals = intern;
   /**
@@ -60,11 +62,11 @@ const Walker = function (driver, directory, mode, intern, prefix) {
 
 Walker.prototype = {
   createTables: async function (options) {
-    await State.init(this._driver, this.internals, options);
+    await State.init(this._pdriver, this.internals, options);
     return this._driver._createList(this.internals.migrationTable);
   },
 
-  createMigrationsTable: function (options) {
+  createMigrationsTable: function (options = {}) {
     if (
       typeof this._driver._createList !== 'function' ||
       typeof this._driver._getList !== 'function' ||

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "db-migrate",
   "description": "Database migration framework for node.js",
-  "author": "Tobias Gurtick",
+  "author": "Tobias Gurtzick",
   "bin": "./bin/db-migrate",
   "keywords": [
     "database",
@@ -31,7 +31,7 @@
     "programable",
     "api"
   ],
-  "version": "1.0.0-beta.26",
+  "version": "1.0.0-beta.28",
   "engines": {
     "node": ">=8.0.0"
   },

package/tttt.js

@@ -0,0 +1,2 @@
+
+