Merge pull request #31 from flexxnn/new-fixes

Author: flexxnn

.gitignore

@@ -35,3 +35,5 @@ jspm_packages
 
 # Optional REPL history
 .node_repl_history
+
+*.sqlite

bin/makemigration.js

@@ -32,7 +32,14 @@ if (options.help)
     process.exit(0);    
 }
 
-let {migrationsDir, modelsDir} = pathConfig(options);
+if(!process.env.PWD){
+    process.env.PWD = process.cwd()
+}
+
+const {
+    migrationsDir, 
+    modelsDir
+} = pathConfig(options);
 
 // current state
 const currentState = {

bin/runmigration.js

@@ -20,7 +20,14 @@ const optionDefinitions = [
 
 const options = commandLineArgs(optionDefinitions);
 
-let {migrationsDir, modelsDir} = pathConfig(options);
+if(!process.env.PWD){
+    process.env.PWD = process.cwd()
+}
+
+let {
+    migrationsDir, 
+    modelsDir
+} = pathConfig(options);
 
 if (options.help)
 {

example/config/config.json

@@ -0,0 +1,6 @@
+{
+  "development": {
+    "storage": "database.sqlite",
+    "dialect": "sqlite"
+  }
+}

example/models/account.js

@@ -0,0 +1,34 @@
+/* eslint-disable key-spacing, no-multi-spaces */
+
+module.exports = function (DB, { INTEGER, BIGINT, DATE, STRING, ENUM, BOOLEAN, DATEONLY, NOW }) {
+  const Model = DB.define('account',
+    {
+      id:             { type: INTEGER,  allowNull: false, primaryKey: true, autoIncrement: true },
+      test_param:     { type: BIGINT,  allowNull: false, defaultValue: 1000 },
+      first_name:     { type: STRING,   allowNull: true, defaultValue: 'abc', field: 'first-name' },
+      last_name:      { type: STRING,   allowNull: false, defaultValue: '' },
+      nickname:       { type: STRING,   allowNull: false, defaultValue: '' },
+      gender:         { type: ENUM,     allowNull: false, values: ['male', 'female', 'unknown'], defaultValue: 'unknown' },
+      birth_date:     { type: DATEONLY, allowNull: true },
+      last_login_dt:  { type: DATE,     allowNull: true },
+      created_at:      { type: DATE,     allowNull: true, defaultValue: NOW },
+      email:          { type: STRING,   allowNull: false },
+      password:       { type: STRING,   allowNull: false },
+      is_deleted:     { type: BOOLEAN,  allowNull: false, defaultValue: false },
+      is_blocked:     { type: BOOLEAN,  allowNull: false, defaultValue: false },
+      // city_id -> city.id
+    },
+    {
+      timestamps: false,
+      underscored: true,
+      tableName: 'account'
+    }
+  )
+
+  Model.associate = (models) => {
+    Model.belongsTo(models.city)
+    // Model.hasMany(models.team, { foreignKey: { allowNull: false } })
+  }
+
+  return Model
+}

example/models/city.js

@@ -0,0 +1,28 @@
+/* eslint-disable key-spacing, no-multi-spaces */
+
+module.exports = function (DB, { INTEGER, STRING, BOOLEAN }) {
+  const Model = DB.define('city',
+    {
+      id:       { type: INTEGER, allowNull: false, primaryKey: true, autoIncrement: true },
+      title:    { type: STRING,  allowNull: false },
+      display:  { type: BOOLEAN, allowNull: false, defaultValue: true }
+      // country_id -> country.id
+    },
+    {
+      timestamps: false,
+      underscored: true,
+      tableName: 'city',
+      indexes: [
+        { fields: [ 'country_id' ] },
+        { fields: [ 'title' ] }
+      ]
+    }
+  )
+
+  Model.associate = (models) => {
+    Model.hasMany(models.account, { foreignKey: { allowNull: false } })
+    Model.belongsTo(models.country)
+  }
+
+  return Model
+}

example/models/country.js

@@ -0,0 +1,26 @@
+/* eslint-disable key-spacing, no-multi-spaces */
+
+module.exports = function (DB, { INTEGER, STRING, BOOLEAN }) {
+  const Model = DB.define('country',
+    {
+      id:       { type: INTEGER, allowNull: false, primaryKey: true, autoIncrement: true },
+      title:    { type: STRING,  allowNull: false },
+      display:  { type: BOOLEAN, allowNull: false, defaultValue: true }
+    },
+    {
+      timestamps: false,
+      underscored: true,
+      tableName: 'country',
+      indexes: [
+        { fields: [ 'title' ] },
+        { fields: [ 'display' ] }
+      ]
+    }
+  )
+
+  Model.associate = (models) => {
+    Model.hasMany(models.city, { foreignKey: { allowNull: false } })
+  }
+
+  return Model
+}

example/models/geo.js

@@ -0,0 +1,15 @@
+/* eslint-disable key-spacing, no-multi-spaces */
+
+module.exports = function (DB, { INTEGER, GEOMETRY, GEOGRAPHY }) {
+    const Model = DB.define('geo',
+      {
+        id:       { type: INTEGER, allowNull: false, primaryKey: true, autoIncrement: true },
+        geometry_1:    { type: GEOMETRY,  allowNull: false },
+        geometry_2:    { type: GEOMETRY('POINT'),  allowNull: false },
+        geometry_3:    { type: GEOMETRY('POINT', 4326),  allowNull: false },
+      }
+    )
+  
+    return Model
+  }
+  

example/models/index.js

@@ -0,0 +1,37 @@
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const Sequelize = require('sequelize');
+const basename = path.basename(__filename);
+const env = process.env.NODE_ENV || 'development';
+const config = require(__dirname + '/../config/config.json')[env];
+const db = {};
+
+let sequelize;
+if (config.use_env_variable) {
+  sequelize = new Sequelize(process.env[config.use_env_variable], config);
+} else {
+  sequelize = new Sequelize(config.database, config.username, config.password, config);
+}
+
+fs
+  .readdirSync(__dirname)
+  .filter(file => {
+    return (file.indexOf('.') !== 0) && (file !== basename) && (file.slice(-3) === '.js');
+  })
+  .forEach(file => {
+    const model = sequelize['import'](path.join(__dirname, file));
+    db[model.name] = model;
+  });
+
+Object.keys(db).forEach(modelName => {
+  if (db[modelName].associate) {
+    db[modelName].associate(db);
+  }
+});
+
+db.sequelize = sequelize;
+db.Sequelize = Sequelize;
+
+module.exports = db;

example/models/purchaseProducts.js

@@ -0,0 +1,21 @@
+/* eslint-disable key-spacing, no-multi-spaces */
+
+// @fix: https://github.com/flexxnn/sequelize-auto-migrations/issues/21
+
+module.exports = function (DB, { INTEGER, DECIMAL }) {
+    const purchaseProducts = DB.define('purchaseProducts', {
+        id: {
+          type: INTEGER.UNSIGNED,
+          allowNull: false,
+          autoIncrement: true,
+          primaryKey: true,
+        },
+        price: {
+          type: DECIMAL(6, 2),
+          allowNull: false,
+        },
+    });
+    
+    return purchaseProducts;
+  }
+