@axiosleo/orm-mysql 0.10.12 → 0.10.14

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

package/package.json

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

package/src/builder.js

@@ -58,9 +58,9 @@ class Builder {
         emit(tmp, this._buildJoins(options.joins));
         emit(tmp, this._buildCondition(options.conditions));
         emit(tmp, this._buildGroupField(options.groupField));
-        emit(tmp, this._buildPagination(options.pageLimit, options.pageOffset));
         emit(tmp, this._buildHaving(options.having));
         emit(tmp, this._buildOrders(options.orders));
+        emit(tmp, this._buildPagination(options.pageLimit, options.pageOffset));
         sql = tmp.join(' ');
         if (options.suffix) {
           sql += ' ' + options.suffix;
@@ -331,7 +331,14 @@ class Builder {
         const opt = c.opt.toLowerCase();
         if (opt === 'group' && Array.isArray(c.value)) {
           let t = `(${this._buildCondition(c.value, '')})`;
-          return index === 0 ? t : ` AND ${t}`;
+          if (index === 0 || conditions[index - 1].opt === 'group') {
+            return t;
+          }
+          const lastOpt = conditions[index - 1].opt;
+          if (['AND', 'OR'].indexOf(lastOpt) > -1) {
+            return t;
+          }
+          return ` AND ${t}`;
         }
         if (opt === 'in') {
           return this._buildConditionIn(c);