@axiosleo/orm-mysql 0.9.16 → 0.9.17

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

package/index.d.ts

@@ -22,8 +22,8 @@ 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' | 'CONTAIN' | 'NOT contain' |
-  'like' | 'not like' | 'in' | 'not in' | 'between' | 'not between' | 'is' | 'is not' | 'regexp' | 'not regexp' | 'and' | 'or' | 'group' | 'contain' | 'not contain';
+  'LIKE' | 'NOT LIKE' | 'IN' | 'NOT IN' | 'BETWEEN' | 'NOT BETWEEN' | 'IS' | 'IS NOT' | 'REGEXP' | 'NOT REGEXP' | 'AND' | 'OR' | 'GROUP' | 'CONTAIN' | 'NOT CONTAIN' | 'OVERLAPS' | 'NOT OVERLAPS' |
+  'like' | 'not like' | 'in' | 'not in' | 'between' | 'not between' | 'is' | 'is not' | 'regexp' | 'not regexp' | 'and' | 'or' | 'group' | 'contain' | 'not contain' | 'overlaps' | 'not overlaps';
 
 export interface WhereOptions {
   key: string | null;

package/package.json

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

package/src/builder.js

@@ -295,6 +295,20 @@ class Builder {
     return res ? `${this._buildFieldKey(condition.key)} ${opt} CONCAT('%', ?, '%')` : `${this._buildFieldKey(condition.key)} ${opt} CONCAT('%', ?, '%')`;
   }
 
+  _buildConditionOverlaps(condition, isNot = false) {
+    if (condition.key.indexOf('->') !== -1) {
+      let keys = condition.key.split('->');
+      let k = `${this._buildFieldKey(keys[0])}`;
+      let res = this._buildConditionValues(condition.value);
+      let sql = res ? `JSON_OVERLAPS(JSON_EXTRACT(${k}, '${keys[1]}'), JSON_ARRAY(${res}))` :
+        `JSON_OVERLAPS(JSON_EXTRACT(${k}, '${keys[1]}'), JSON_ARRAY(?))`;
+      return isNot ? `${sql}=0` : sql;
+    }
+    let res = this._buildConditionValues(condition.value);
+    const opt = isNot ? 'NOT REGEXP' : 'REGEXP';
+    return res ? `${this._buildFieldKey(condition.key)} ${opt} ?` : `${this._buildFieldKey(condition.key)} ${opt} ?`;
+  }
+
   _buildCondition(conditions, prefix) {
     if (!conditions || !conditions.length) {
       return '';
@@ -315,6 +329,10 @@ class Builder {
           return this._buildConditionContain(c);
         } else if (opt === 'not contain') {
           return this._buildConditionContain(c, true);
+        } else if (opt === 'overlaps') {
+          return this._buildConditionOverlaps(c);
+        } else if (opt === 'not overlaps') {
+          return this._buildConditionOverlaps(c, true);
         }
         if (c.key && c.key.indexOf('->') !== -1) {
           const keys = c.key.split('->');