@axiosleo/orm-mysql 0.9.11-alpha.3 → 0.9.11

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

package/index.d.ts

@@ -92,6 +92,8 @@ export declare class Query {
 
   tables(...tables: TableOption[]): this;
 
+  keys(...keys: string[]): this;
+
   limit(limit: number): this;
 
   offset(offset: number): this;
@@ -145,24 +147,25 @@ export declare class QueryOperator extends Query {
 
   find<T>(): Promise<T>;
 
-  update(data?: any): Promise<MySQLQueryResult>;
+  count(): Promise<number>;
 
-  update<T extends Object>(data?: T): Promise<MySQLQueryResult>;
+  delete(id?: number, index_field_name?: string): Promise<MySQLQueryResult>;
 
-  insert(data?: any): Promise<MySQLQueryResult>;
+  update(row?: any): Promise<MySQLQueryResult>;
 
-  insert<T extends Object>(data?: T): Promise<MySQLQueryResult>;
+  update<T extends Object>(row?: T): Promise<MySQLQueryResult>;
 
-  count(): Promise<number>;
+  insert(row?: any): Promise<MySQLQueryResult>;
 
-  /**
-   * delete data
-   * @param id 
-   * @param index_field_name default is 'id'
-   */
-  delete(id?: number, index_field_name?: string): Promise<MySQLQueryResult>;
+  insert<T extends Object>(row?: T): Promise<MySQLQueryResult>;
+
+  insertAll(rows: any[]): Promise<MySQLQueryResult[]>;
+
+  insertAll<T extends Object>(rows: T[]): Promise<MySQLQueryResult[]>;
+
+  upsertRow(row: any, ...conditions: WhereItem[]): Promise<MySQLQueryResult>;
 
-  upsertRow<T extends Object>(data: T, ...conditions: WhereItem[]): Promise<MySQLQueryResult>;
+  upsertRow<T extends Object>(row: T, ...conditions: WhereItem[]): Promise<MySQLQueryResult>;
 }
 
 export declare class QueryHandler {
@@ -192,6 +195,7 @@ export declare class QueryHandler {
 
   /**
    * insert or update
+   * @deprecated
    * @param tableName 
    * @param data 
    * @param condition 

package/package.json

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

package/src/builder.js

@@ -68,9 +68,12 @@ class Builder {
         break;
       }
       case 'insert': {
-        const fields = this._buildValues(options.data);
+        const { fields, sqlStr } = this._buildValues(options.data);
         emit(tmp, `INSERT INTO ${this._buildTables(options.tables)}(${fields.map((f) => `\`${f}\``).join(',')})`);
-        emit(tmp, `VALUES (${fields.map((f) => '?').join(',')})`);
+        emit(tmp, `VALUES ${sqlStr}`);
+        if (options.keys) {
+          emit(tmp, `ON DUPLICATE KEY UPDATE ${options.keys.map((f) => `\`${f}\` = VALUES(\`${f}\`)`).join(',')}`);
+        }
         sql = tmp.join(' ');
         break;
       }
@@ -78,7 +81,7 @@ class Builder {
         if (is.invalid(options.data)) {
           throw new Error('Data is required for update operation');
         }
-        const fields = this._buildValues(options.data);
+        const fields = this._buildValue(options.data);
         emit(tmp, `UPDATE ${this._buildTables(options.tables)}`);
         emit(tmp, `SET ${fields.map((f) => `\`${f}\` = ?`).join(',')}`);
         if (!options.conditions.length) {
@@ -210,7 +213,7 @@ class Builder {
     return sql;
   }
 
-  _buildValues(obj) {
+  _buildValue(obj) {
     const fields = [];
     Object.keys(obj).forEach((key) => {
       fields.push(`${key}`);
@@ -225,6 +228,18 @@ class Builder {
     return fields;
   }
 
+  _buildValues(value) {
+    let fields = [];
+    if (is.array(value)) {
+      [fields] = value.map((v) => this._buildValue(v));
+      let item = '(' + fields.map(f => '?').join(',') + ')';
+      return { fields, sqlStr: new Array(value.length).fill(item).join(',') };
+    }
+    fields = this._buildValue(value);
+
+    return { fields, sqlStr: '(' + fields.map(f => '?').join(',') + ')' };
+  }
+
   _buildConditionValues(val) {
     if (is.string(val)) {
       if (val.startsWith('`') && val.endsWith('`')) {

package/src/operator.js

@@ -1,9 +1,12 @@
 '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');
+const is = require('@axiosleo/cli-tool/src/helper/is');
 
 class QueryOperator extends Query {
   /**
@@ -56,6 +59,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;
     }
@@ -83,11 +98,28 @@ class QueryOperator extends Query {
     return await this.exec();
   }
 
-  async insert(data) {
+  async insert(data, keys = null) {
+    if (keys) {
+      this.options.onDuplicateKeys = keys;
+    }
     this.options.operator = 'insert';
-    if (typeof data !== 'undefined') {
+    if (!is.empty(data)) {
       this.set(data);
     }
+    if (!is.object(this.options.data)) {
+      throw new Error('data must be an object');
+    }
+    return await this.exec();
+  }
+
+  async insertAll(rows = []) {
+    this.options.operator = 'insert';
+    if (rows.length) {
+      this.options.data = rows;
+    }
+    if (!is.array(this.options.data)) {
+      throw new Error('data must be an array');
+    }
     return await this.exec();
   }
 
@@ -118,11 +150,11 @@ class QueryOperator extends Query {
       .whereConditions(...conditions)
       .count();
     if (count) {
-      return await query.table(table, alias)
+      return await query
         .whereConditions(...conditions)
         .update(data);
     }
-    return await query.table(this.options.tables[0]).insert(data);
+    return await query.insert(data);
   }
 }
 

package/src/query.js

@@ -31,7 +31,8 @@ class Query {
       having: [],
       joins: [],
       suffix: null,
-      transaction: false
+      transaction: false,
+      keys: null,
     };
     this.alias = alias || null;
   }
@@ -46,6 +47,11 @@ class Query {
     return this;
   }
 
+  keys(...keys) {
+    this.options.keys = keys;
+    return this;
+  }
+
   limit(limit) {
     this.options.pageLimit = limit;
     return this;
@@ -212,10 +218,10 @@ class Query {
   }
 
   set(data) {
-    if (!this.options.data) {
-      this.options.data = {};
+    if (is.invalid(data)) {
+      throw new Error('data is required');
     }
-    Object.assign(this.options.data, data);
+    this.options.data = data;
     return this;
   }