@axiosleo/orm-mysql 0.9.11-alpha.2 → 0.9.11-alpha.4

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.11-alpha.2',
+  version: '0.9.11-alpha.4',
   commands_dir: path.join(__dirname, '../commands'),
 });
 

package/index.d.ts

@@ -21,9 +21,9 @@ export type Clients = {
 
 export type ConditionValueType = null | string | number | boolean | Date | Array<string | number | boolean | Date> | Query;
 
-export type OptType = '=' | '!=' | '>' | '<' | '>=' | '<=' | 'LIKE'
-  | 'NOT LIKE' | 'IN' | 'NOT IN' | 'BETWEEN' | 'NOT BETWEEN' | 'IS' | 'IS NOT' | 'REGEXP' | 'NOT REGEXP'
-  | 'AND' | 'OR' | 'GROUP' | 'like' | 'not like' | 'in' | 'not in' | 'between' | 'not between' | 'is' | 'is not' | 'regexp' | 'not regexp' | 'group';
+export type OptType = '=' | '!=' | '>' | '<' | '>=' | '<=' |
+  'LIKE' | 'NOT LIKE' | 'IN' | 'NOT IN' | 'BETWEEN' | 'NOT BETWEEN' | 'IS' | 'IS NOT' | 'REGEXP' | 'NOT REGEXP' | 'AND' | 'OR' | 'GROUP' |
+  'like' | 'not like' | 'in' | 'not in' | 'between' | 'not between' | 'is' | 'is not' | 'regexp' | 'not regexp' | 'and' | 'or' | 'group';
 
 export interface WhereOptions {
   key: string | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@axiosleo/orm-mysql",
-  "version": "0.9.11-alpha.2",
+  "version": "0.9.11-alpha.4",
   "description": "MySQL ORM tool",
   "keywords": [
     "mysql",

package/src/operator.js

@@ -1,9 +1,11 @@
 'use strict';
 
+const os = require('os');
 const { Builder } = require('./builder');
 const Query = require('./query');
 const Hook = require('./hook');
 const { _query } = require('./core');
+const { printer } = require('@axiosleo/cli-tool');
 
 class QueryOperator extends Query {
   /**
@@ -56,6 +58,18 @@ class QueryOperator extends Query {
       }
       Hook.listen({ label: 'post', table: from, opt: this.options.operator }, this.options, res);
     } catch (err) {
+      const e = new Error();
+      let f = e.stack.split(os.EOL).find(s =>
+        !s.startsWith('Error') &&
+        s.indexOf('QueryOperator') < 0 &&
+        s.indexOf('node:internal') < 0
+      );
+      if (f) {
+        printer.println();
+        printer.print('[MySQL] error  : '.data).print(f.trim().warning).println();
+        printer.print('[MySQL] message: '.data).print(err.message.error).println();
+        printer.print('[MySQL] query  : '.data).print(err.sql).println().println();
+      }
       Hook.listen({ label: 'post', table: from, opt: this.options.operator }, this.options, err);
       throw err;
     }
@@ -108,10 +122,19 @@ class QueryOperator extends Query {
     if (conditions.length === 0) {
       throw new Error('conditions is required');
     }
+    if (!this.options.tables[0]) {
+      throw new Error('table is required');
+    }
     const query = new QueryOperator(this.conn, this.options);
-    const count = await query.whereConditions(...conditions).count();
+    const table = this.options.tables[0].table;
+    const alias = this.options.tables[0].alias;
+    const count = await query.table(table, alias)
+      .whereConditions(...conditions)
+      .count();
     if (count) {
-      return await query.whereConditions(...conditions).update(data);
+      return await query
+        .whereConditions(...conditions)
+        .update(data);
     }
     return await query.insert(data);
   }
@@ -144,6 +167,13 @@ class QueryHandler {
     return operator.tables(...tables);
   }
 
+  /**
+   * @deprecated
+   * @param {*} tableName 
+   * @param {*} data 
+   * @param {*} condition 
+   * @returns 
+   */
   async upsert(tableName, data, condition = {}) {
     const count = await this.table(tableName).whereObject(condition).count();
     if (count) {