pg-mvc-service 2.0.18 → 2.0.19

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/dist/models/TableModel.js +1 -1
  2. package/package.json +1 -1
  3. package/src/models/TableModel.ts +1 -1
package/dist/models/TableModel.js CHANGED
@@ -317,7 +317,7 @@ class TableModel {
317
317
  this.Offset = (currentPage - 1) * pageCount;
318
318
  let sql = ` SELECT ${this.selectExpressions.join(",")} ${this.createSqlFromJoinWhereSortLimit}`;
319
319
  let tempVars = [...this.vars]; // 後のthis.createSqlFromJoinWhereでvarの追加をしてしまうので、上の時点でvarを決定する
320
- let countSql = ` SELECT COUNT(*) as "count" FROM ${this.createSqlFromJoinWhere}`;
320
+ let countSql = ` SELECT COUNT(*) as "count" ${this.createSqlFromJoinWhere}`;
321
321
  const data = yield this.executeQuery(sql, tempVars);
322
322
  const countData = yield this.executeQuery(countSql, tempVars);
323
323
  const totalCount = Number(countData.rows[0].count);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "pg-mvc-service",
3
- "version": "2.0.18",
3
+ "version": "2.0.19",
4
4
  "description": "",
5
5
  "homepage": "https://github.com/n-daira/npm-pack_mvc-service#readme",
6
6
  "bugs": {
package/src/models/TableModel.ts CHANGED
@@ -373,7 +373,7 @@ export class TableModel {
373
373
  let sql = ` SELECT ${this.selectExpressions.join(",")} ${this.createSqlFromJoinWhereSortLimit}`;
374
374
  let tempVars = [...this.vars]; // 後のthis.createSqlFromJoinWhereでvarの追加をしてしまうので、上の時点でvarを決定する
375
375
 
376
- let countSql = ` SELECT COUNT(*) as "count" FROM ${this.createSqlFromJoinWhere}`;
376
+ let countSql = ` SELECT COUNT(*) as "count" ${this.createSqlFromJoinWhere}`;
377
377
 
378
378
  const data = await this.executeQuery(sql, tempVars);
379
379