@axiosleo/orm-mysql 0.12.0 → 0.12.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.12.0',
+  version: '0.12.2',
   commands_dir: path.join(__dirname, '../commands'),
 });
 

package/index.d.ts

@@ -25,6 +25,7 @@ export type OptType = '=' | '!=' | '>' | '<' | '>=' | '<=' |
   '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 type SortOrderType = 'asc' | 'desc' | 'ASC' | 'DESC';
 export interface WhereOptions {
   key: string | null;
   opt: OptType;
@@ -38,7 +39,7 @@ export type WhereItem = WhereOptions | OptType | WhereArrayOptions;
 
 export interface OrderByOptions {
   sortField: string,
-  sortOrder: 'asc' | 'desc'
+  sortOrder: SortOrderType
 }
 
 export type OperatorType = 'select' | 'find' | 'insert' | 'update' | 'delete' | 'count';
@@ -192,9 +193,9 @@ export declare class Query extends QueryCondition {
   /**
    * Add an ORDER BY clause to the query
    * @param sortField Field name to sort by
-   * @param sortOrder Sort order ('asc' or 'desc')
+   * @param sortOrder Sort order ('asc' or 'desc' or 'ASC' or 'DESC')
    */
-  orderBy(sortField: string, sortOrder: 'asc' | 'desc'): this;
+  orderBy(sortField: string, sortOrder: SortOrderType): this;
 
   /**
    * Add a GROUP BY clause to the query

package/package.json

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

package/src/builder.js

@@ -231,7 +231,7 @@ class Builder {
       return '';
     }
     const sql = 'ORDER BY ' + orders.map((o) => {
-      return `${this._buildFieldKey(o.sortField)} ${o.sortOrder}`;
+      return `${this._buildFieldKey(o.sortField)} ${o.sortOrder.toUpperCase()}`;
     }).join(',');
     return sql;
   }
@@ -710,7 +710,7 @@ class ManageSQLBuilder extends Builder {
     let str = `\`${options.name}\` ${type}`;
     if (typeof options.length !== 'undefined') {
       if (type === 'DECIMAL') {
-        str += `(${options.length}, ${options.precision || 6})`;
+        str += `(${options.precision || 10}, ${options.length || 6})`;
       } else {
         str += `(${options.length})`;
       }
@@ -721,7 +721,7 @@ class ManageSQLBuilder extends Builder {
     } else if (type === 'TINYINT') {
       str += '(4)';
     } else if (type === 'DECIMAL') {
-      str += '(10, 6)';
+      str += `(${options.precision || 10}, ${options.length || 6})`;
     }
     if (options.allowNull === false || options.primaryKey === true) {
       str += ' NOT NULL';