@axiosleo/orm-mysql 0.11.7 → 0.11.9

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

package/index.d.ts

@@ -74,6 +74,7 @@ export type QueryOperatorOptions = QueryOperatorBaseOptions & {
   pageLimit?: number;
   pageOffset?: number;
   tables: TableOption[];
+  forceIndex: string | null;
   operator: OperatorType | null;
   data: any | null;
   groupField: string[];
@@ -447,6 +448,7 @@ type FieldType =
 interface ColumnItem {
   type: FieldType,
   length?: number,
+  precision?: number,
   unsigned?: boolean,
   allowNull?: boolean,
   default?: string | number | boolean | null | 'timestamp',

package/package.json

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

package/src/builder.js

@@ -68,6 +68,7 @@ class Builder {
       throw new Error('having is not allowed without "GROUP BY"');
     }
     emit(tmp, `SELECT ${attrs.length ? attrs.map((a) => this._buildFieldKey(a)).join(',') : '*'} FROM ${this._buildTables(options.tables)}`);
+    emit(tmp, this._buildForceIndex(options.forceIndex || null));
     emit(tmp, this._buildJoins(options.joins));
     emit(tmp, this._buildCondition(options.conditions));
     emit(tmp, this._buildGroupField(options.groupField));
@@ -81,6 +82,13 @@ class Builder {
     return sql;
   }
 
+  _buildForceIndex(forceIndex) {
+    if (!forceIndex) {
+      return '';
+    }
+    return `FORCE INDEX(${forceIndex})`;
+  }
+
   _insertOperator(options) {
     let tmp = [];
     const { fields, sqlStr } = this._buildValues(options.data);
@@ -100,6 +108,7 @@ class Builder {
     }
     const fields = this._buildValue(options.data);
     emit(tmp, `UPDATE ${this._buildTables(options.tables)}`);
+    emit(tmp, this._buildForceIndex(options.forceIndex || null));
     emit(tmp, `SET ${fields.map((f) => `\`${f}\` = ?`).join(',')}`);
     if (!options.conditions.length) {
       throw new Error('At least one condition is required for update operation');
@@ -675,6 +684,7 @@ class ManageSQLBuilder extends Builder {
       type: 'required|string',
       onUpdate: 'string',
       length: 'integer',
+      precision: 'integer',
       comment: 'string',
       allowNull: 'boolean',
       autoIncrement: 'boolean',
@@ -688,13 +698,19 @@ class ManageSQLBuilder extends Builder {
     }
     let str = `\`${options.name}\` ${type}`;
     if (typeof options.length !== 'undefined') {
-      str += `(${options.length})`;
+      if (type === 'DECIMAL') {
+        str += `(${options.length}, ${options.precision || 6})`;
+      } else {
+        str += `(${options.length})`;
+      }
     } else if (type === 'INT') {
       str += '(11)';
     } else if (type === 'VARCHAR') {
       str += '(255)';
     } else if (type === 'TINYINT') {
       str += '(4)';
+    } else if (type === 'DECIMAL') {
+      str += '(10, 6)';
     }
     if (options.allowNull === false || options.primaryKey === true) {
       str += ' NOT NULL';

package/src/query.js

@@ -164,6 +164,7 @@ class Query extends QueryCondition {
       conditions: [],
       orders: [],
       tables: [],
+      forceIndex: null,
       attrs: [],
       operator,
       data: null,
@@ -189,6 +190,11 @@ class Query extends QueryCondition {
     return this;
   }
 
+  force(indexName) {
+    this.options.forceIndex = indexName;
+    return this;
+  }
+
   keys(...keys) {
     this.options.keys = keys;
     return this;