db-migrate 1.0.0-beta.18 → 1.0.0-beta.19

package/LICENSE

@@ -20,3 +20,29 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+AI OSS License
+
+Copyright (c) 2015 db-migrate
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software, as well as in results by
+AI models, which result from the source code this License applies to.
+The source code is not allowed to be used for training except for
+models that itself are open source.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+

package/README.md

@@ -1,5 +1,5 @@
 [![Backers on Open Collective](https://opencollective.com/node-db-migrate/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/node-db-migrate/sponsors/badge.svg)](#sponsors)
-[![Build Status](https://travis-ci.org/db-migrate/node-db-migrate.svg?branch=master)](https://travis-ci.org/db-migrate/node-db-migrate)
+[![Build Status](https://github.com/db-migrate/node-db-migrate/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/db-migrate/node-db-migrate/actions/workflows/ci.yml)
 [![Dependency Status](https://david-dm.org/db-migrate/node-db-migrate.svg)](https://david-dm.org/db-migrate/node-db-migrate)
 [![devDependency Status](https://david-dm.org/db-migrate/node-db-migrate/dev-status.svg)](https://david-dm.org/db-migrate/node-db-migrate#info=devDependencies)
 [![Documentation Status](https://readthedocs.org/projects/db-migrate/badge/?version=latest)](https://readthedocs.org/projects/db-migrate/?badge=latest)

package/lib/driver/index.js

@@ -92,19 +92,24 @@ exports.connect = function (config, intern, callback) {
   log.verbose('connecting');
 
   var connect = function (config) {
-    driver.connect(config, intern, function (err, db) {
-      if (err) {
-        callback(err);
-        return;
-      }
-      log.verbose('connected');
+    driver.connect(
+      // safe disconnect of our config object into userspace
+      JSON.parse(JSON.stringify(config)),
+      intern,
+      function (err, db) {
+        if (err) {
+          callback(err);
+          return;
+        }
+        log.verbose('connected');
 
-      if (!global.immunity) {
-        db = Shadow.infect(db, internals, ShadowProto);
-      }
+        if (!global.immunity) {
+          db = Shadow.infect(db, internals, ShadowProto);
+        }
 
-      callback(null, db);
-    });
+        callback(null, db);
+      }
+    );
   };
 
   if (config.tunnel) {
@@ -124,11 +129,12 @@ exports.connect = function (config, intern, callback) {
     tunnelConfig.dstPort = config.port;
 
     if (plugin) {
-      tunnel = plugin[
-        `connection:tunnel:${
-          tunnelType && tunnelType !== 'ssh' ? tunnelType : 'ssh'
-        }`
-      ](tunnelConfig);
+      tunnel =
+        plugin[
+          `connection:tunnel:${
+            tunnelType && tunnelType !== 'ssh' ? tunnelType : 'ssh'
+          }`
+        ](tunnelConfig);
     }
 
     if (tunnelConfig.privateKeyPath) {

package/lib/learn.js

@@ -8,7 +8,7 @@ class STD {
         throw new Error(`There is no ${t} table in schema!`);
       }
 
-      if (!this.schema[t][c]) {
+      if (!this.schema[t][c] && !this.schema[t].columns[c]) {
         throw new Error(`There is no ${c} column in schema!`);
       }
     };
@@ -121,8 +121,10 @@ class STD {
   removeColumn (t, c, o = {}) {
     const alter = {};
     this.checkColumn(t, c);
+    const hasColumns = this.schema[t].columns !== undefined
+    const columns = hasColumns ? this.schema[t].columns ? this.schema[t];
 
-    if (this.schema[t][c].notNull === true) {
+    if (columns[c].notNull === true) {
       if (this.validations.columnStrategies !== true) {
         if (
           this.driver._meta &&
@@ -170,10 +172,10 @@ class STD {
 
     this.modS[t] = {};
 
-    if (this.schema[t][c].notNull === true) {
+    if (columns[c].notNull === true) {
       switch (o.columnStrategy) {
         case 'delay':
-          this.modS[t][c] = this.schema[t][c];
+          this.modS[t][c] = columns[c];
 
           o.passthrough = o.passthrough || {};
           o.passthrough.column =
@@ -188,19 +190,23 @@ class STD {
 
           break;
         case 'defaultValue':
-          this.modS[t][c] = this.schema[t][c];
+          this.modS[t][c] = columns[c];
           this.modS[t][c].defaultValue = o.passthrough.defaultValue;
 
           this.modC.push({ t: 1, a: 'addColumn', c: [t, c, o] });
           break;
       }
     } else {
-      this.modS[t][c] = this.schema[t][c];
+      this.modS[t][c] = columns[c];
 
       this.modC.push({ t: 1, a: 'addColumn', c: [t, c, o] });
     }
 
-    delete this.schema[t][c];
+    if(hasColumns) {
+      delete this.schema[t].columns[c];
+    } else {
+      delete this.schema[t][c];
+    } 
 
     return Promise.resolve(alter);
   }
@@ -221,7 +227,10 @@ class STD {
       throw new Error(`There is no ${t} table in schema!`);
     }
     this.schema[t] = this.schema[t] || {};
-    this.schema[t][c] = s;
+const hasColumns = this.schema[t].columns !== undefined
+    const columns = hasColumns ? this.schema[t].columns ? this.schema[t];
+
+    columns[c] = s;
 
     this.modC.push({ t: 0, a: 'removeColumn', c: [t, c] });
 
@@ -233,8 +242,12 @@ class STD {
 
     if (!this.modS[t]) this.modS[t] = {};
 
-    this.modS[t][c] = this.schema[t][c];
-    this.schema[t][c] = Object.assign(this.schema[t][c], s);
+const hasColumns = this.schema[t].columns !== undefined
+    const columns = hasColumns ? this.schema[t].columns ? this.schema[t];
+
+
+    this.modS[t][c] = columns[c];
+    columns[c] = Object.assign(columns[c], s);
 
     this.modC.push({ t: 1, a: 'changeColumn', c: [t, c] });
 

package/lib/methods/v2/translatestate.js

@@ -52,7 +52,7 @@ const methods = {
       );
       log.warn(
         `This index did not exist at the time of deleting it. ` +
-          `This can happen if an index was created by hand and then deleted` +
+          `This can happen if an index was created by hand and then deleted ` +
           `by db-migrate. Make sure to recreate it by hand to avoid any problems.`
       );
       return Promise.resolve();

package/package.json

@@ -31,7 +31,7 @@
     "programable",
     "api"
   ],
-  "version": "1.0.0-beta.18",
+  "version": "1.0.0-beta.19",
   "engines": {
     "node": ">=8.0.0"
   },
@@ -53,10 +53,10 @@
     "mkdirp": "~0.5.0",
     "parse-database-url": "~0.3.0",
     "rc": "^1.2.8",
-    "resolve": "^1.1.6",
+    "resolve": "^1.19.0",
     "semver": "^5.3.0",
     "tunnel-ssh": "^4.0.0",
-    "yargs": "^15.3.1"
+    "yargs": "^17.5.1"
   },
   "devDependencies": {
     "@hapi/code": "5.x",