@axiosleo/orm-mysql 0.9.0 → 0.9.1

package/bin/orm-mysql.js

@@ -9,7 +9,7 @@ const app = new App({
   name: 'MySQL ORM CLI',
   desc: 'migrate, model, seed, etc.',
   bin: 'orm-mysql',
-  version: '0.9.0',
+  version: '0.9.1',
   commands_dir: path.join(__dirname, '../commands'),
 });
 

package/commands/migrate.js

@@ -15,9 +15,9 @@ class MigrateCommand extends Command {
 
     this.addOption('debug', 'd', '[false] debug mode', 'optional', false);
     this.addOption('host', null, '[localhost] mysql host', 'optional', 'localhost');
+    this.addOption('port', null, '[3306] port number to connect to the database', 'optional', 3306);
     this.addOption('user', null, '[root] username for connect to the database', 'optional', 'root');
     this.addOption('pass', null, 'password to connect to the database', 'optional', '');
-    this.addOption('port', null, '[3306] port number to connect to the database', 'optional', 3306);
     this.addOption('db', null, 'database name', 'optional', '');
   }
 
@@ -29,6 +29,7 @@ class MigrateCommand extends Command {
     const workflow = new Workflow(migration);
     try {
       await workflow.start({
+        task_key: 'migrate_logs',
         action: args.action,
         config: {
           dir: args.dir

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@axiosleo/orm-mysql",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "MySQL ORM tool",
   "keywords": [
     "mysql",

package/src/builder.js

@@ -273,6 +273,9 @@ class Builder {
     if (key === null) {
       return '';
     }
+    if (typeof key === 'undefined') {
+      throw new Error('Field key is required');
+    }
     if (key.indexOf('(') !== -1 && key.indexOf(')') !== -1) {
       let field = key.substring(key.indexOf('(') + 1, key.indexOf(')'));
       key = key.substring(0, key.indexOf('(')) + '(' + this._buildFieldWithTableName(field) + ')' + key.substring(key.indexOf(')') + 1);
@@ -501,9 +504,13 @@ class ManageSQLBuilder extends Builder {
       }
       if (options.default === null) {
         str += ' DEFAULT NULL';
-      } else if (options.default === 'timestamp') {
+      } else if (options.default === 'timestamp' || options.default === 'TIMESTAMP') {
         str += ' DEFAULT CURRENT_TIMESTAMP';
+      } else if (options.default === 'CURRENT_TIMESTAMP') {
+        str += ` DEFAULT ${options.default}`;
       } else if (is.string(options.default)) {
+        str += ` DEFAULT '${options.default}'`;
+      } else {
         str += ` DEFAULT ${options.default}`;
       }
     }

package/src/core.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const { Builder } = require('./builder');
+const is = require('@axiosleo/cli-tool/src/helper/is');
 
 /**
  * 
@@ -10,6 +11,9 @@ const { Builder } = require('./builder');
  * @returns 
  */
 const _query = (conn, options, opt = null) => {
+  if (is.empty(options)) {
+    options = { driver: 'mysql' };
+  }
   switch (options.driver) {
     case 'mysql': {
       if (opt === null) {

package/src/migration.js

@@ -58,7 +58,9 @@ async function init(context) {
     const connect = require(connectPath);
     _assign(context.connection, connect);
   }
-  context.task_key = 'migrate_' + context.connection.database;
+  if (!context.task_key) {
+    context.task_key = 'migrate_' + context.connection.database;
+  }
   let globalConn = createClient({
     ...context.connection,
     database: 'mysql'