@axiosleo/orm-mysql 0.9.2 → 0.9.4

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

package/index.d.ts

@@ -53,9 +53,12 @@ export type QueryOperatorBaseOptions = {
   queryHandler?: QueryHandler;
 };
 
+export type AttrSubQuery = () => Query;
+export type Attr = string | AttrSubQuery;
+
 export type QueryOperatorOptions = QueryOperatorBaseOptions & {
   conditions: WhereOptions[];
-  attrs?: string[] | null;
+  attrs?: Attr[] | null;
   orders: OrderByOptions[];
   pageLimit?: number;
   pageOffset?: number;
@@ -70,7 +73,9 @@ export type QueryOperatorOptions = QueryOperatorBaseOptions & {
 }
 
 export declare class Query {
-  constructor(operator?: OperatorType);
+  options: QueryOperatorOptions;
+
+  constructor(operator?: OperatorType, alias?: string | null);
 
   table(tableName: string, alias: string | null): this;
 
@@ -90,7 +95,7 @@ export declare class Query {
 
   andWhere(key: string | null, opt: OptType, value: ConditionValueType | WhereOptions[]): this;
 
-  attr(...attr: string[]): this;
+  attr(...attr: Attr[]): this;
 
   orderBy(sortField: string, sortOrder: 'asc' | 'desc'): this;
 

package/package.json

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

package/src/builder.js

@@ -32,7 +32,21 @@ class Builder {
       }
       // eslint-disable-next-line no-fallthrough
       case 'select': {
-        emit(tmp, `SELECT ${options.attrs ? options.attrs.map((a) => this._buildFieldKey(a)).join(',') : '*'} FROM ${this._buildTables(options.tables)}`);
+        options.attrs = options.attrs || [];
+        const attrs = options.attrs.map((attr) => {
+          if (attr instanceof Function) {
+            const query = attr();
+            const builder = new Builder(query.options);
+            let s = `(${builder.sql})`;
+            if (query.alias) {
+              return query.alias.indexOf(' ') > -1 ? s + ' ' + this._buildFieldKey(query.alias)
+                : s + ' AS ' + this._buildFieldKey(query.alias);
+            }
+            return s;
+          }
+          return attr;
+        });
+        emit(tmp, `SELECT ${attrs.length ? attrs.map((a) => this._buildFieldKey(a)).join(',') : '*'} FROM ${this._buildTables(options.tables)}`);
         emit(tmp, this._buildJoins(options.joins));
         emit(tmp, this._buildContidion(options.conditions));
         emit(tmp, this._buildOrders(options.orders));
@@ -199,6 +213,11 @@ class Builder {
   }
 
   _buildConditionValues(val) {
+    if (is.string(val)) {
+      if (val.startsWith('`') && val.endsWith('`')) {
+        return val;
+      }
+    }
     if (val instanceof Query) {
       const builder = new Builder(val.options);
       this.values = this.values.concat(builder.values);
@@ -263,7 +282,13 @@ class Builder {
           return `(${this._buildContidion(c.value, '')})`;
         }
         let res = this._buildConditionValues(c.value);
-        return res ? `${this._buildFieldKey(c.key)} ${c.opt} (${res})` : `${this._buildFieldKey(c.key)} ${c.opt} ?`;
+        if (!is.empty(res)) {
+          if (res.startsWith('`') && res.endsWith('`')) {
+            return `${this._buildFieldKey(c.key)} ${c.opt} ${res}`;
+          }
+          return `${this._buildFieldKey(c.key)} ${c.opt} (${res})`;
+        }
+        return `${this._buildFieldKey(c.key)} ${c.opt} ?`;
       }).join('')}`;
     }
     return sql;

package/src/query.js

@@ -1,7 +1,7 @@
 'use strict';
 
 class Query {
-  constructor(operator = 'select') {
+  constructor(operator = 'select', alias = null) {
     this.options = {
       driver: 'mysql',
       queryHandler: null,
@@ -16,6 +16,7 @@ class Query {
       suffix: null,
       transaction: false
     };
+    this.alias = alias || null;
   }
 
   table(tableName, alias) {