pg-mvc-service 2.0.21 → 2.0.22

package/dist/models/TableModel.js

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

package/package.json

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

package/src/models/TableModel.ts

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