pg-mvc-service 2.0.100 → 2.0.102

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runCron = exports.BaseCron = exports.rollback = exports.migrate = exports.MigrateDatabase = exports.MigrateTable = exports.createTableDoc = exports.TableModel = exports.ResponseType = exports.RequestType = exports.EncryptClient = exports.StringClient = exports.Base64Client = exports.AwsS3Client = exports.createSwagger = exports.NotFoundException = exports.UnprocessableException = exports.DbConflictException = exports.ForbiddenException = exports.InputErrorException = exports.AuthException = exports.MaintenanceException = exports.Service = void 0;
+exports.runCron = exports.BaseCron = exports.rollback = exports.migrate = exports.MigrateDatabase = exports.MigrateTable = exports.createTableDoc = exports.WhereExpression = exports.TableModel = exports.ResponseType = exports.RequestType = exports.EncryptClient = exports.StringClient = exports.Base64Client = exports.AwsS3Client = exports.createSwagger = exports.NotFoundException = exports.UnprocessableException = exports.DbConflictException = exports.ForbiddenException = exports.InputErrorException = exports.AuthException = exports.MaintenanceException = exports.Service = void 0;
 var Service_1 = require("./Service");
 Object.defineProperty(exports, "Service", { enumerable: true, get: function () { return Service_1.Service; } });
 var Exception_1 = require("./exceptions/Exception");
@@ -28,6 +28,8 @@ Object.defineProperty(exports, "ResponseType", { enumerable: true, get: function
 // models
 var TableModel_1 = require("./models/TableModel");
 Object.defineProperty(exports, "TableModel", { enumerable: true, get: function () { return TableModel_1.TableModel; } });
+var WhereExpression_1 = require("./models/SqlUtils/WhereExpression");
+Object.defineProperty(exports, "WhereExpression", { enumerable: true, get: function () { return WhereExpression_1.WhereExpression; } });
 var TableDoc_1 = require("./models/TableDoc");
 Object.defineProperty(exports, "createTableDoc", { enumerable: true, get: function () { return TableDoc_1.createTableDoc; } });
 var MigrateTable_1 = require("./models/MigrateTable");

package/dist/models/SqlUtils/WhereExpression.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.WhereExpression = void 0;
 const ValidateValueUtil_1 = __importDefault(require("./ValidateValueUtil"));
 class WhereExpression {
     static createConditionPk(model, pk, vars = null, isSetAlias = false) {
@@ -416,4 +417,4 @@ class WhereExpression {
         return sql;
     }
 }
-exports.default = WhereExpression;
+exports.WhereExpression = WhereExpression;

package/dist/models/TableModel.js

@@ -15,7 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TableModel = void 0;
 const ValidateValueUtil_1 = __importDefault(require("./SqlUtils/ValidateValueUtil"));
 const SelectExpression_1 = __importDefault(require("./SqlUtils/SelectExpression"));
-const WhereExpression_1 = __importDefault(require("./SqlUtils/WhereExpression"));
+const WhereExpression_1 = require("./SqlUtils/WhereExpression");
 const ValidateClient_1 = __importDefault(require("./ValidateClient"));
 const Exception_1 = require("../exceptions/Exception");
 const ExpressionClient_1 = __importDefault(require("./ExpressionClient"));
@@ -68,7 +68,7 @@ class TableModel {
             };
             sql += joins[join.type];
             sql += ` ${join.model.TableName} as "${join.model.TableAlias}" ON `;
-            const query = WhereExpression_1.default.createCondition(join.conditions, this, this.vars.length + 1);
+            const query = WhereExpression_1.WhereExpression.createCondition(join.conditions, this, this.vars.length + 1);
             sql += query.expression;
             if (query.vars !== undefined) {
                 this.vars = [...this.vars, ...query.vars];
@@ -141,10 +141,10 @@ class TableModel {
             let query;
             if (typeof pkOrId === 'string' || typeof pkOrId === 'number' || typeof pkOrId === 'boolean') {
                 ValidateValueUtil_1.default.validateId(this.Columns, pkOrId);
-                query = WhereExpression_1.default.createConditionPk(this, { id: pkOrId });
+                query = WhereExpression_1.WhereExpression.createConditionPk(this, { id: pkOrId });
             }
             else {
-                query = WhereExpression_1.default.createConditionPk(this, pkOrId);
+                query = WhereExpression_1.WhereExpression.createConditionPk(this, pkOrId);
             }
             const sql = `SELECT ${selects.join(',')} FROM ${this.TableName} WHERE ${query.expression}`;
             let datas = yield this.executeQuery(sql, query.vars);
@@ -241,13 +241,16 @@ class TableModel {
     join(joinType, joinModel, conditions) {
         this.joinConditions.push({ type: joinType, model: joinModel, conditions: conditions });
     }
-    where(left, operator, right) {
-        if (typeof left === 'string') {
-            if (operator === undefined || right === undefined) {
-                this.whereExpressions.push(left);
+    where(param1, param2, right) {
+        if (typeof param1 === 'string') {
+            if (param2 === undefined || right === undefined || Array.isArray(param2)) {
+                this.whereExpressions.push(param1);
+                if (Array.isArray(param2)) {
+                    this.vars = [...this.vars, ...param2];
+                }
             }
             else {
-                const query = WhereExpression_1.default.create({ model: this, name: left }, operator, right, this.vars.length + 1);
+                const query = WhereExpression_1.WhereExpression.create({ model: this, name: param1 }, param2, right, this.vars.length + 1);
                 this.whereExpressions.push(query.expression);
                 if (query.vars !== undefined) {
                     this.vars = [...this.vars, ...query.vars];
@@ -255,12 +258,12 @@ class TableModel {
             }
             return;
         }
-        if ('model' in left && 'name' in left) {
-            if (operator === undefined || right === undefined) {
-                throw new Error(`If left is TColumnInfo, please set operator and right.`);
+        if ('model' in param1 && 'name' in param1) {
+            if (param2 === undefined || right === undefined || Array.isArray(param2)) {
+                throw new Error(`If left is TColumnInfo, please set operator and right. Do not pass an array to operator.`);
             }
             else {
-                const query = WhereExpression_1.default.create(left, operator, right, this.vars.length + 1);
+                const query = WhereExpression_1.WhereExpression.create(param1, param2, right, this.vars.length + 1);
                 this.whereExpressions.push(query.expression);
                 if (query.vars !== undefined) {
                     this.vars = [...this.vars, ...query.vars];
@@ -268,8 +271,8 @@ class TableModel {
             }
             return;
         }
-        if (Array.isArray(left)) {
-            const query = WhereExpression_1.default.createCondition(left, this, this.vars.length + 1);
+        if (Array.isArray(param1)) {
+            const query = WhereExpression_1.WhereExpression.createCondition(param1, this, this.vars.length + 1);
             this.whereExpressions.push(query.expression);
             if (query.vars !== undefined) {
                 this.vars = [...this.vars, ...query.vars];
@@ -485,10 +488,10 @@ class TableModel {
             let whereQuery;
             if (typeof pkOrId === 'string' || typeof pkOrId === 'number' || typeof pkOrId === 'boolean') {
                 ValidateValueUtil_1.default.validateId(this.Columns, pkOrId);
-                whereQuery = WhereExpression_1.default.createConditionPk(this, { id: pkOrId }, updateSetQuery.vars);
+                whereQuery = WhereExpression_1.WhereExpression.createConditionPk(this, { id: pkOrId }, updateSetQuery.vars);
             }
             else {
-                whereQuery = WhereExpression_1.default.createConditionPk(this, pkOrId, updateSetQuery.vars);
+                whereQuery = WhereExpression_1.WhereExpression.createConditionPk(this, pkOrId, updateSetQuery.vars);
             }
             const sql = updateSetQuery.expression + ' WHERE ' + whereQuery.expression;
             const data = yield this.executeQuery(sql, whereQuery.vars);
@@ -503,10 +506,10 @@ class TableModel {
             let whereQuery;
             if (typeof pkOrId === 'string' || typeof pkOrId === 'number' || typeof pkOrId === 'boolean') {
                 ValidateValueUtil_1.default.validateId(this.Columns, pkOrId);
-                whereQuery = WhereExpression_1.default.createConditionPk(this, { id: pkOrId });
+                whereQuery = WhereExpression_1.WhereExpression.createConditionPk(this, { id: pkOrId });
             }
             else {
-                whereQuery = WhereExpression_1.default.createConditionPk(this, pkOrId);
+                whereQuery = WhereExpression_1.WhereExpression.createConditionPk(this, pkOrId);
             }
             const sql = `DELETE FROM ${this.TableName} WHERE ${whereQuery.expression}`;
             const data = yield this.executeQuery(sql, whereQuery.vars);
@@ -530,7 +533,7 @@ class TableModel {
                 const tables = [];
                 for (const join of this.joinConditions) {
                     tables.push(`${join.model.TableName} as "${join.model.TableAlias}"`);
-                    const query = WhereExpression_1.default.createCondition(join.conditions, this, this.vars.length + 1);
+                    const query = WhereExpression_1.WhereExpression.createCondition(join.conditions, this, this.vars.length + 1);
                     this.whereExpressions.push(query.expression);
                     if (query.vars !== undefined) {
                         this.vars = [...this.vars, ...query.vars];
@@ -552,7 +555,7 @@ class TableModel {
                 const tables = [];
                 for (const join of this.joinConditions) {
                     tables.push(`${join.model.TableName} as "${join.model.TableAlias}"`);
-                    const query = WhereExpression_1.default.createCondition(join.conditions, this, this.vars.length + 1);
+                    const query = WhereExpression_1.WhereExpression.createCondition(join.conditions, this, this.vars.length + 1);
                     this.whereExpressions.push(query.expression);
                     if (query.vars !== undefined) {
                         this.vars = [...this.vars, ...query.vars];

package/index.d.ts

@@ -20,6 +20,9 @@ import ValidateClient from './src/models/ValidateClient';
 import { TableModel } from "./src/models/TableModel";
 export { TableModel } from "./src/models/TableModel";
 
+import { WhereExpression } from './src/models/SqlUtils/WhereExpression';
+export { WhereExpression } from './src/models/SqlUtils/WhereExpression';
+
 export { TColumnAttribute, TColumnType, TColumnArrayType, TColumn, TColumnDetail, TOperator, TColumnInfo, TQuery, TSelectExpression, TAggregateFuncType, TCondition, TNestedCondition, TSortKeyword, TKeyFormat } from './src/models/Type';
 
 export { DayType, MonthType, DateType, HourType, MinuteSecondType } from './src/cron/CronType';

package/package.json

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

package/src/index.ts

@@ -12,6 +12,7 @@ export { PropertyType } from './reqestResponse/ReqResType';
 
 // models
 export { TableModel } from './models/TableModel';
+export { WhereExpression } from './models/SqlUtils/WhereExpression';
 export { createTableDoc } from './models/TableDoc';
 export { MigrateTable } from './models/MigrateTable';
 export { MigrateDatabase } from './models/MigrateDatabase';

package/src/models/SqlUtils/WhereExpression.ts

@@ -2,7 +2,7 @@ import { TableModel } from "../TableModel";
 import { TColumnArrayType, TColumnDetail, TColumnInfo, TColumnType, TNestedCondition, TOperator, TQuery } from "../Type";
 import ValidateValueUtil from "./ValidateValueUtil";
 
-export default class WhereExpression {
+export class WhereExpression {
 
     public static createConditionPk(model: TableModel, pk: {[key: string]: any}, vars: Array<any> | null = null, isSetAlias: boolean = false): TQuery {
         const conditions = [];

package/src/models/TableModel.ts

@@ -2,7 +2,7 @@ import { Pool, PoolClient } from 'pg';
 import { TAggregateFuncType, TColumn, TColumnArrayType, TColumnDetail, TColumnInfo, TColumnType, TKeyFormat, TNestedCondition, TOperator, TQuery, TSelectExpression, TSortKeyword } from "./Type";
 import ValidateValueUtil from './SqlUtils/ValidateValueUtil';
 import SelectExpression from './SqlUtils/SelectExpression';
-import WhereExpression from './SqlUtils/WhereExpression';
+import { WhereExpression } from './SqlUtils/WhereExpression';
 import ValidateClient from './ValidateClient';
 import { DbConflictException, NotFoundException, UnprocessableException } from '../exceptions/Exception';
 import ExpressionClient from './ExpressionClient';
@@ -286,15 +286,19 @@ export class TableModel {
     }
 
     public where(expression: string): void;
+    public where(expression: string, vars: Array<any>): void;
     public where(conditions: Array<TNestedCondition>): void;
     public where(left: string, operator: TOperator, right: TColumnInfo | any): void;
     public where(left: TColumnInfo, operator: TOperator, right: TColumnInfo | any): void;
-    public where(left: string | TColumnInfo | Array<TNestedCondition>, operator?: TOperator, right?: TColumnInfo | any): void {
-        if (typeof left === 'string') {
-            if (operator === undefined || right === undefined) {
-                this.whereExpressions.push(left);
+    public where(param1: string | TColumnInfo | Array<TNestedCondition>, param2?: Array<any> | TOperator, right?: TColumnInfo | any): void {
+        if (typeof param1 === 'string') {
+            if (param2 === undefined || right === undefined || Array.isArray(param2)) {
+                this.whereExpressions.push(param1);
+                if (Array.isArray(param2)) {
+                    this.vars = [...this.vars, ...param2];
+                }
             } else {
-                const query = WhereExpression.create({model: this, name: left}, operator, right, this.vars.length + 1);
+                const query = WhereExpression.create({model: this, name: param1}, param2, right, this.vars.length + 1);
                 this.whereExpressions.push(query.expression);
                 if (query.vars !== undefined) {
                     this.vars = [...this.vars, ...query.vars];
@@ -303,11 +307,11 @@ export class TableModel {
             return;
         }
 
-        if ('model' in left && 'name' in left) {
-            if (operator === undefined || right === undefined) {
-                throw new Error(`If left is TColumnInfo, please set operator and right.`);
+        if ('model' in param1 && 'name' in param1) {
+            if (param2 === undefined || right === undefined || Array.isArray(param2)) {
+                throw new Error(`If left is TColumnInfo, please set operator and right. Do not pass an array to operator.`);
             } else {
-                const query = WhereExpression.create(left, operator, right, this.vars.length + 1);
+                const query = WhereExpression.create(param1, param2, right, this.vars.length + 1);
                 this.whereExpressions.push(query.expression);
                 if (query.vars !== undefined) {
                     this.vars = [...this.vars, ...query.vars];
@@ -316,8 +320,8 @@ export class TableModel {
             return;
         }
 
-        if (Array.isArray(left)) {
-            const query = WhereExpression.createCondition(left, this, this.vars.length + 1);
+        if (Array.isArray(param1)) {
+            const query = WhereExpression.createCondition(param1, this, this.vars.length + 1);
             this.whereExpressions.push(query.expression);
             if (query.vars !== undefined) {
                 this.vars = [...this.vars, ...query.vars];