@axiosleo/orm-mysql 0.9.12 → 0.9.14

package/README.md

@@ -104,6 +104,13 @@ async function insertExample() {
     name: "Joe",
     age: 18,
   });
+
+  // The insert operation will be changed to the update operation if the uuid already exists
+  row = await query.keys('uuid').insert({
+    uuid: 'uuid-string',
+    name: "Joe",
+    age: 18,
+  })
 }
 
 async function updateExample() {

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.12',
+  version: '0.9.14',
   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' |
-  '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' | 'CONTAIN' | 'NOT contain' |
+  'like' | 'not like' | 'in' | 'not in' | 'between' | 'not between' | 'is' | 'is not' | 'regexp' | 'not regexp' | 'and' | 'or' | 'group' | 'contain' | 'not contain';
 
 export interface WhereOptions {
   key: string | null;
@@ -81,6 +81,7 @@ export type QueryOperatorOptions = QueryOperatorBaseOptions & {
   having: WhereOptions[];
   suffix?: string | null;
   transaction: boolean;
+  explain?: boolean;
 }
 
 export declare class Query {
@@ -133,6 +134,23 @@ export declare class Query {
 
 export type QueryResult = any | undefined | RowDataPacket[] | RowDataPacket | MySQLQueryResult;
 
+export type ExplainResult = {
+  select_type: 'PRIMARY' | 'DERIVED';
+  table: string;
+  partitions: string | null;
+  type: string | 'ALL' | 'eq_ref';
+  possible_keys: null | 'PRIMARY';
+  key: null | string;
+  key_len: null | number;
+  ref: null | string;
+  rows: number;
+  filtered: number;
+  Extra: null | string | 'Using filesort';
+
+  id?: number;
+  [property: string]: any;
+};
+
 export declare class QueryOperator extends Query {
   conn: Connection | Pool;
   options: QueryOperatorOptions
@@ -143,6 +161,8 @@ export declare class QueryOperator extends Query {
 
   exec(): Promise<QueryResult>;
 
+  explain(operator: OperatorType): Promise<ExplainResult[]>;
+
   select<T>(...attrs: string[]): Promise<T[]>;
 
   find<T>(): Promise<T>;

package/package.json

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

package/src/builder.js

@@ -120,6 +120,10 @@ class Builder {
         throw new Error('Invalid operator: ' + options.operator);
     }
 
+    if (options.explain) {
+      sql = 'EXPLAIN ' + sql;
+    }
+
     this.sql = sql;
   }
 
@@ -147,8 +151,10 @@ class Builder {
         const builder = new Builder(table.options);
         this.values = this.values.concat(builder.values);
         table = `(${builder.sql})`;
-      }
-      if (alias) {
+        if (alias) {
+          table = `${table} AS \`${alias}\``;
+        }
+      } else if (alias) {
         table = `\`${table}\` AS \`${alias}\``;
       } else {
         table = `\`${table}\``;
@@ -273,6 +279,18 @@ class Builder {
     return res ? `${this._buildFieldKey(condition.key)} ${opt} (${res})` : `${this._buildFieldKey(condition.key)} ${opt} (?)`;
   }
 
+  _buildConditionContain(condition, isNot = false) {
+    if (condition.key.indexOf('$') !== -1) {
+      let res = this._buildConditionValues(condition.value);
+      let sql = res ? `JSON_CONTAINS(${this._buildFieldKey(condition.key)}, JSON_ARRAY(${res}))` :
+        `JSON_CONTAINS(${this._buildFieldKey(condition.key)}, JSON_ARRAY(?))`;
+      return isNot ? `${sql}=0` : sql;
+    }
+    let res = this._buildConditionValues(condition.value);
+    const opt = isNot ? 'NOT LIKE' : 'LIKE';
+    return res ? `${this._buildFieldKey(condition.key)} ${opt} CONCAT('%', ?, '%')` : `${this._buildFieldKey(condition.key)} ${opt} CONCAT('%', ?, '%')`;
+  }
+
   _buildCondition(conditions, prefix) {
     if (!conditions || !conditions.length) {
       return '';
@@ -309,6 +327,10 @@ class Builder {
           return this._buildConditionIn(c, true);
         } else if (opt === 'group' && Array.isArray(c.value)) {
           return `(${this._buildCondition(c.value, '')})`;
+        } else if (opt === 'contain') {
+          return this._buildConditionContain(c);
+        } else if (opt === 'not contain') {
+          return this._buildConditionContain(c, true);
         }
         let res = this._buildConditionValues(c.value);
         if (!is.empty(res)) {

package/src/operator.js

@@ -32,6 +32,12 @@ class QueryOperator extends Query {
     return new Builder(this.options);
   }
 
+  async explain(operator) {
+    this.options.operator = operator;
+    this.options.explain = true;
+    return await this.exec();
+  }
+
   async exec() {
     if (!this.options.operator) {
       throw new Error('Invalid operator: ' + this.options.operator);

package/src/query.js

@@ -33,6 +33,7 @@ class Query {
       suffix: null,
       transaction: false,
       keys: null,
+      explain: false,
     };
     this.alias = alias || null;
   }