@axiosleo/orm-mysql 0.10.13 → 0.10.15

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

package/index.d.ts

@@ -98,6 +98,8 @@ export declare class QueryCondition {
 
   where(key: string, opt: OptType, value: ConditionValueType | WhereOptions[], isOr?: boolean): this;
 
+  where(obj: Record<string, ConditionValueType>): this;
+
   whereAnd(): this;
 
   whereOr(): this;
@@ -124,6 +126,9 @@ export declare class QueryCondition {
 
   whereCondition(condition: QueryCondition): this;
 
+  /**
+   * @deprecated will deprecated on v1.0+ version
+   */
   whereObject(obj: Record<string, ConditionValueType>): this;
 }
 

package/package.json

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

package/src/builder.js

@@ -58,9 +58,9 @@ class Builder {
         emit(tmp, this._buildJoins(options.joins));
         emit(tmp, this._buildCondition(options.conditions));
         emit(tmp, this._buildGroupField(options.groupField));
-        emit(tmp, this._buildPagination(options.pageLimit, options.pageOffset));
         emit(tmp, this._buildHaving(options.having));
         emit(tmp, this._buildOrders(options.orders));
+        emit(tmp, this._buildPagination(options.pageLimit, options.pageOffset));
         sql = tmp.join(' ');
         if (options.suffix) {
           sql += ' ' + options.suffix;

package/src/query.js

@@ -56,6 +56,13 @@ class QueryCondition {
         break;
       }
       case 1: {
+        if (is.object(args[0])) {
+          const obj = args[0];
+          Object.keys(obj).forEach((key) => {
+            this.options.conditions.push({ key, opt: '=', value: obj[key] });
+          });
+          break;
+        }
         const [opt] = args;
         this.options.conditions.push({ key: null, opt, value: null });
         break;