pg-mvc-service 2.0.17 → 2.0.19

package/dist/models/TableModel.js

@@ -59,7 +59,6 @@ class TableModel {
     }
     get createSqlFromJoinWhere() {
         let sql = ` FROM ${this.TableName} as "${this.TableAlias}"`;
-        console.log('createSqlFromJoinWhere', this.joinConditions.length);
         for (const join of this.joinConditions) {
             const joins = {
                 inner: ' INNER JOIN',
@@ -68,9 +67,7 @@ class TableModel {
             };
             sql += joins[join.type];
             sql += ` ${join.model.TableName} as "${join.model.TableAlias}" ON `;
-            console.log(join.conditions, 'createSqlFronJOin', this.vars);
             const query = WhereExpression_1.default.createCondition(join.conditions, this, this.vars.length + 1);
-            console.log('createSqlFronJoin end', this.vars, query.vars);
             sql += query.expression;
             if (query.vars !== undefined) {
                 this.vars = [...this.vars, ...query.vars];
@@ -210,7 +207,6 @@ class TableModel {
      * @param conditions 結合条件を指定します。条件はオブジェクトまたは文字列で指定できます。
      */
     join(joinType, joinModel, conditions) {
-        console.log({ type: joinType, conditions: conditions }, this.joinConditions);
         this.joinConditions.push({ type: joinType, model: joinModel, conditions: conditions });
     }
     where(left, operator, right) {
@@ -320,8 +316,8 @@ class TableModel {
             this.Limit = pageCount;
             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" ${this.createSqlFromJoinWhere}`;
-            let tempVars = [...this.vars];
             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.17",
+  "version": "2.0.19",
   "description": "",
   "homepage": "https://github.com/n-daira/npm-pack_mvc-service#readme",
   "bugs": {

package/src/models/TableModel.ts

@@ -81,7 +81,6 @@ export class TableModel {
     private get createSqlFromJoinWhere(): string {
         let sql = ` FROM ${this.TableName} as "${this.TableAlias}"`;
 
-        console.log('createSqlFromJoinWhere', this.joinConditions.length);
         for (const join of this.joinConditions) {
             const joins = {
                 inner: ' INNER JOIN',
@@ -90,9 +89,7 @@ export class TableModel {
             }
             sql += joins[join.type];
             sql += ` ${join.model.TableName} as "${join.model.TableAlias}" ON `;
-            console.log(join.conditions, 'createSqlFronJOin', this.vars);
             const query = WhereExpression.createCondition(join.conditions, this, this.vars.length + 1);
-            console.log('createSqlFronJoin end', this.vars, query.vars);
             sql += query.expression;
             if (query.vars !== undefined) {
                 this.vars = [...this.vars, ...query.vars]
@@ -250,7 +247,6 @@ export class TableModel {
      * @param conditions 結合条件を指定します。条件はオブジェクトまたは文字列で指定できます。
      */
     public join(joinType: 'left' | 'inner' | 'full', joinModel: TableModel, conditions: Array<TNestedCondition>): void {
-        console.log({type: joinType, conditions: conditions}, this.joinConditions);
         this.joinConditions.push({type: joinType, model: joinModel, conditions: conditions});
     }
 
@@ -375,8 +371,10 @@ export 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" ${this.createSqlFromJoinWhere}`;
-        let tempVars = [...this.vars];
+        
         const data = await this.executeQuery(sql, tempVars);
 
         const countData = await this.executeQuery(countSql, tempVars);