pg-mvc-service 1.0.26 → 1.0.28

package/dist/models/SqlUtils/UpdateExpression.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class UpdateExpression {
+    static createUpdateSet(model, options) {
+        const expressions = [];
+        const vars = [];
+        for (const [key, value] of Object.entries(options)) {
+            if (value === undefined) {
+                throw new Error(`The update option ${key} is undefined.`);
+            }
+            const column = model.getColumn(key);
+            if (column.attribute === 'primary') {
+                throw new Error(`The primary key ${model.TableName}.${key} cannot be changed.`);
+            }
+            vars.push(value);
+            expressions.push(`${key} = $${vars.length}`);
+        }
+        return {
+            expression: `UPDATE ${model.TableName} SET ${expressions.join(',')}`,
+            vars: vars
+        };
+    }
+}
+exports.default = UpdateExpression;

package/dist/models/SqlUtils/WhereExpression.js

@@ -5,6 +5,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const ValidateValueUtil_1 = __importDefault(require("./ValidateValueUtil"));
 class WhereExpression {
+    static createConditionPk(model, pk, vars = null, isSetAlias = false) {
+        const conditions = [];
+        const newVars = vars === null ? [] : [...vars];
+        for (const [keyColumn, column] of Object.entries(model.Columns)) {
+            if (column.attribute !== 'primary') {
+                continue;
+            }
+            if (pk[keyColumn] === undefined || pk[keyColumn] === null) {
+                throw new Error(`No value is set for the primary key "${model.TableName}".${keyColumn}.`);
+            }
+            ValidateValueUtil_1.default.validateValue(column, pk[keyColumn]);
+            newVars.push(pk[keyColumn]);
+            conditions.push(`${isSetAlias ? `"${model.TableAlias}".` : ''}${keyColumn} = $${newVars.length}`);
+        }
+        return {
+            expression: conditions.join(' AND '),
+            vars: newVars
+        };
+    }
     /**
      * Helper method to create OR conditions
      * @param conditions Array of conditions that make up the OR condition
@@ -12,12 +31,12 @@ class WhereExpression {
      */
     static createCondition(conditions, model, varLength) {
         if (conditions.length === 0) {
-            return { sql: '' };
+            return { expression: '' };
         }
         let logicalOperator = 'AND';
         if (conditions[0] === 'AND' || conditions[0] === 'OR') {
             if (conditions.length === 1) {
-                return { sql: '' };
+                return { expression: '' };
             }
             logicalOperator = conditions[0];
             conditions.shift();
@@ -28,7 +47,7 @@ class WhereExpression {
             if (Array.isArray(condition)) {
                 // If it's an array, it's a nested condition, so call this function recursively
                 const query = this.createCondition(condition, model, varLength + vars.length);
-                expression.push(query.sql);
+                expression.push(query.expression);
                 if (query.vars !== undefined) {
                     vars = [...vars, ...query.vars];
                 }
@@ -41,20 +60,20 @@ class WhereExpression {
             }
             if (typeof condition.l === 'string') {
                 const query = this.create({ model: model, name: condition.l }, condition.o, condition.r, varLength + vars.length);
-                expression.push(query.sql);
+                expression.push(query.expression);
                 if (query.vars !== undefined) {
                     vars = [...vars, ...query.vars];
                 }
                 continue;
             }
             const query = this.create(condition.l, condition.o, condition.r, varLength + vars.length);
-            expression.push(query.sql);
+            expression.push(query.expression);
             if (query.vars !== undefined) {
                 vars = [...vars, ...query.vars];
             }
         }
         return {
-            sql: `(${expression.filter(condition => condition !== null && condition !== void 0 ? condition : '' !== '').join(` ${logicalOperator} `)})`,
+            expression: `(${expression.filter(condition => condition !== null && condition !== void 0 ? condition : '' !== '').join(` ${logicalOperator} `)})`,
             vars: vars
         };
     }
@@ -93,12 +112,12 @@ class WhereExpression {
             }
             if (operator == "=") {
                 return {
-                    sql: `${leftColumn.expression} is null`
+                    expression: `${leftColumn.expression} is null`
                 };
             }
             else if (operator == "!=") {
                 return {
-                    sql: `${leftColumn.expression} is not null`
+                    expression: `${leftColumn.expression} is not null`
                 };
             }
             else {
@@ -120,14 +139,14 @@ class WhereExpression {
             }
             if (right.length == 0) {
                 // Creating in, not in with 0 elements will cause an error, but since the data to be passed is correct and the expected return value does not change, do not search if there are 0 elements
-                return { sql: '' };
+                return { expression: '' };
             }
             // Validate values
             for (const value of right) {
                 ValidateValueUtil_1.default.validateValue(leftColumn, value);
             }
             return {
-                sql: `${leftColumn.expression} ${operator === 'in' ? '=' : '!='} ANY($${varLength})`,
+                expression: `${leftColumn.expression} ${operator === 'in' ? '=' : '!='} ANY($${varLength})`,
                 vars: [right]
             };
         }
@@ -145,16 +164,16 @@ class WhereExpression {
                 case 'like':
                 case 'ilike':
                     return {
-                        sql: `${leftColumn.expression} ${operator} '%' || ${rightColumn.expression} || '%'`
+                        expression: `${leftColumn.expression} ${operator} '%' || ${rightColumn.expression} || '%'`
                     };
                 case 'h2f_like': // half to full like
                 case 'h2f_ilike': // half to full ilike
                     return {
-                        sql: `${this.makeSqlReplaceHalfToFull(leftColumn.expression)} ${operator.replace("h2f_", "")} ${this.makeSqlReplaceHalfToFull(`'%' || ${rightColumn.expression} || '%'`)}`
+                        expression: `${this.makeSqlReplaceHalfToFull(leftColumn.expression)} ${operator.replace("h2f_", "")} ${this.makeSqlReplaceHalfToFull(`'%' || ${rightColumn.expression} || '%'`)}`
                     };
             }
             return {
-                sql: `${leftColumn.expression} ${operator} ${rightColumn.expression}`
+                expression: `${leftColumn.expression} ${operator} ${rightColumn.expression}`
             };
         }
         ValidateValueUtil_1.default.validateValue(leftColumn, right);
@@ -163,18 +182,18 @@ class WhereExpression {
             case 'like':
             case 'ilike':
                 return {
-                    sql: `${leftColumn.expression} ${operator} $${varLength}`,
+                    expression: `${leftColumn.expression} ${operator} $${varLength}`,
                     vars: [`%${right}%`]
                 };
             case 'h2f_like': // half to full like
             case 'h2f_ilike': // half to full ilike
                 return {
-                    sql: `${this.makeSqlReplaceHalfToFull(leftColumn.expression)} ${operator.replace("h2f_", "")} ${this.makeSqlReplaceHalfToFull(`$${varLength}`)}`,
+                    expression: `${this.makeSqlReplaceHalfToFull(leftColumn.expression)} ${operator.replace("h2f_", "")} ${this.makeSqlReplaceHalfToFull(`$${varLength}`)}`,
                     vars: [`%${right}%`]
                 };
         }
         return {
-            sql: `${leftColumn.expression} ${operator} $${varLength}`,
+            expression: `${leftColumn.expression} ${operator} $${varLength}`,
             vars: [right]
         };
     }
@@ -199,12 +218,12 @@ class WhereExpression {
             case '=':
                 // バリデーションチェックをする
                 return {
-                    sql: `${leftColumn.expression} ${operator} $${varLength}`,
+                    expression: `${leftColumn.expression} ${operator} $${varLength}`,
                     vars: [right]
                 };
         }
         return {
-            sql: `${leftColumn.expression} ${operator} $${varLength}`,
+            expression: `${leftColumn.expression} ${operator} $${varLength}`,
             vars: [right]
         };
     }

package/dist/models/TableModel.js

@@ -19,6 +19,7 @@ const WhereExpression_1 = __importDefault(require("./SqlUtils/WhereExpression"))
 const ValidateClient_1 = __importDefault(require("./ValidateClient"));
 const Exception_1 = require("../exceptions/Exception");
 const ExpressionClient_1 = __importDefault(require("./ExpressionClient"));
+const UpdateExpression_1 = __importDefault(require("./SqlUtils/UpdateExpression"));
 class TableModel {
     get DbName() { return this.dbName; }
     get TableName() {
@@ -61,7 +62,7 @@ class TableModel {
             sql += join.type === 'left' ? ' LEFT OUTER JOIN' : ' INNER JOIN';
             sql += ` ${join.model.TableName} as "${join.model.TableAlias}" ON `;
             const query = WhereExpression_1.default.createCondition(join.conditions, this, this.vars.length + 1);
-            sql += query.sql;
+            sql += query.expression;
             if (query.vars !== undefined) {
                 this.vars = [...this.vars, ...query.vars];
             }
@@ -138,6 +139,7 @@ class TableModel {
             'notInput': 'Please enter {name}.',
             'fk': 'The value of {name} does not exist in the table.',
             'idNotExist': 'The specified ID({id}) does not exist in the table.',
+            'find': 'The specified data does not exist in the table. ({pks})'
         };
         this.errorMessageJapan = {
             'string': '{name}はstringかnumberで入力してください。',
@@ -165,6 +167,7 @@ class TableModel {
             'notInput': '{name}を入力してください。',
             'fk': '{name}の値がテーブルに存在しません。',
             'idNotExist': '指定されたID({id})はテーブルに存在しません。',
+            'find': '指定されたデータはテーブルに存在しません。({pks})'
         };
         this.errorMessages = process.env.TZ === 'Asia/Tokyo' ? this.errorMessageJapan : this.errorMessageEnglish;
         this.client = client;
@@ -214,20 +217,8 @@ class TableModel {
                     selects.push(`${expression.expression} as "${expression.alias}"`);
                 }
             }
-            const conditions = [];
-            const vars = [];
-            for (const [keyColumn, column] of Object.entries(this.Columns)) {
-                if (column.attribute !== 'primary') {
-                    continue;
-                }
-                if (pk[keyColumn] === undefined || pk[keyColumn] === null) {
-                    throw new Error(`No value is set for the primary key "${this.TableName}".${keyColumn}. Please set it in the first argument.`);
-                }
-                ValidateValueUtil_1.default.validateValue(column, pk[keyColumn]);
-                vars.push(pk[keyColumn]);
-                conditions.push(`${keyColumn} = $${vars.length}`);
-            }
-            const sql = `SELECT ${selects.join(',')} FROM ${this.TableName} WHERE ${conditions.join(' AND ')}`;
+            const { expression, vars } = WhereExpression_1.default.createConditionPk(this, pk);
+            const sql = `SELECT ${selects.join(',')} FROM ${this.TableName} WHERE ${expression}`;
             let datas = yield this.executeQuery(sql, vars);
             return datas.rowCount == 0 ? null : datas.rows[0];
         });
@@ -299,7 +290,7 @@ class TableModel {
             }
             else {
                 const query = WhereExpression_1.default.create({ model: this, name: left }, operator, right, this.vars.length + 1);
-                this.whereExpressions.push(query.sql);
+                this.whereExpressions.push(query.expression);
                 if (query.vars !== undefined) {
                     this.vars = [...this.vars, ...query.vars];
                 }
@@ -312,7 +303,7 @@ class TableModel {
             }
             else {
                 const query = WhereExpression_1.default.create(left, operator, right, this.vars.length + 1);
-                this.whereExpressions.push(query.sql);
+                this.whereExpressions.push(query.expression);
                 if (query.vars !== undefined) {
                     this.vars = [...this.vars, ...query.vars];
                 }
@@ -321,7 +312,7 @@ class TableModel {
         }
         if (Array.isArray(left)) {
             const query = WhereExpression_1.default.createCondition(left, this, this.vars.length + 1);
-            this.whereExpressions.push(query.sql);
+            this.whereExpressions.push(query.expression);
             if (query.vars !== undefined) {
                 this.vars = [...this.vars, ...query.vars];
             }
@@ -539,7 +530,7 @@ class TableModel {
                 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);
-                    this.whereExpressions.push(query.sql);
+                    this.whereExpressions.push(query.expression);
                     if (query.vars !== undefined) {
                         this.vars = [...this.vars, ...query.vars];
                     }
@@ -555,28 +546,32 @@ class TableModel {
     }
     executeUpdateId(id, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             ValidateValueUtil_1.default.validateId(this.Columns, id);
             yield this.validateOptions(options, false);
             yield this.validateUpdateId(id, options);
             yield this.validateUpdate(options);
-            const updateExpressions = [];
-            const vars = [];
-            for (const [key, value] of Object.entries(options)) {
-                if (value === undefined) {
-                    throw new Error(`The update option ${key} is undefined.`);
-                }
-                const column = this.getColumn(key);
-                if (column.attribute === 'primary') {
-                    throw new Error(`The primary key ${this.TableName}.${key} cannot be changed.`);
-                }
-                vars.push(value);
-                updateExpressions.push(`${key} = $${vars.length}`);
+            const updateSetQuery = UpdateExpression_1.default.createUpdateSet(this, options);
+            const whereQuery = WhereExpression_1.default.createConditionPk(this, { id: id }, updateSetQuery.vars);
+            const sql = updateSetQuery.expression + ' WHERE ' + whereQuery.expression;
+            const data = yield this.executeQuery(sql, whereQuery.vars);
+            if (data.rowCount !== 1) {
+                throw new Exception_1.UnprocessableException("201", this.errorMessages.find.replace('{pks}', ((_a = whereQuery.vars) !== null && _a !== void 0 ? _a : []).join(',')));
             }
-            vars.push(id);
-            const sql = `UPDATE ${this.TableName} SET ${updateExpressions.join(',')} WHERE id = $${vars.length}`;
-            const data = yield this.executeQuery(sql, vars);
+        });
+    }
+    executeUpdateByPk(pk, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            yield this.validateOptions(options, false);
+            // await this.validateUpdateId(id, options);
+            yield this.validateUpdate(options);
+            const updateSetQuery = UpdateExpression_1.default.createUpdateSet(this, options);
+            const whereQuery = WhereExpression_1.default.createConditionPk(this, pk, updateSetQuery.vars);
+            const sql = updateSetQuery.expression + ' WHERE ' + whereQuery.expression;
+            const data = yield this.executeQuery(sql, whereQuery.vars);
             if (data.rowCount !== 1) {
-                throw new Exception_1.UnprocessableException("201", this.errorMessages.idNotExist.replace('{id}', id));
+                throw new Exception_1.UnprocessableException("401", this.errorMessages.find.replace('{pks}', ((_a = whereQuery.vars) !== null && _a !== void 0 ? _a : []).join(',')));
             }
         });
     }
@@ -589,7 +584,7 @@ class TableModel {
                 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);
-                    this.whereExpressions.push(query.sql);
+                    this.whereExpressions.push(query.expression);
                     if (query.vars !== undefined) {
                         this.vars = [...this.vars, ...query.vars];
                     }
@@ -632,7 +627,7 @@ class TableModel {
                 sql = param1;
             }
             else {
-                sql = param1.sql;
+                sql = param1.expression;
                 vars = param1.vars;
             }
             return yield this.clientQuery(sql, vars);

package/dist/models/Utils/MessageUtil.js

@@ -0,0 +1 @@
+"use strict";

package/package.json

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

package/src/models/SqlUtils/UpdateExpression.ts

@@ -0,0 +1,29 @@
+import { TableModel } from "../TableModel";
+import { TQuery } from "../Type";
+
+export default class UpdateExpression {
+
+    static createUpdateSet(model: TableModel, options: {[key: string]: any}): TQuery {
+        const expressions = [];
+        const vars = [];
+        for (const [key, value] of Object.entries(options)) {
+            if (value === undefined) {
+                throw new Error(`The update option ${key} is undefined.`);
+            }
+
+            const column = model.getColumn(key);
+            if (column.attribute === 'primary') {
+                throw new Error(`The primary key ${model.TableName}.${key} cannot be changed.`);
+            }
+
+            vars.push(value);
+            expressions.push(`${key} = $${vars.length}`);
+        }
+
+        return {
+            expression: `UPDATE ${model.TableName} SET ${expressions.join(',')}`,
+            vars: vars
+        }
+    }
+
+}

package/src/models/SqlUtils/WhereExpression.ts

@@ -4,6 +4,30 @@ import ValidateValueUtil from "./ValidateValueUtil";
 
 export default class WhereExpression {
 
+    public static createConditionPk(model: TableModel, pk: {[key: string]: any}, vars: Array<any> | null = null, isSetAlias: boolean = false): TQuery {
+        const conditions = [];
+        const newVars = vars === null ? [] : [...vars];
+
+        for (const [keyColumn, column] of Object.entries(model.Columns)) {
+            if (column.attribute !== 'primary') {
+                continue;
+            }
+
+            if (pk[keyColumn] === undefined || pk[keyColumn] === null) {
+                throw new Error(`No value is set for the primary key "${model.TableName}".${keyColumn}.`);
+            }
+
+            ValidateValueUtil.validateValue(column, pk[keyColumn]);
+            newVars.push(pk[keyColumn]);
+            conditions.push(`${isSetAlias ? `"${model.TableAlias}".` : ''}${keyColumn} = $${newVars.length}`);
+        }
+
+        return {
+            expression: conditions.join(' AND '), 
+            vars: newVars
+        }
+    }
+
     /**
      * Helper method to create OR conditions
      * @param conditions Array of conditions that make up the OR condition
@@ -12,13 +36,13 @@ export default class WhereExpression {
     public static createCondition(conditions: Array<TNestedCondition>, model: TableModel, varLength: number): TQuery {
 
         if (conditions.length === 0) {
-            return { sql: '' };
+            return { expression: '' };
         }
     
         let logicalOperator = 'AND';
         if (conditions[0] === 'AND' || conditions[0] === 'OR') {
             if (conditions.length === 1) {
-                return { sql: '' };
+                return { expression: '' };
             }
             
             logicalOperator = conditions[0];
@@ -31,7 +55,7 @@ export default class WhereExpression {
             if (Array.isArray(condition)) {
                 // If it's an array, it's a nested condition, so call this function recursively
                 const query = this.createCondition(condition, model, varLength + vars.length);
-                expression.push(query.sql);
+                expression.push(query.expression);
                 if (query.vars !== undefined) {
                     vars = [...vars, ...query.vars];
                 }
@@ -46,7 +70,7 @@ export default class WhereExpression {
 
             if (typeof condition.l === 'string') {
                 const query = this.create({ model: model, name: condition.l}, condition.o, condition.r, varLength + vars.length);
-                expression.push(query.sql);
+                expression.push(query.expression);
                 if (query.vars !== undefined) {
                     vars = [...vars, ...query.vars];
                 }
@@ -54,14 +78,14 @@ export default class WhereExpression {
             }
 
             const query = this.create(condition.l, condition.o, condition.r, varLength + vars.length);
-            expression.push(query.sql);
+            expression.push(query.expression);
             if (query.vars !== undefined) {
                 vars = [...vars, ...query.vars];
             }
         }
 
         return {
-            sql: `(${expression.filter(condition => condition ?? '' !== '').join(` ${logicalOperator} `)})`,
+            expression: `(${expression.filter(condition => condition ?? '' !== '').join(` ${logicalOperator} `)})`,
             vars: vars
         }
     }
@@ -106,11 +130,11 @@ export default class WhereExpression {
 
             if (operator == "=") {
                 return {
-                    sql: `${leftColumn.expression} is null`
+                    expression: `${leftColumn.expression} is null`
                 }
             } else if (operator == "!=") {
                 return {
-                    sql: `${leftColumn.expression} is not null`
+                    expression: `${leftColumn.expression} is not null`
                 }
             } else {
                 throw new Error(`When comparing with null, operators other than =, != cannot be used. (${operator})`);
@@ -133,7 +157,7 @@ export default class WhereExpression {
 
             if (right.length == 0) {
                 // Creating in, not in with 0 elements will cause an error, but since the data to be passed is correct and the expected return value does not change, do not search if there are 0 elements
-                return { sql: '' };
+                return { expression: '' };
             }
             
             // Validate values
@@ -141,7 +165,7 @@ export default class WhereExpression {
                 ValidateValueUtil.validateValue(leftColumn, value);
             }
             return {
-                sql: `${leftColumn.expression} ${operator === 'in' ? '=' : '!='} ANY($${varLength})`,
+                expression: `${leftColumn.expression} ${operator === 'in' ? '=' : '!='} ANY($${varLength})`,
                 vars: [right]
             }
         } else if (Array.isArray(right)) {
@@ -161,17 +185,17 @@ export default class WhereExpression {
                 case 'like':
                 case 'ilike':
                     return {
-                        sql: `${leftColumn.expression} ${operator} '%' || ${rightColumn.expression} || '%'`
+                        expression: `${leftColumn.expression} ${operator} '%' || ${rightColumn.expression} || '%'`
                     }
                 case 'h2f_like': // half to full like
                 case 'h2f_ilike': // half to full ilike
                 return {
-                    sql: `${this.makeSqlReplaceHalfToFull(leftColumn.expression)} ${operator.replace("h2f_", "")} ${this.makeSqlReplaceHalfToFull(`'%' || ${rightColumn.expression} || '%'`)}`
+                    expression: `${this.makeSqlReplaceHalfToFull(leftColumn.expression)} ${operator.replace("h2f_", "")} ${this.makeSqlReplaceHalfToFull(`'%' || ${rightColumn.expression} || '%'`)}`
                 }
             }
 
             return {
-                sql: `${leftColumn.expression} ${operator} ${rightColumn.expression}`
+                expression: `${leftColumn.expression} ${operator} ${rightColumn.expression}`
             }
         }
 
@@ -181,19 +205,19 @@ export default class WhereExpression {
             case 'like':
             case 'ilike':
                 return {
-                    sql: `${leftColumn.expression} ${operator} $${varLength}`,
+                    expression: `${leftColumn.expression} ${operator} $${varLength}`,
                     vars: [`%${right}%`]
                 }
             case 'h2f_like': // half to full like
             case 'h2f_ilike': // half to full ilike
                 return {
-                    sql: `${this.makeSqlReplaceHalfToFull(leftColumn.expression)} ${operator.replace("h2f_", "")} ${this.makeSqlReplaceHalfToFull(`$${varLength}`)}`,
+                    expression: `${this.makeSqlReplaceHalfToFull(leftColumn.expression)} ${operator.replace("h2f_", "")} ${this.makeSqlReplaceHalfToFull(`$${varLength}`)}`,
                     vars: [`%${right}%`]
                 }
         }
 
         return {
-            sql: `${leftColumn.expression} ${operator} $${varLength}`,
+            expression: `${leftColumn.expression} ${operator} $${varLength}`,
             vars: [right]
         }
     }
@@ -222,14 +246,14 @@ export default class WhereExpression {
                 // バリデーションチェックをする
                 
                 return {
-                    sql: `${leftColumn.expression} ${operator} $${varLength}`,
+                    expression: `${leftColumn.expression} ${operator} $${varLength}`,
                     vars: [right]
                 }
         }
 
 
         return {
-            sql: `${leftColumn.expression} ${operator} $${varLength}`,
+            expression: `${leftColumn.expression} ${operator} $${varLength}`,
             vars: [right]
         }
     }

package/src/models/TableModel.ts

@@ -6,6 +6,7 @@ import WhereExpression from './SqlUtils/WhereExpression';
 import ValidateClient from './ValidateClient';
 import { DbConflictException, UnprocessableException } from '../exceptions/Exception';
 import ExpressionClient from './ExpressionClient';
+import UpdateExpression from './SqlUtils/UpdateExpression';
 
 export class TableModel {
 
@@ -84,7 +85,7 @@ export class TableModel {
             sql += join.type === 'left' ? ' LEFT OUTER JOIN' : ' INNER JOIN';
             sql += ` ${join.model.TableName} as "${join.model.TableAlias}" ON `;
             const query = WhereExpression.createCondition(join.conditions, this, this.vars.length + 1);
-            sql += query.sql;
+            sql += query.expression;
             if (query.vars !== undefined) {
                 this.vars = [...this.vars, ...query.vars]
             }
@@ -190,22 +191,9 @@ export class TableModel {
             }
         }
 
-        const conditions = [];
-        const vars = [];
-        for (const [keyColumn, column] of Object.entries(this.Columns)) {
-            if (column.attribute !== 'primary') {
-                continue;
-            }
-
-            if (pk[keyColumn] === undefined || pk[keyColumn] === null) {
-                throw new Error(`No value is set for the primary key "${this.TableName}".${keyColumn}. Please set it in the first argument.`);
-            }
-            ValidateValueUtil.validateValue(column, pk[keyColumn]);
-            vars.push(pk[keyColumn]);
-            conditions.push(`${keyColumn} = $${vars.length}`);
-        }
+        const {expression, vars} = WhereExpression.createConditionPk(this, pk);
  
-        const sql = `SELECT ${selects.join(',')} FROM ${this.TableName} WHERE ${conditions.join(' AND ')}`;
+        const sql = `SELECT ${selects.join(',')} FROM ${this.TableName} WHERE ${expression}`;
         let datas = await this.executeQuery(sql, vars);
 
         return datas.rowCount == 0 ? null : datas.rows[0] as T;
@@ -289,7 +277,7 @@ export class TableModel {
                 this.whereExpressions.push(left);
             } else {
                 const query = WhereExpression.create({model: this, name: left}, operator, right, this.vars.length + 1);
-                this.whereExpressions.push(query.sql);
+                this.whereExpressions.push(query.expression);
                 if (query.vars !== undefined) {
                     this.vars = [...this.vars, ...query.vars];
                 }
@@ -302,7 +290,7 @@ export class TableModel {
                 throw new Error(`If left is TColumnInfo, please set operator and right.`);
             } else {
                 const query = WhereExpression.create(left, operator, right, this.vars.length + 1);
-                this.whereExpressions.push(query.sql);
+                this.whereExpressions.push(query.expression);
                 if (query.vars !== undefined) {
                     this.vars = [...this.vars, ...query.vars];
                 }
@@ -312,7 +300,7 @@ export class TableModel {
 
         if (Array.isArray(left)) {
             const query = WhereExpression.createCondition(left, this, this.vars.length + 1);
-            this.whereExpressions.push(query.sql);
+            this.whereExpressions.push(query.expression);
             if (query.vars !== undefined) {
                 this.vars = [...this.vars, ...query.vars];
             }
@@ -405,7 +393,7 @@ export class TableModel {
         return { datas: data.rows as Array<T>, count: Number(countData.rows[0].count), lastPage: Math.ceil(Number(countData.rows[0].count) / this.PageCount)};
     }
 
-    private readonly errorMessageEnglish: Record<TColumnType | TColumnArrayType | 'length' | 'null' | 'notInput' | 'fk' | 'idNotExist', string> = {
+    private readonly errorMessageEnglish: Record<TColumnType | TColumnArrayType | 'length' | 'null' | 'notInput' | 'fk' | 'idNotExist' | 'find', string> = {
         'string': '{name} should be entered as a string or number type.',
         'string[]': '{name} should be entered as an array of string or number types.',
         'uuid': '{name} should be entered as a UUID.',
@@ -431,8 +419,9 @@ export class TableModel {
         'notInput': 'Please enter {name}.',
         'fk': 'The value of {name} does not exist in the table.',
         'idNotExist': 'The specified ID({id}) does not exist in the table.',
+        'find': 'The specified data does not exist in the table. ({pks})'
     }
-    private readonly errorMessageJapan: Record<TColumnType | TColumnArrayType | 'length' | 'null' | 'notInput' | 'fk' | 'idNotExist', string> = {
+    private readonly errorMessageJapan: Record<TColumnType | TColumnArrayType | 'length' | 'null' | 'notInput' | 'fk' | 'idNotExist' | 'find', string> = {
         'string': '{name}はstringかnumberで入力してください。',
         'string[]': '{name}はstringかnumberの配列で入力してください。',
         'uuid': '{name}はuuidで入力してください。',
@@ -458,6 +447,7 @@ export class TableModel {
         'notInput': '{name}を入力してください。',
         'fk': '{name}の値がテーブルに存在しません。',
         'idNotExist': '指定されたID({id})はテーブルに存在しません。',
+        'find': '指定されたデータはテーブルに存在しません。({pks})'
     }
 
     private throwException(code: string, type: TColumnType | TColumnArrayType | 'length' | 'null' | 'notInput' | 'fk' | 'idNotExist', columnName: string, vallue: any): never {
@@ -474,7 +464,7 @@ export class TableModel {
         throw new UnprocessableException(code, message);
     }
 
-    protected readonly errorMessages: Record<TColumnType | TColumnArrayType | 'length' | 'null' | 'notInput' | 'fk' | 'idNotExist', string> = 
+    protected readonly errorMessages: Record<TColumnType | TColumnArrayType | 'length' | 'null' | 'notInput' | 'fk' | 'idNotExist' | 'find', string> = 
         process.env.TZ === 'Asia/Tokyo' ? this.errorMessageJapan : this.errorMessageEnglish;
 
     protected async validateOptions(options: {[key: string]: any}, isInsert: boolean): Promise<void> {
@@ -606,7 +596,7 @@ export class TableModel {
                 tables.push(`${join.model.TableName} as "${join.model.TableAlias}"`);
 
                 const query = WhereExpression.createCondition(join.conditions, this, this.vars.length);
-                this.whereExpressions.push(query.sql);
+                this.whereExpressions.push(query.expression);
                 if (query.vars !== undefined) {
                     this.vars = [...this.vars, ...query.vars]
                 }
@@ -628,28 +618,30 @@ export class TableModel {
         await this.validateUpdateId(id, options);
         await this.validateUpdate(options);
 
-        const updateExpressions: Array<string> = [];
-        const vars: Array<any> = [];
+        const updateSetQuery = UpdateExpression.createUpdateSet(this, options);
+        const whereQuery = WhereExpression.createConditionPk(this, {id: id}, updateSetQuery.vars);
 
-        for (const [key, value] of Object.entries(options)) {
-            if (value === undefined) {
-                throw new Error(`The update option ${key} is undefined.`);
-            }
+        const sql = updateSetQuery.expression + ' WHERE ' + whereQuery.expression;
 
-            const column = this.getColumn(key);
-            if (column.attribute === 'primary') {
-                throw new Error(`The primary key ${this.TableName}.${key} cannot be changed.`);
-            }
-
-            vars.push(value);
-            updateExpressions.push(`${key} = $${vars.length}`);
+        const data = await this.executeQuery(sql, whereQuery.vars);
+        if (data.rowCount !== 1) {
+            throw new UnprocessableException("201", this.errorMessages.find.replace('{pks}', (whereQuery.vars ?? []).join(',')));
         }
-        vars.push(id);
-        
-        const sql = `UPDATE ${this.TableName} SET ${updateExpressions.join(',')} WHERE id = $${vars.length}`;
-        const data = await this.executeQuery(sql, vars);
+    }
+
+    public async executeUpdateByPk(pk: {[key: string]: any}, options: {[key: string]: any}) : Promise<void> {
+        await this.validateOptions(options, false);
+        // await this.validateUpdateId(id, options);
+        await this.validateUpdate(options);
+
+        const updateSetQuery = UpdateExpression.createUpdateSet(this, options);
+        const whereQuery = WhereExpression.createConditionPk(this, pk, updateSetQuery.vars);
+
+        const sql = updateSetQuery.expression + ' WHERE ' + whereQuery.expression;
+
+        const data = await this.executeQuery(sql, whereQuery.vars);
         if (data.rowCount !== 1) {
-            throw new UnprocessableException("201", this.errorMessages.idNotExist.replace('{id}', id));
+            throw new UnprocessableException("401", this.errorMessages.find.replace('{pks}', (whereQuery.vars ?? []).join(',')));
         }
     }
 
@@ -663,7 +655,7 @@ export class TableModel {
                 tables.push(`${join.model.TableName} as "${join.model.TableAlias}"`);
 
                 const query = WhereExpression.createCondition(join.conditions, this, this.vars.length);
-                this.whereExpressions.push(query.sql);
+                this.whereExpressions.push(query.expression);
                 if (query.vars !== undefined) {
                     this.vars = [...this.vars, ...query.vars]
                 }
@@ -710,7 +702,7 @@ export class TableModel {
         if (typeof param1 === 'string') {
             sql = param1;
         } else {
-            sql = param1.sql;
+            sql = param1.expression;
             vars = param1.vars;
         }
 

package/src/models/Type.ts

@@ -49,7 +49,7 @@ export type TColumnDetail = TColumn & {
 
 export type TOperator = "=" | "!=" | ">" | ">=" | "<" | "<=" | "like" | "ilike" | "h2f_like" | "h2f_ilike" | "in" | "not in";
 export type TColumnInfo = { model: TableModel, name: string }
-export type TQuery = {sql: string, vars?: Array<any>};
+export type TQuery = {expression: string, vars?: Array<any>};
 export type TSelectExpression = { expression: string, alias: string }
 export type TAggregateFuncType = 'sum' | 'avg' | 'max' | 'min' | 'count';
 export type TCondition = string | {