Merge branch 'master' of github.com:flexxnn/sequelize-auto-migrations into new-fixes

Author: flexxnn

bin/makemigration.js

@@ -4,6 +4,7 @@ const commandLineArgs = require('command-line-args');
 const beautify          = require('js-beautify').js_beautify;
 
 let migrate = require("../lib/migrate");
+let pathConfig = require('../lib/pathconfig');
 
 const fs                = require("fs");
 const path              = require("path");
@@ -31,13 +32,7 @@ if (options.help)
     process.exit(0);    
 }
 
-if(!process.env.PWD){
-    process.env.PWD = process.cwd()
-}
-
-let migrationsDir = path.join(process.env.PWD, options['migrations-path'] || 'migrations'),
-    modelsDir     = path.join(process.env.PWD, options['models-path'] || 'models');
-
+let {migrationsDir, modelsDir} = pathConfig(options);
 
 // current state
 const currentState = {
@@ -56,7 +51,6 @@ try {
 } catch (e) { }
 
 //console.log(path.join(migrationsDir, '_current.json'), JSON.parse(fs.readFileSync(path.join(migrationsDir, '_current.json') )))
-
 let sequelize = require(modelsDir).sequelize;
 
 let models = sequelize.models;

bin/runmigration.js

@@ -6,6 +6,7 @@ const fs                = require("fs");
 const Async             = require("async");
 
 const migrate           = require("../lib/migrate");
+const pathConfig = require('../lib/pathconfig');
 
 const optionDefinitions = [
     { name: 'rev', alias: 'r', type: Number, description: 'Set migration revision (default: 0)', defaultValue: 0 },
@@ -19,12 +20,7 @@ const optionDefinitions = [
 
 const options = commandLineArgs(optionDefinitions);
 
-if(!process.env.PWD){
-    process.env.PWD = process.cwd()
-}
-
-let migrationsDir = path.join(process.env.PWD, options['migrations-path'] || 'migrations'),
-    modelsDir     = path.join(process.env.PWD, options['models-path'] || 'models');
+let {migrationsDir, modelsDir} = pathConfig(options);
 
 if (options.help)
 {

lib/migrate.js

@@ -255,6 +255,11 @@ const reverseModels = function(sequelize, models)
             models[model].options.indexes = idx_out;
         }
 
+        if (typeof models[model].options.charset !== 'undefined')
+        {
+            tables[models[model].tableName].charset = models[model].options.charset;
+        }
+        
         tables[models[model].tableName].indexes = models[model].options.indexes;
     }
 
@@ -282,12 +287,18 @@ const parseDifference = function(previousState, currentState)
                     let depends = [];
                     let tableName = df.rhs.tableName;
                     _.each(df.rhs.schema, (v) => { if ( v.references ) depends.push(v.references.model)});
-                    
+
+                    let options = {};
+                    if (typeof df.rhs.charset !== 'undefined') 
+                    {
+                        options.charset = df.rhs.charset;
+                    }
+
                     actions.push({
                         actionType: 'createTable',
                         tableName: tableName,
                         attributes: df.rhs.schema,
-                        options: {},
+                        options: options,
                         depends: depends
                     });
 

lib/pathconfig.js

@@ -0,0 +1,35 @@
+const path = require('path'),
+      fs   = require('fs');
+
+module.exports = function(options){
+    let sequelizercConfigs = [],
+        sequelizercPath = path.join(process.env.PWD, '.sequelizerc');
+
+    if (fs.existsSync(sequelizercPath)){
+        sequelizercConfigs = require(sequelizercPath);
+    }
+    
+    if(!process.env.PWD){
+        process.env.PWD = process.cwd()
+    }
+    
+    let migrationsDir = path.join(process.env.PWD, 'migrations'),
+        modelsDir = path.join(process.env.PWD, 'models');
+        
+    if (options['migrations-path']) {
+        migrationsDir = path.join(process.env.PWD, options['migrations-path']);
+    } else if (sequelizercConfigs['migrations-path']) {
+        migrationsDir = sequelizercConfigs['migrations-path'];
+    }
+    
+    if (options['models-path']) {
+        modelsDir = path.join(process.env.PWD, options['models-path']);
+    } else if (sequelizercConfigs['models-path']) {
+        modelsDir = sequelizercConfigs['models-path'];
+    }
+    
+    return {
+        migrationsDir: migrationsDir,
+        modelsDir: modelsDir
+    }
+}