db-migrate 1.0.0-beta.3 → 1.0.0-beta.30

package/lib/walker.js

@@ -24,13 +24,27 @@ 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;
-  this.internals.schema = { i: {}, c: {}, f: {} };
+  /**
+   * i: index
+   * c: schema
+   * f: foreignKey
+   * e: extra items for the schema (like ENUM tyes)
+   */
+  this.internals.schema = { i: {}, c: {}, f: {}, e: {} };
+  /**
+   * s: commands
+   * i: index
+   * f: foreignKey
+   * c: schema
+   */
   this.internals.modSchema = { i: {}, c: {}, f: {}, s: [] };
   this.mode = mode;
 
@@ -47,12 +61,12 @@ const Walker = function (driver, directory, mode, intern, prefix) {
 };
 
 Walker.prototype = {
-  createTables: async function () {
-    await State.init(this._driver, this.internals);
+  createTables: async function (options) {
+    await State.init(this._pdriver, this.internals, options);
     return this._driver._createList(this.internals.migrationTable);
   },
 
-  createMigrationsTable: function () {
+  createMigrationsTable: function (options = {}) {
     if (
       typeof this._driver._createList !== 'function' ||
       typeof this._driver._getList !== 'function' ||
@@ -73,7 +87,7 @@ Walker.prototype = {
       }
     }
 
-    return this.createTables();
+    return this.createTables(options);
   },
 
   writeMigrationRecord: function (migration, callback) {
@@ -227,6 +241,65 @@ Walker.prototype = {
       .nodeify(callback);
   },
 
+  fix: function (options, callback) {
+    const partialName = options.destination;
+    const count = options.count;
+    const sortFn = function (a, b) {
+      a = a.name.slice(0, a.name.indexOf('-'));
+      b = b.name.slice(0, b.name.indexOf('-'));
+
+      if (!isNaN(a)) {
+        return a - b;
+      }
+
+      return a.localeCompare(b);
+    };
+
+    const files = File.loadFromDatabase(
+      this.directory,
+      this.prefix,
+      this._driver,
+      this.internals
+    ).then(completedFiles => {
+      const toRun = dbmUtil.filterDown(completedFiles, partialName, count).sort(sortFn);
+
+      if (toRun.length === 0) {
+        log.info(this.title + 'Nothing to run');
+      }
+
+      if (this.internals.check) {
+        const toRunNames = toRun.map(migration => migration.name);
+        log.info(this.title + 'run:', toRunNames);
+        return toRunNames;
+      }
+
+      return toRun;
+    });
+
+    if (this.internals.check) {
+      return files.nodeify(callback);
+    }
+
+    return files
+      .each(file => {
+        log.verbose(this.title + 'preparing to run fix:', file.name);
+        const _meta = file.get()._meta || {};
+        const version = _meta.version || 1;
+        if (version < 2) {
+          log.warn(`${this.title} skipping "${file.name}" as v1 migrations do not maintain a schema`);
+          return Promise.resolve();
+        }
+
+        this.internals.modSchema = { i: {}, c: {}, f: {}, s: [] };
+        return require(`./executors/versioned/v${version}`).fix(
+          this,
+          this.driver,
+          file
+        );
+      })
+      .nodeify(callback);
+  },
+
   check: function (options, callback) {
     return Promise.all([
       File.loadFromDatabase(
@@ -241,7 +314,10 @@ Walker.prototype = {
         // Requires pr to export filterCompleted from db-migrate-shared
         const toRun = dbmUtil.filterCompleted(allFiles, completedFiles);
 
-        log.info('Files to run:', toRun.map(migration => migration.name));
+        log.info(
+          'Files to run:',
+          toRun.map(migration => migration.name)
+        );
         return toRun;
       })
       .nodeify(callback);

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.3",
+  "version": "1.0.0-beta.30",
   "engines": {
     "node": ">=8.0.0"
   },
@@ -44,38 +44,41 @@
     "url": "https://github.com/db-migrate/node-db-migrate.git"
   },
   "dependencies": {
-    "balanced-match": "^1.0.0",
-    "bluebird": "^3.1.1",
+    "bluebird": "^3.7.2",
     "db-migrate-shared": "^1.2.0",
     "deep-extend": "^0.6.0",
-    "dotenv": "^5.0.1",
+    "dotenv": "^16.3.1",
     "final-fs": "^1.6.0",
     "inflection": "^1.10.0",
     "mkdirp": "~0.5.0",
     "parse-database-url": "~0.3.0",
-    "prompt": "^1.0.0",
     "rc": "^1.2.8",
-    "resolve": "^1.1.6",
-    "semver": "^5.3.0",
+    "resolve": "^1.19.0",
     "tunnel-ssh": "^4.0.0",
-    "yargs": "^15.3.1"
+    "yargs": "^17.5.1"
   },
   "devDependencies": {
-    "@hapi/code": "5.x",
-    "@hapi/lab": "18.x",
+    "@babel/eslint-parser": "^7.21.8",
+    "@hapi/code": "9.x",
+    "@hapi/eslint-plugin": "^6.0.0",
+    "@hapi/lab": "25.x",
     "db-migrate-base": "^2.1.1",
-    "db-migrate-mysql": "^2.1.1",
-    "db-migrate-sqlite3": "^0.4.0",
-    "eslint": "^6.8.0",
+    "db-migrate-mysql": "^2.2.0",
+    "db-migrate-sqlite3": "^0.5.0",
+    "eslint": "^7.32.0",
     "eslint-config-standard": "^14.1.1",
-    "eslint-plugin-import": "^2.20.2",
+    "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^4.2.1",
-    "eslint-plugin-standard": "^4.0.1",
+    "eslint-plugin-promise": "^4.3.1",
+    "eslint-plugin-standard": "^4.1.0",
     "proxyquire": "^1.4.0",
     "rimraf": "^3.0.2",
     "sinon": "^9.0.2"
   },
+  "funding": {
+    "type": "opencollective",
+    "url": "https://opencollective.com/node-db-migrate"
+  },
   "scripts": {
     "prepublishOnly": "node generateLoader.js",
     "pretest": "eslint *.js lib/*.js",

package/tttt.js

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

package/.eslintignore

@@ -1 +0,0 @@
-test/migrations

package/.eslintrc

@@ -1,11 +0,0 @@
-{
-  "extends": "standard",
-  "parserOptions": {
-    "ecmaVersion": 2019 
-  },
-  "rules": {
-    "semi": ["error", "always"],
-    "no-unused-vars": "warn",
-    "quotes": ["error", "single", { "avoidEscape": true, "allowTemplateLiterals": true }]
-  }
-}

package/.jshintignore

@@ -1,2 +0,0 @@
-node_modules
-lib/inflection.js

package/.jshintrc

@@ -1,14 +0,0 @@
-{
-  "expr": true,
-  "-W092": false,
-  "quotmark": true,
-  "curly": false,
-  "bitwise": false,
-  "eqeqeq": true,
-  "funcscope": true,
-  "futurehostile": true,
-  "nonew": true,
-  "unused": true,
-  "shadow": true,
-  "loopfunc": true
-}

package/.labrc.js

@@ -1,10 +0,0 @@
-module.exports = {
-  coverage: true,
-  threshold: 74,
-  lint: false,
-  globals:
-    'verbose,dryRun,SharedArrayBuffer,Atomics,BigUint64Array,BigInt64Array,BigInt,URL,URLSearchParams,TextEncoder,TextDecoder,queueMicrotask',
-  assert: '@hapi/code',
-  verbose: true,
-  'coverage-exclude': ['lib/interface', 'lib/transitions']
-};

package/.prettierrc

@@ -1,3 +0,0 @@
-{
-  "singleQuote": true
-}

package/.tern-project

@@ -1,7 +0,0 @@
-{
-  "plugins": {
-    "node": {},
-    "lint": {},
-    "node-extension": {}
-  }
-}

package/.travis.yml

@@ -1,47 +0,0 @@
-language: node_js
-
-node_js:
-  - 8
-  - 10
-  - node
-
-notifications:
-  email:
-    recipients:
-      - magic@wizardtales.com
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/509c88551a18006fe93f
-    on_success: change
-    on_failure: always
-    on_start: false
-
-os:
-  - linux
-
-matrix:
-  allow_failures:
-    - node_js: node
-  fast_finish: true
-
-sudo: false
-
-cache:
-  npm: true
-  directories:
-    - node_modules
-
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - g++-4.8
-
-before_install:
-  - export CXX=g++-4.8; export CC=gcc-4.8;
-
-install: npm install
-
-before_script:
-  - cp test/db.config.ci test/db.config.json