Add fallback to match previous behavior

Author: PythonCoderAS

bin/makemigration.js

@@ -29,7 +29,7 @@ if (options.help)
         let alias = (option.alias) ? ` (-${option.alias})` : '\t';
         console.log(`\t --${option.name}${alias} \t${option.description}`);
     });
-    process.exit(0);    
+    process.exit(0);
 }
 
 // Windows support
@@ -38,7 +38,7 @@ if(!process.env.PWD){
 }
 
 const {
-    migrationsDir, 
+    migrationsDir,
     modelsDir
 } = pathConfig(options);
 
@@ -56,28 +56,29 @@ if (!fs.existsSync(migrationsDir)) {
 const currentState = {
     tables: {}
 };
-    
+
 // load last state
 let previousState = {
     revision: 0,
     version: 1,
     tables: {}
 };
-    
+
 try {
     previousState = JSON.parse(fs.readFileSync(path.join(migrationsDir, '_current.json') ));
 } catch (e) { }
 
 //console.log(path.join(migrationsDir, '_current.json'), JSON.parse(fs.readFileSync(path.join(migrationsDir, '_current.json') )))
-let sequelize = require(modelsDir).default;
+let modelsDirMod = require(modelsDir);
+let sequelize = modelsDirMod.sequelize || modelsDirMod.default;
 
 let models = sequelize.models;
 
 currentState.tables = migrate.reverseModels(sequelize, models);
-    
+
 let actions = migrate.parseDifference(previousState.tables, currentState.tables);
 
-// sort actions    
+// sort actions
 migrate.sortActions(actions);
 
 let migration = migrate.getMigration(actions);
@@ -110,7 +111,7 @@ currentState.revision = previousState.revision + 1;
 fs.writeFileSync(path.join(migrationsDir, '_current.json'), JSON.stringify(currentState, null, 4) );
 
 // write migration to file
-let info = migrate.writeMigration(currentState.revision, 
+let info = migrate.writeMigration(currentState.revision,
                migration,
                migrationsDir,
                (options.name) ? options.name : 'noname',

bin/runmigration.js

@@ -26,7 +26,7 @@ if(!process.env.PWD){
 }
 
 let {
-    migrationsDir, 
+    migrationsDir,
     modelsDir
 } = pathConfig(options);
 
@@ -50,7 +50,8 @@ if (options.help)
     process.exit(0);
 }
 
-const sequelize = require(modelsDir).default;
+let modelsDirMod = require(modelsDir);
+let sequelize = modelsDirMod.sequelize || modelsDirMod.default;
 const queryInterface = sequelize.getQueryInterface();
 
 // execute all migration from
@@ -76,8 +77,8 @@ let migrationFiles = fs.readdirSync(migrationsDir)
       let rev = parseInt( path.basename(file).split('-',2)[1]);
       return (rev >= fromRevision);
   });
-  
-console.log("Migrations to execute:");  
+
+console.log("Migrations to execute:");
 migrationFiles.forEach((file) => {
     console.log("\t"+file);
 });
@@ -86,13 +87,13 @@ if (options.list)
     process.exit(0);
 
 
-Async.eachSeries(migrationFiles, 
+Async.eachSeries(migrationFiles,
     function (file, cb) {
         console.log("Execute migration from file: "+file);
         migrate.executeMigration(queryInterface, path.join(migrationsDir, file), fromPos, (err) => {
             if (stop)
                 return cb("Stopped");
-                
+
             cb(err);
         });
         // set pos to 0 for next migration