@axiosleo/orm-mysql 0.3.0 → 0.3.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/.eslintrc +1 -1
  2. package/package.json +1 -1
  3. package/src/builder.js +2 -1
package/.eslintrc CHANGED
@@ -12,7 +12,7 @@
12
12
  "single"
13
13
  ],
14
14
  "linebreak-style": [
15
- 2,
15
+ 0,
16
16
  "unix"
17
17
  ],
18
18
  "semi": [
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@axiosleo/orm-mysql",
3
- "version": "0.3.0",
3
+ "version": "0.3.1",
4
4
  "description": "MySQL ORM tool",
5
5
  "keywords": [
6
6
  "mysql",
package/src/builder.js CHANGED
@@ -51,6 +51,7 @@ class Builder {
51
51
  }
52
52
  case 'count': {
53
53
  sql = `SELECT COUNT(*) AS count FROM ${this._buildTables(options.tables)}`;
54
+ sql += this._buildJoins(options.joins);
54
55
  sql += this._buildContidion(options.conditions);
55
56
  if (options.groupField.length) {
56
57
  sql += ` GROUP BY ${options.groupField.map(f => this._buildFieldKey(f)).join(',')}`;
@@ -101,7 +102,7 @@ class Builder {
101
102
 
102
103
  _buildOrders(orders = []) {
103
104
  const sql = ' ORDER BY ' + orders.map((o) => {
104
- return `\`${o.sortField}\` ${o.sortOrder}`;
105
+ return `${this._buildFieldKey(o.sortField)} ${o.sortOrder}`;
105
106
  }).join(',');
106
107
  return sql;
107
108
  }