db-migrate 1.7.0 → 1.8.0

package/api.js

@@ -192,6 +192,18 @@ dbmigrate.prototype = {
     this.internals.argv = argv;
   },
 
+  /**
+   * Every call starts from the options of the instance: the count,
+   * destination and scope of an earlier call do not carry over.
+   */
+  _begin: function () {
+    delete this.internals.argv.count;
+    delete this.internals.argv.destination;
+    this.internals.migrationMode = undefined;
+    this.internals.matching = '';
+    this.internals.locTitle = undefined;
+  },
+
   /**
    * Executes up a given number of migrations or a specific one.
    *
@@ -199,6 +211,7 @@ dbmigrate.prototype = {
    */
   up: function (specification, opts, callback) {
     var executeUp = load('up');
+    this._begin();
 
     if (arguments.length > 0) {
       if (typeof specification === 'string') {
@@ -229,6 +242,7 @@ dbmigrate.prototype = {
    */
   down: function (specification, opts, callback) {
     var executeDown = load('down');
+    this._begin();
 
     if (arguments.length > 0) {
       if (typeof specification === 'number') {
@@ -255,6 +269,7 @@ dbmigrate.prototype = {
 
   fix: function (specification, opts, callback) {
     var executeFix = load('fix');
+    this._begin();
 
     if (arguments.length > 0) {
       if (typeof specification === 'string') {
@@ -280,6 +295,7 @@ dbmigrate.prototype = {
 
   check: function (specification, opts, callback) {
     var executeCheck = load('check');
+    this._begin();
 
     if (arguments.length > 0) {
       if (typeof specification === 'number') {
@@ -308,6 +324,7 @@ dbmigrate.prototype = {
    */
   sync: function (specification, opts, callback) {
     var executeSync = load('sync');
+    this._begin();
 
     if (arguments.length > 0) {
       if (typeof specification === 'string') {
@@ -332,6 +349,7 @@ dbmigrate.prototype = {
    */
   reset: function (scope, callback) {
     var executeDown = load('down');
+    this._begin();
 
     if (typeof scope === 'string') {
       this.internals.migrationMode = scope;
@@ -427,6 +445,7 @@ dbmigrate.prototype = {
    * or due, see lib/status.js.
    */
   status: function (scope, callback) {
+    this._begin();
     if (typeof scope === 'function') {
       callback = scope;
       scope = undefined;

package/connect.js

@@ -71,9 +71,8 @@ exports.connect = async function (config, PassedClass) {
     await Promise.promisify(db2.switchDatabase, { context: db2 })(switchTo);
   }
 
-  if (scope) {
-    internals.locTitle = scope;
-  }
+  // of this run only, an instance of the API runs several
+  internals.locTitle = scope || undefined;
 
   return new PassedClass(
     db,

package/index.js

@@ -45,7 +45,16 @@ function loadPlugins (options) {
   var hooks = {};
 
   for (; i < length; ++i) {
-    var plugin = require(path.join(options.cwd, 'node_modules', plugins[i]));
+    var plugin;
+
+    try {
+      // resolved like node does from the project, so plugins hoisted in a
+      // monorepo are found as well
+      plugin = require(require.resolve(plugins[i], { paths: [options.cwd] }));
+    } catch (err) {
+      log.warn(`Could not load the plugin ${plugins[i]}: ${err.message}`);
+      continue;
+    }
 
     if (!plugin.hooks || !plugin.loadPlugin) {
       continue;

package/lib/commands/down.js

@@ -23,7 +23,10 @@ async function prepare (internals, config) {
       Migrator
     );
 
-    migrator.directory = path.resolve(internals.argv['migrations-dir']);
+    migrator.directory = path.resolve(
+      internals.argv['migrations-dir'],
+      internals.locTitle || ''
+    );
 
     await migrator.createMigrationsTable();
     log.verbose('migration table created');

package/lib/config.js

@@ -97,16 +97,28 @@ exports.loadFile = function (fileName, currentEnv, plugins) {
 // resolves { "ENV": ... } entries of a config, in place
 exports.resolveEnv = walkConfig;
 
+/**
+ * The value of { "ENV": "NAME", "default": value }, the default if the
+ * variable is not set or empty.
+ */
+function fromEnv (entry) {
+  var value = process.env[entry.ENV];
+
+  if (value === undefined || value === '') {
+    if (Object.prototype.hasOwnProperty.call(entry, 'default')) {
+      return entry.default;
+    }
+
+    log.verbose('Environment variable ' + entry.ENV + ' is empty!');
+  }
+
+  return value;
+}
+
 function walkConfig (level) {
   for (var configEntry in level) {
     if (level[configEntry] && level[configEntry].ENV) {
-      if (!process.env[level[configEntry].ENV]) {
-        log.verbose(
-          'Environment variable ' + level[configEntry].ENV + ' is empty!'
-        );
-      }
-
-      level[configEntry] = process.env[level[configEntry].ENV];
+      level[configEntry] = fromEnv(level[configEntry]);
     } else if (level[configEntry] && typeof level[configEntry] === 'object') {
       level[configEntry] = walkConfig(level[configEntry]);
     }
@@ -121,11 +133,19 @@ exports.loadObject = function (_config, currentEnv) {
   var config = JSON.parse(JSON.stringify(_config));
 
   for (var env in config) {
+    if (env === 'defaultEnv' || env === 'default') {
+      continue;
+    }
+
     if (config[env].ENV) {
-      if (!process.env[config[env].ENV]) {
-        log.verbose('Environment variable ' + config[env].ENV + ' is empty!');
-      } else {
-        out[env] = parseDatabaseUrl(process.env[config[env].ENV]);
+      // a database url from the environment, the other keys next to it
+      // are added to it
+      var url = fromEnv(config[env]);
+      if (url) {
+        var rest = Object.assign({}, config[env]);
+        delete rest.ENV;
+        delete rest.default;
+        out[env] = Object.assign(parseDatabaseUrl(url), walkConfig(rest));
       }
     } else if (typeof config[env] === 'string') {
       out[env] = parseDatabaseUrl(config[env]);
@@ -183,7 +203,8 @@ exports.loadObject = function (_config, currentEnv) {
     out.setCurrent(config.default);
   } else if (config.defaultEnv) {
     if (config.defaultEnv.ENV) {
-      out.setCurrent(process.env[config.defaultEnv.ENV]);
+      // without the variable and a default, the default environments
+      out.setCurrent(fromEnv(config.defaultEnv) || ['dev', 'development']);
     } else {
       out.setCurrent(config.defaultEnv);
     }

package/lib/file.js

@@ -221,10 +221,25 @@ File.loadFromDatabase = function (dir, prefix, driver, internals) {
       );
     })
     .map(function (result) {
-      return new File(path.join(dir, result.name), internals);
+      // the names are recorded with their scope, dir is the directory of the
+      // scope already
+      return new File(path.join(rootOf(dir, internals.matching), result.name), internals);
     });
 };
 
+/**
+ * The migrations directory of a scope directory.
+ */
+function rootOf (dir, scope) {
+  const resolved = path.resolve(dir);
+
+  if (scope && resolved.endsWith(path.sep + path.normalize(scope))) {
+    return resolved.slice(0, -(path.normalize(scope).length + 1));
+  }
+
+  return dir;
+}
+
 Promise.promisifyAll(fs);
 
 module.exports = File;

package/lib/template.js

@@ -105,8 +105,6 @@ Template.prototype.sqlFileLoaderTemplate = function () {
     '  return new Promise( function( resolve, reject ) {',
     "    fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){",
     '      if (err) return reject(err);',
-    "      console.log('received data: ' + data);",
-    '',
     '      resolve(data);',
     '    });',
     '  })',
@@ -122,8 +120,6 @@ Template.prototype.sqlFileLoaderTemplate = function () {
     '  return new Promise( function( resolve, reject ) {',
     "    fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){",
     '      if (err) return reject(err);',
-    "      console.log('received data: ' + data);",
-    '',
     '      resolve(data);',
     '    });',
     '  })',
@@ -171,8 +167,6 @@ Template.prototype.sqlFileLoaderIgnoreOnInitTemplate = function () {
     '    return new Promise( function( resolve, reject ) {',
     "       fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){",
     '         if (err) return reject(err);',
-    "         console.log('received data: ' + data);",
-    '',
     '         resolve(data);',
     '       });',
     '    })',
@@ -181,7 +175,6 @@ Template.prototype.sqlFileLoaderIgnoreOnInitTemplate = function () {
     '    });',
     '  }',
     '  else {',
-    "   console.log('ignoring on init: ' + filePath)",
     '   return null;',
     '  }',
     '};',
@@ -193,8 +186,6 @@ Template.prototype.sqlFileLoaderIgnoreOnInitTemplate = function () {
     '  return new Promise( function( resolve, reject ) {',
     "    fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){",
     '      if (err) return reject(err);',
-    "      console.log('received data: ' + data);",
-    '',
     '      resolve(data);',
     '    });',
     '  })',

package/lib/walker.js

@@ -48,6 +48,12 @@ const Walker = function (driver, directory, mode, intern, prefix, opts = {}) {
    * c: schema
    */
   this.internals.modSchema = { i: {}, c: {}, f: {}, s: [] };
+  // the state of an earlier run of the same instance of the API, e.g. a
+  // down leaves unlearn set, which would keep up from recording anything
+  this.internals.unlearn = false;
+  this.internals.rollback = false;
+  this.internals.rollbackContinue = false;
+  this.internals.learnFromScratch = false;
   this.mode = mode;
 
   if (!this.mode) this.prefix = `static-${prefix}`;

package/package.json

@@ -31,7 +31,7 @@
     "programmable",
     "api"
   ],
-  "version": "1.7.0",
+  "version": "1.8.0",
   "bugs": {
     "url": "https://github.com/db-migrate/node-db-migrate/issues"
   },