@axiosleo/orm-mysql 0.9.0 → 0.9.2

package/README.md

@@ -197,6 +197,10 @@ try {
 
 ### Migration
 
+> [Migration examples](./examples/migration/).
+
+- Migration script example
+
 ```javascript
 'use strict';
 
@@ -204,14 +208,30 @@ try {
  * @param {import('@axiosleo/orm-mysql').MigrationInterface} migration
  */
 function up(migration) {
-  migration.createDatabase({ database_name: 'demo' });
+  migration.createTable('table1', {
+    field1: {
+      type: 'varchar',
+      length: 64,
+      allowNull: false,
+      uniqIndex: true
+    },
+    field2: {
+      type: 'VARCHAR',
+      allowNull: false
+    },
+    field3: {
+      type: 'VARCHAR',
+      comment: 'comment',
+      allowNull: false
+    },
+  });
 }
 
 /**
  * @param {import('@axiosleo/orm-mysql').MigrationInterface} migration
  */
 function down(migration) {
-  migration.dropDatabase({ database_name: 'demo' });
+  migration.dropTable('table1');
 }
 
 module.exports = {
@@ -220,6 +240,50 @@ module.exports = {
 };
 ```
 
+- Generate migration script
+
+```bash
+orm-mysql generate -h
+
+Usage:
+
+  generate [--] [name] <dir>
+  gen
+
+Arguments:
+
+ *name    Migration name
+  dir     Migration scripts directory
+```
+
+- Run migration
+
+```bash
+orm-mysql migrate -h
+
+Description:
+
+  Migrate database
+
+Usage:
+
+  migrate [options] [--] [action] <dir>
+
+Options:
+
+  -d, --debug    [false] debug mode
+  --host         [localhost] mysql host
+  --port         [3306] port number to connect to the database
+  --user         [root] username for connect to the database
+  --pass         password to connect to the database
+  --db           database name
+
+Arguments:
+
+ *action         up or down
+  dir            migration directory
+```
+
 ### Custom query driver
 
 ```javascript

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.2',
   commands_dir: path.join(__dirname, '../commands'),
 });
 

package/commands/generate.js

@@ -9,7 +9,8 @@ class GenerateCommand extends Command {
   constructor() {
     super({
       name: 'generate',
-      desc: ''
+      desc: '',
+      alias: ['gen']
     });
     this.addArgument('name', 'Migration name', 'required', '');
     this.addArgument('dir', 'Migration scripts directory', 'optional', process.cwd());

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/examples/base_column.js

@@ -0,0 +1,28 @@
+'use strict';
+
+/**
+ * @returns {Record<string, import('@axiosleo/orm-mysql').ColumnItem>}
+ */
+module.exports = {
+  id: {
+    type: 'int',
+    allowNull: false,
+    primaryKey: true,
+    autoIncrement: true
+  },
+  created_at: {
+    type: 'TIMESTAMP',
+    allowNull: false,
+    default: 'CURRENT_TIMESTAMP'
+  },
+  updated_at: {
+    type: 'TIMESTAMP',
+    allowNull: false,
+    default: 'CURRENT_TIMESTAMP',
+    onUpdate: 'CURRENT_TIMESTAMP'
+  },
+  disabled_at: {
+    type: 'TIMESTAMP',
+    allowNull: true
+  }
+};

package/examples/migration/.connect.js

@@ -1,9 +1,16 @@
 'use strict';
 
+const path = require('path');
+
+const dotenv = require('dotenv');
+dotenv.config({
+  path: path.join(__dirname, '../../../.env')
+});
+
 module.exports = {
-  host: 'localhost',
-  port: 13306,
-  user: 'root',
-  password: '3AQqZTfmww=Ftj',
-  database: 'cms'
+  host: process.env.MYSQL_HOST,
+  port: process.env.MYSQL_PORT,
+  user: process.env.MYSQL_USER,
+  password: process.env.MYSQL_PASS,
+  database: process.env.MYSQL_DB
 };

package/examples/migration/1706764048.init.js

@@ -0,0 +1,118 @@
+'use strict';
+
+const baseColumn = require('../base_column');
+
+/**
+ * @param {import('@axiosleo/orm-mysql').MigrationInterface} migration
+ */
+function up(migration) {
+  migration.createTable('orgs', {
+    ...baseColumn,
+    code: {
+      type: 'varchar',
+      length: 64,
+      allowNull: false,
+      uniqIndex: true
+    },
+    name: {
+      type: 'VARCHAR',
+      allowNull: false
+    },
+    type: {
+      type: 'VARCHAR',
+      comment: '集团 group;公司 company;',
+      allowNull: false
+    },
+  });
+
+  migration.createTable('account', {
+    ...baseColumn,
+    uuid: {
+      type: 'VARCHAR',
+      length: 36,
+      allowNull: false,
+      uniqIndex: true,
+      comment: 'uuid'
+    },
+    username: {
+      type: 'varchar',
+      length: 64,
+      allowNull: false,
+    },
+    name: {
+      type: 'VARCHAR',
+      length: 100,
+      allowNull: false,
+      comment: '姓名',
+    },
+    avatar: {
+      type: 'VARCHAR',
+      allowNull: true,
+      comment: '头像文件索引'
+    },
+    password: {
+      type: 'varchar',
+      length: 64,
+      allowNull: false
+    },
+    last_token: {
+      type: 'VARCHAR',
+      length: 36,
+      allowNull: true,
+      comment: '最后一次登录的token'
+    }
+  });
+  migration.createIndex('account', ['username asc']);
+
+  migration.createTable('account_orgs', {
+    id: baseColumn.id,
+    account_id: {
+      type: 'int',
+      allowNull: false,
+    },
+    org_id: {
+      type: 'int',
+      allowNull: false,
+    },
+    type: {
+      type: 'varchar',
+      length: 32,
+      allowNull: false,
+      comment: '组织创建者creator;组织管理员admin;组织用户user;',
+      default: 'user'
+    }
+  });
+  migration.createColumn('created_at', 'TIMESTAMP', 'account_orgs');
+  migration.createForeignKey({
+    tableName: 'account_orgs',
+    columnName: 'account_id',
+    reference: {
+      tableName: 'account',
+      columnName: 'id',
+      onDelete: 'CASCADE'
+    }
+  });
+  migration.createForeignKey({
+    tableName: 'account_orgs',
+    columnName: 'org_id',
+    reference: {
+      tableName: 'orgs',
+      columnName: 'id',
+      onDelete: 'CASCADE'
+    }
+  });
+}
+
+/**
+ * @param {import('@axiosleo/orm-mysql').MigrationInterface} migration
+ */
+function down(migration) {
+  migration.dropTable('account_orgs');
+  migration.dropTable('account');
+  migration.dropTable('orgs');
+}
+
+module.exports = {
+  up,
+  down
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@axiosleo/orm-mysql",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "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);
@@ -347,7 +350,7 @@ class ManageSQLBuilder extends Builder {
       table: 'required|string',
       name: 'required|string',
       type: 'required|string',
-      length: 'number',
+      length: 'integer',
       unsigned: 'boolean',
       allowNull: 'boolean',
       default: 'string',
@@ -467,7 +470,6 @@ class ManageSQLBuilder extends Builder {
     _validate(options, {
       name: 'required|string',
       type: 'required|string',
-      default: 'string',
       onUpdate: 'string',
       length: 'integer',
       comment: 'string',
@@ -501,9 +503,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'

package/examples/migration/20240101.create.table.js

@@ -1,28 +0,0 @@
-'use strict';
-
-/**
- * @param {import('../../').MigrationInterface} migration
- */
-function up(migration) {
-  migration.createTable({
-    table_name: 'organization',
-    columns: [{
-      column_name: 'id',
-      type: 'int(11)',
-      not_null: true,
-      is_primary_key: true,
-    }]
-  });
-}
-
-/**
- * @param {import('../../').MigrationInterface} migration
- */
-function down(migration) {
-  migration.dropTable({ table_name: 'table1' });
-}
-
-module.exports = {
-  up,
-  down
-};

package/examples/migration/20240102.1.create.column.js

@@ -1,14 +0,0 @@
-'use strict';
-
-async function up(migration) {
-
-}
-
-async function down(migration) {
-
-}
-
-module.exports = {
-  up,
-  down
-};

package/examples/migration/20240102.2.create.index.js

@@ -1 +0,0 @@
-'use strict';