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

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.3',
   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.3",
   "description": "MySQL ORM tool",
   "keywords": [
     "mysql",

package/src/operator.js

@@ -108,12 +108,21 @@ 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.table(table, alias)
+        .whereConditions(...conditions)
+        .update(data);
     }
-    return await query.insert(data);
+    return await query.table(this.options.tables[0]).insert(data);
   }
 }
 
@@ -144,6 +153,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) {