pg-mvc-service 2.0.18 → 2.0.20

package/dist/models/TableModel.js

@@ -317,7 +317,8 @@ class TableModel {
             this.Offset = (currentPage - 1) * pageCount;
             let sql = ` SELECT ${this.selectExpressions.join(",")} ${this.createSqlFromJoinWhereSortLimit}`;
             let tempVars = [...this.vars]; // 後のthis.createSqlFromJoinWhereでvarの追加をしてしまうので、上の時点でvarを決定する
-            let countSql = ` SELECT COUNT(*) as "count" FROM ${this.createSqlFromJoinWhere}`;
+            this.vars = []; // ここで初期化しないと、次のクエリで途中の連番になる
+            let countSql = ` SELECT COUNT(*) as "count" ${this.createSqlFromJoinWhere}`;
             const data = yield this.executeQuery(sql, tempVars);
             const countData = yield this.executeQuery(countSql, tempVars);
             const totalCount = Number(countData.rows[0].count);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg-mvc-service",
-  "version": "2.0.18",
+  "version": "2.0.20",
   "description": "",
   "homepage": "https://github.com/n-daira/npm-pack_mvc-service#readme",
   "bugs": {

package/src/models/TableModel.ts

@@ -372,8 +372,9 @@ export class TableModel {
 
         let sql = ` SELECT ${this.selectExpressions.join(",")} ${this.createSqlFromJoinWhereSortLimit}`;
         let tempVars = [...this.vars]; // 後のthis.createSqlFromJoinWhereでvarの追加をしてしまうので、上の時点でvarを決定する
+        this.vars = []; // ここで初期化しないと、次のクエリで途中の連番になる
 
-        let countSql = ` SELECT COUNT(*) as "count" FROM ${this.createSqlFromJoinWhere}`;
+        let countSql = ` SELECT COUNT(*) as "count" ${this.createSqlFromJoinWhere}`;
         
         const data = await this.executeQuery(sql, tempVars);