@axiosleo/orm-mysql 0.10.0 → 0.10.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.10.0',
+  version: '0.10.2',
   commands_dir: path.join(__dirname, '../commands'),
 });
 

package/index.d.ts

@@ -98,6 +98,10 @@ export declare class QueryCondition {
 
   where(key: string, opt: OptType, value: ConditionValueType | WhereOptions[], isOr?: boolean): this;
 
+  whereAnd(): this;
+
+  whereOr(): this;
+
   whereIn(key: string, value: string | string[] | number[] | Query): this;
 
   whereNotIn(key: string, value: string | string[] | number[] | Query): this;

package/package.json

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

package/src/builder.js

@@ -276,7 +276,8 @@ class Builder {
         `JSON_CONTAINS(JSON_ARRAY(?), JSON_EXTRACT(${k}, '${keys[1]}'))`;
       return isNot ? `${sql}=0` : sql;
     }
-    let res = this._buildConditionValues(condition.value);
+    let v = is.string(condition.value) ? condition.value.split(',').map(v => v.trim()) : condition.value;
+    let res = this._buildConditionValues(v);
     const opt = isNot ? 'NOT IN' : 'IN';
     return res ? `${this._buildFieldKey(condition.key)} ${opt} (${res})` : `${this._buildFieldKey(condition.key)} ${opt} (?)`;
   }

package/src/query.js

@@ -42,11 +42,11 @@ class QueryCondition {
       case 4:
       case 3: {
         const [key, opt, value] = args;
-        if (is.string(value) && optType.includes(value.toUpperCase()) >= -1) {
-          this.options.conditions.push({ key, opt: value, value: opt });
+        if (is.string(value) && optType.includes(value.toUpperCase())) {
+          this.options.conditions.push({ key, opt: value.toUpperCase(), value: opt });
           break;
         }
-        this.options.conditions.push({ key, opt, value });
+        this.options.conditions.push({ key, opt: opt.toUpperCase(), value });
         break;
       }
       case 2: {
@@ -77,48 +77,42 @@ class QueryCondition {
   }
 
   whereIn(key, value) {
-    if (is.string(value)) {
-      value = value.split(',').map(v => v.trim());
-    }
-    this.options.conditions.push({ key, opt: 'IN', value });
+    this.where(key, 'IN', value);
     return this;
   }
 
   whereNotIn(key, value) {
-    if (is.string(value)) {
-      value = value.split(',').map(v => v.trim());
-    }
-    this.options.conditions.push({ key, opt: 'NOT IN', value });
+    this.where(key, 'NOT IN', value);
     return this;
   }
 
   whereContain(key, value) {
-    this.options.conditions.push({ key, opt: 'CONTAIN', value });
+    this.where(key, 'CONTAIN', value);
     return this;
   }
 
   whereNotContain(key, value) {
-    this.options.conditions.push({ key, opt: 'NOT CONTAIN', value });
+    this.where(key, 'NOT CONTAIN', value);
     return this;
   }
 
   whereBetween(key, value) {
-    this.options.conditions.push({ key, opt: 'BETWEEN', value });
+    this.where(key, 'BETWEEN', value);
     return this;
   }
 
   whereNotBetween(key, value) {
-    this.options.conditions.push({ key, opt: 'NOT BETWEEN', value });
+    this.where(key, 'NOT BETWEEN', value);
     return this;
   }
 
   whereOverlaps(key, value) {
-    this.options.conditions.push({ key, opt: 'OVERLAPS', value });
+    this.where(key, 'OVERLAPS', value);
     return this;
   }
 
   whereNotOverlaps(key, value) {
-    this.options.conditions.push({ key, opt: 'NOT OVERLAPS', value });
+    this.where(key, 'NOT OVERLAPS', value);
     return this;
   }
 
@@ -126,7 +120,7 @@ class QueryCondition {
     if (is.array(value)) {
       value = value.join('');
     }
-    this.options.conditions.push({ key, opt: 'LIKE', value });
+    this.where(key, 'LIKE', value);
     return this;
   }
 
@@ -134,7 +128,7 @@ class QueryCondition {
     if (is.array(value)) {
       value = value.join('');
     }
-    this.options.conditions.push({ key, opt: 'NOT LIKE', value });
+    this.where(key, 'NOT LIKE', value);
     return this;
   }