@axiosleo/orm-mysql 0.9.8 → 0.9.10

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

package/index.d.ts

@@ -49,8 +49,8 @@ export interface JoinOption {
   on?: string;
 }
 
-export interface TableOption {
-  tableName: string;
+interface TableOption {
+  table: string;
   alias: string | null;
 }
 
@@ -78,12 +78,25 @@ export type QueryOperatorOptions = QueryOperatorBaseOptions & {
   transaction: boolean;
 }
 
+type GroupWhereOptionsArr = [string | null, OptType, ConditionValueType | WhereOptions[] | null]
+  | [string | null, ConditionValueType | WhereOptions[]];
+
+type GroupWhereOptions = {
+  key?: string | null;
+  opt?: OptType;
+  value?: ConditionValueType | WhereOptions[] | null;
+}
+
+type GroupWhereItem = GroupWhereOptions | string | GroupWhereOptionsArr;
+
 export declare class Query {
   options: QueryOperatorOptions;
 
   constructor(operator?: OperatorType, alias?: string | null);
 
-  table(tableName: string, alias: string | null): this;
+  table(table: string, alias: string | null): this;
+
+  tables(...tables: TableOption[]): this;
 
   limit(limit: number): this;
 
@@ -95,13 +108,13 @@ export declare class Query {
 
   whereConditions(...condition: WhereOptions[]): this;
 
-  groupWhere(...condition: WhereOptions[]): this;
+  groupWhere(...condition: GroupWhereItem[]): this;
 
   orWhere(key: string | null, opt: OptType, value: ConditionValueType | WhereOptions[]): this;
 
   andWhere(key: string | null, opt: OptType, value: ConditionValueType | WhereOptions[]): this;
 
-  attr(...attr: Attr[]): this;
+  attr(...attr: Attr[] | Attr[][]): this;
 
   orderBy(sortField: string, sortOrder: 'asc' | 'desc'): this;
 
@@ -165,6 +178,12 @@ export declare class QueryHandler {
    */
   table(table: string, alias?: string | null): QueryOperator;
 
+  /**
+   * select tables
+   * @param tables 
+   */
+  tables(...tables: TableOption[]): QueryOperator;
+
   /**
    * execute sql
    * @param options 
@@ -240,7 +259,7 @@ export declare class Hook {
    */
   static pre: (
     callback: (options: QueryOperatorOptions) => void,
-    option: { table?: string, opt?: OperatorType }
+    option?: { table?: string, opt?: OperatorType }
   ) => string;
 
   /**
@@ -248,7 +267,7 @@ export declare class Hook {
    */
   static post: (
     callback: (options: QueryOperatorOptions, result: QueryResult | Error) => void,
-    option: { table?: string, opt?: OperatorType }
+    option?: { table?: string, opt?: OperatorType }
   ) => string;
 
   /**

package/package.json

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

package/src/builder.js

@@ -186,7 +186,7 @@ class Builder {
       throw new Error('At least one table is required');
     }
     return tables.map((t) => {
-      let name = t.tableName.split('.').map((n) => {
+      let name = t.table.split('.').map((n) => {
         if (n[0] === '`' && n[n.length - 1] === '`') {
           return n;
         }
@@ -371,9 +371,6 @@ class ManageSQLBuilder extends Builder {
     if (is.empty(options.columns)) {
       throw new Error('At least one column is required');
     }
-    if (!Object.values(options.columns).find(c => c.primaryKey === true)) {
-      throw new Error('At least one primary key column is required');
-    }
     let columns = Object.keys(options.columns).map(name => {
       return { name, ...options.columns[name] };
     });
@@ -550,6 +547,8 @@ class ManageSQLBuilder extends Builder {
       str += '(11)';
     } else if (type === 'VARCHAR') {
       str += '(255)';
+    } else if (type === 'TINYINT') {
+      str += '(4)';
     }
     if (options.allowNull === false) {
       str += ' NOT NULL';

package/src/operator.js

@@ -124,6 +124,11 @@ class QueryHandler {
     return (new QueryOperator(this.conn, this.options)).table(table, alias);
   }
 
+  tables(...tables) {
+    const operator = new QueryOperator(this.conn, this.options);
+    return operator.tables(...tables);
+  }
+
   async upsert(tableName, data, condition = {}) {
     const count = await this.table(tableName).whereObject(condition).count();
     if (count) {

package/src/query.js

@@ -24,6 +24,7 @@ class Query {
       conditions: [],
       orders: [],
       tables: [],
+      attrs: [],
       operator,
       data: null,
       groupField: [],
@@ -35,8 +36,13 @@ class Query {
     this.alias = alias || null;
   }
 
-  table(tableName, alias) {
-    this.options.tables.push({ tableName, alias });
+  table(table, alias) {
+    this.options.tables.push({ table, alias });
+    return this;
+  }
+
+  tables(...tables) {
+    this.options.tables = tables;
     return this;
   }
 
@@ -94,7 +100,27 @@ class Query {
     }
     const condition = { key: null, opt: 'group', value: [] };
     conditions.forEach((c) => {
-      condition.value.push(c);
+      if (is.string(c)) {
+        condition.value.push({ key: null, opt: c, value: null });
+      } else if (is.object(c)) {
+        condition.value.push({
+          key: null,
+          opt: '=',
+          value: null,
+          ...c
+        });
+      } else if (is.array(c)) {
+        const [k, o, v] = c;
+        if (c.length === 2) {
+          condition.value.push({ key: k, opt: '=', value: o });
+        } else if (c.length === 3) {
+          condition.value.push({ key: k, opt: o, value: v });
+        } else {
+          throw new Error('Invalid condition: ' + c);
+        }
+      } else {
+        condition.value.push(c);
+      }
     });
     this.options.conditions.push(condition);
     return this;
@@ -124,18 +150,12 @@ class Query {
     return this;
   }
 
-  attr(...attr) {
-    if (attr.length === 1 && is.array(attr)) {
-      this.options.attrs = attr;
-      return this;
-    }
-    if (!attr.length) {
-      return this;
-    }
-    if (!this.options.attrs) {
+  attr(...attrs) {
+    if (!attrs.length) {
       this.options.attrs = [];
+      return this;
     }
-    this.options.attrs.push(...attr);
+    this.options.attrs = attrs;
     return this;
   }