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

package/lib/commands/check.js

@@ -21,15 +21,15 @@ async function prepare (internals, config) {
     );
 
     if (internals.locTitle) {
-      migrator.migrationsDir = path.resolve(
+      migrator.directory = path.resolve(
         internals.argv['migrations-dir'],
         internals.locTitle
       );
     } else {
-      migrator.migrationsDir = path.resolve(internals.argv['migrations-dir']);
+      migrator.directory = path.resolve(internals.argv['migrations-dir']);
     }
 
-    internals.migrationsDir = migrator.migrationsDir;
+    internals.migrationsDir = migrator.directory;
 
     await migrator.createMigrationsTable();
     log.verbose('migration table created');

package/lib/commands/create-migration.js

@@ -5,18 +5,38 @@ const log = require('db-migrate-shared').log;
 const mkdirp = Promise.promisify(require('mkdirp'));
 const fs = require('fs');
 const stat = Promise.promisify(fs.stat);
+const writeFile = Promise.promisify(fs.writeFile);
 const yargs = require('yargs');
 const util = require('util');
+const path = require('path');
 
 async function createMigrationDir (dir) {
   const res = await stat(dir).catch(_ => {
     return { err: true };
   });
   if (res && res.err === true) {
-    return mkdirp(dir);
+    await mkdirp(dir);
   }
 
-  return Promise.resolve();
+  // Create migrations/package.json to ensure migration files are
+  // executed as CJS and not ESM
+  // https://github.com/db-migrate/node-db-migrate/issues/721
+  const packageJsonPath = path.resolve(dir, 'package.json');
+
+  await stat(packageJsonPath).then(
+    async () => {
+      const packageJson = require(packageJsonPath);
+      packageJson.type = 'commonjs';
+      const packageJsonStr = JSON.stringify(packageJson, null, 2);
+      await writeFile(packageJsonPath, packageJsonStr, 'utf-8');
+    },
+    async (err) => {
+      const packageJson = JSON.stringify({
+        type: 'commonjs'
+      }, null, 2)
+      await writeFile(packageJsonPath, packageJson, 'utf-8');
+    }
+  )
 }
 
 async function executeCreateMigration (internals, config) {

package/lib/commands/down.js

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

package/lib/commands/sync.js

@@ -21,15 +21,15 @@ async function prepare (internals, config) {
     );
 
     if (internals.locTitle) {
-      migrator.migrationsDir = path.resolve(
+      migrator.directory = path.resolve(
         internals.argv['migrations-dir'],
         internals.locTitle
       );
     } else {
-      migrator.migrationsDir = path.resolve(internals.argv['migrations-dir']);
+      migrator.directory = path.resolve(internals.argv['migrations-dir']);
     }
 
-    internals.migrationsDir = migrator.migrationsDir;
+    internals.migrationsDir = migrator.directory;
 
     await migrator.createMigrationsTable();
     log.verbose('migration table created');

package/lib/commands/up.js

@@ -21,15 +21,15 @@ async function prepare (internals, config) {
     );
 
     if (internals.locTitle) {
-      migrator.migrationsDir = path.resolve(
+      migrator.directory = path.resolve(
         internals.argv['migrations-dir'],
         internals.locTitle
       );
     } else {
-      migrator.migrationsDir = path.resolve(internals.argv['migrations-dir']);
+      migrator.directory = path.resolve(internals.argv['migrations-dir']);
     }
 
-    internals.migrationsDir = migrator.migrationsDir;
+    internals.migrationsDir = migrator.directory;
 
     await migrator.createMigrationsTable();
     log.verbose('migration table created');

package/lib/learn.js

@@ -17,6 +17,10 @@ class STD {
     this.indizies = schema.i;
     this.schema = schema.c;
     this.foreign = schema.f;
+    if (!schema.e) {
+      schema.e = {};
+    }
+    this.extra = schema.e;
     this.modS = mod.c;
     this.modI = mod.i;
     this.modF = mod.f;
@@ -87,6 +91,16 @@ class STD {
       delete this.schema[t];
     }
 
+    if (this.foreign[t]) {
+      this.modF[n] = this.foreign[n];
+      delete this.foreign[t];
+    }
+
+    if (this.indizies[t]) {
+      this.modI[n] = this.indizies[t];
+      delete this.indizies[t];
+    }
+
     this.modC.push({ t: 0, a: 'renameTable', c: [n, t] });
 
     return Promise.resolve();

package/lib/walker.js

@@ -34,8 +34,9 @@ const Walker = function (driver, directory, mode, intern, prefix) {
    * i: index
    * c: schema
    * f: foreignKey
+   * e: extra items for the schema (like ENUM tyes)
    */
-  this.internals.schema = { i: {}, c: {}, f: {} };
+  this.internals.schema = { i: {}, c: {}, f: {}, e: {} };
   /**
    * s: commands
    * i: index

package/package.json

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