@axiosleo/orm-mysql 0.13.0 → 0.13.2

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

package/package.json

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

package/src/builder.js

@@ -583,25 +583,27 @@ class ManageSQLBuilder extends Builder {
   }
 
   createForeignKey(options) {
-    options.reference.onDelete = options.reference.onDelete ? options.reference.onDelete.toUpperCase() : 'NO ACTION';
-    options.reference.onUpdate = options.reference.onUpdate ? options.reference.onUpdate.toUpperCase() : 'NO ACTION';
+    if (options.references) {
+      options.references.onDelete = options.references.onDelete ? options.references.onDelete.toUpperCase() : 'NO ACTION';
+      options.references.onUpdate = options.references.onUpdate ? options.references.onUpdate.toUpperCase() : 'NO ACTION';
+    }
     _validate(options, {
       name: 'required|string',
       table: 'required|string',
       column: 'required|string',
-      'reference.tableName': 'required|string',
-      'reference.columnName': 'required|string',
-      'reference.onUpdate': [{ in: ['RESTRICT', 'CASCADE', 'SET NULL', 'NO ACTION'] }],
-      'reference.onDelete': [{ in: ['RESTRICT', 'CASCADE', 'SET NULL', 'NO ACTION'] }]
+      'references.tableName': 'required|string',
+      'references.columnName': 'required|string',
+      'references.onUpdate': [{ in: ['RESTRICT', 'CASCADE', 'SET NULL', 'NO ACTION'] }],
+      'references.onDelete': [{ in: ['RESTRICT', 'CASCADE', 'SET NULL', 'NO ACTION'] }]
     });
     return _render('ALTER TABLE `${table_name}` ADD CONSTRAINT `${name}` FOREIGN KEY (`${column_name}`) REFERENCES `${foreign_table}` (`${foreign_column}`) ON DELETE ${on_delete} ON UPDATE ${on_update}', {
       table_name: options.tableName,
       name: options.name,
       column_name: options.columnName,
-      foreign_table: options.reference.tableName,
-      foreign_column: options.reference.columnName,
-      on_delete: options.reference.onDelete || 'NO ACTION',
-      on_update: options.reference.onUpdate || 'NO ACTION',
+      foreign_table: options.references.tableName,
+      foreign_column: options.references.columnName,
+      on_delete: options.references.onDelete || 'NO ACTION',
+      on_update: options.references.onUpdate || 'NO ACTION',
     });
   }
 
@@ -657,11 +659,14 @@ class ManageSQLBuilder extends Builder {
       } else if (column.uniqIndex === true) {
         indexColumns.push(column);
       }
-      if (column.reference) {
-        column.reference.onDelete = column.reference.onDelete ? column.reference.onDelete.toUpperCase() : 'NO ACTION';
-        column.reference.onUpdate = column.reference.onUpdate ? column.reference.onUpdate.toUpperCase() : 'NO ACTION';
+      if (column.reference && !column.references) {
+        column.references = column.reference;
+      }
+      if (column.references) {
+        column.references.onDelete = column.references.onDelete ? column.references.onDelete.toUpperCase() : 'NO ACTION';
+        column.references.onUpdate = column.references.onUpdate ? column.references.onUpdate.toUpperCase() : 'NO ACTION';
 
-        _validate(column.reference, {
+        _validate(column.references, {
           table: 'required|string',
           column: 'required|string',
           onDelete: [{ in: ['RESTRICT', 'CASCADE', 'SET NULL', 'NO ACTION'] }],
@@ -671,11 +676,11 @@ class ManageSQLBuilder extends Builder {
           name: 'fk_' + table + '_' + column.name,
           table,
           column: column.name,
-          reference: {
-            tableName: column.reference.table,
-            columnName: column.reference.column,
-            onDelete: column.reference.onDelete,
-            onUpdate: column.reference.onUpdate
+          references: {
+            tableName: column.references.table,
+            columnName: column.references.column,
+            onDelete: column.references.onDelete,
+            onUpdate: column.references.onUpdate
           }
         });
       }

package/src/migration.js

@@ -9,7 +9,7 @@ const { _execSQL } = require('./core');
 const { _render } = require('@axiosleo/cli-tool/src/helper/str');
 const { _foreach } = require('@axiosleo/cli-tool/src/helper/cmd');
 const { _assign } = require('@axiosleo/cli-tool/src/helper/obj');
-const { TransactionHandler } = require('..');
+const { TransactionHandler } = require('./transaction');
 const { ManageSQLBuilder, Builder } = require('./builder');
 
 const migrationColumns = [
@@ -81,7 +81,13 @@ async function init(context) {
   context.pool = conn;
 
   handler = new QueryHandler(conn);
+  context.items = {};
   if (await handler.existTable(context.task_key, database)) {
+    printer.yellow('table ' + context.task_key + ' already exists').println();
+    const items = await handler.table(context.task_key).select();
+    items.forEach(item => {
+      context.items[item.filename] = true;
+    });
     conn.end();
     return;
   }
@@ -227,7 +233,7 @@ function _initMigration(file, queries = {}) {
         name: options.foreignKey ? options.foreignKey : 'fk_' + table + '_' + options.columnName,
         table: table,
         column: options.columnName,
-        reference: options.reference
+        references: options.references || options.reference  // 兼容性处理
       });
       const builder = new ManageSQLBuilder(options);
       queries[file].push({ sql: builder.sql, values: builder.values });
@@ -321,6 +327,12 @@ async function run(context) {
   const { files } = context;
   const queries = {};
   await _foreach(files, async (file) => {
+    if (context.action === 'up' && context.items[file]) {
+      printer.yellow(`Migration file "${file}" has been migrated.`).println();
+      return;
+    } else if (context.action === 'down' && !context.items[file]) {
+      return;
+    }
     const scriptPath = path.join(context.config.dir, file);
     const script = require(scriptPath);
     queries[file] = [];