pg-mvc-service 2.1.21 → 2.1.23

package/dist/models/MigrateRollback.d.ts

@@ -7,7 +7,7 @@ export declare const migrate: (migrates: Array<MigrateTable>, poolParam: {
     port?: number;
     isSsl?: boolean;
 }) => Promise<void>;
-export declare const rollback: (toNumber: number, poolParam: {
+export declare const rollback: (toNumber: number, schemaName: string, poolParam: {
     host: string;
     user: string;
     dbName: string;

package/dist/models/MigrateRollback.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MigrateRollback.d.ts","sourceRoot":"","sources":["../../src/models/MigrateRollback.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,eAAO,MAAM,OAAO,GAAU,UAAU,KAAK,CAAC,YAAY,CAAC,EAAE,WAAW;IACpE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,OAAO,CAAA;CAC/F,KAAG,OAAO,CAAC,IAAI,CAyEf,CAAA;AAED,eAAO,MAAM,QAAQ,GAAU,UAAU,MAAM,EAAE,WAAW;IACxD,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,OAAO,CAAA;CAC/F,KAAG,OAAO,CAAC,IAAI,CAiDf,CAAA"}
+{"version":3,"file":"MigrateRollback.d.ts","sourceRoot":"","sources":["../../src/models/MigrateRollback.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,eAAO,MAAM,OAAO,GAAU,UAAU,KAAK,CAAC,YAAY,CAAC,EAAE,WAAW;IACpE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,OAAO,CAAA;CAC/F,KAAG,OAAO,CAAC,IAAI,CAwFf,CAAA;AAED,eAAO,MAAM,QAAQ,GAAU,UAAU,MAAM,EAAE,YAAY,MAAM,EAAE,WAAW;IAC5E,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,OAAO,CAAA;CAC/F,KAAG,OAAO,CAAC,IAAI,CAmDf,CAAA"}

package/dist/models/MigrateRollback.js

@@ -13,6 +13,13 @@ exports.rollback = exports.migrate = void 0;
 const pg_1 = require("pg");
 const migrate = (migrates, poolParam) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
+    const migratesBySchema = {};
+    for (const migrate of migrates) {
+        if (migrate.Schema in migratesBySchema === false) {
+            migratesBySchema[migrate.Schema] = [];
+        }
+        migratesBySchema[migrate.Schema].push(migrate);
+    }
     const pool = new pg_1.Pool({
         user: poolParam.user,
         password: poolParam.password,
@@ -25,15 +32,18 @@ const migrate = (migrates, poolParam) => __awaiter(void 0, void 0, void 0, funct
     });
     // create migration table
     try {
-        if ((yield isExistMigrationTable(pool)) == false) {
-            const sql = `
-                CREATE TABLE migrations (
-                    migration_number int,
-                    script_file VARCHAR(50),
-                    rollback_script VARCHAR(5000),
-                    create_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP
-                );`;
-            yield pool.query(sql);
+        for (const keySchema of Object.keys(migratesBySchema)) {
+            if ((yield isExistMigrationTable(pool, keySchema)) == false) {
+                const tableName = keySchema === '' ? 'migrations' : `"${keySchema}".migrations`;
+                const sql = `
+                    CREATE TABLE ${tableName} (
+                        migration_number int,
+                        script_file VARCHAR(50),
+                        rollback_script VARCHAR(5000),
+                        create_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP
+                    );`;
+                yield pool.query(sql);
+            }
         }
     }
     catch (ex) {
@@ -44,27 +54,30 @@ const migrate = (migrates, poolParam) => __awaiter(void 0, void 0, void 0, funct
     const client = yield pool.connect();
     try {
         client.query('BEGIN');
-        const datas = yield getMigrations(pool);
-        let maxNumber = datas.maxNumber;
-        for (const migrate of migrates) {
-            const className = migrate.constructor.name;
-            if (datas.datas.filter(data => data.script_file === className).length > 0) {
-                console.log(`Already executed: ${className}`);
-                continue;
+        for (const [keySchema, migrates] of Object.entries(migratesBySchema)) {
+            const datas = yield getMigrations(pool, keySchema);
+            let maxNumber = datas.maxNumber;
+            for (const migrate of migrates) {
+                const className = migrate.constructor.name;
+                if (datas.datas.filter(data => data.script_file === className).length > 0) {
+                    console.log(`Already executed: ${className}`);
+                    continue;
+                }
+                yield client.query(migrate.MigrateSql);
+                const grantSql = migrate.AddGrantSql;
+                if (grantSql !== null) {
+                    yield client.query(grantSql);
+                }
+                const tableName = keySchema === '' ? 'migrations' : `"${keySchema}".migrations`;
+                const migrateInsertSql = `
+                    INSERT INTO ${tableName}
+                    (migration_number, script_file, rollback_script)
+                    VALUES (${maxNumber + 1}, '${className}', '${migrate.RollbackSql}');
+                `;
+                maxNumber++;
+                yield client.query(migrateInsertSql);
+                console.log(`Execution completed: ${className}`);
             }
-            yield client.query(migrate.MigrateSql);
-            const grantSql = migrate.AddGrantSql;
-            if (grantSql !== null) {
-                yield client.query(grantSql);
-            }
-            const migrateInsertSql = `
-                INSERT INTO migrations
-                (migration_number, script_file, rollback_script)
-                VALUES (${maxNumber + 1}, '${className}', '${migrate.RollbackSql}');
-            `;
-            maxNumber++;
-            yield client.query(migrateInsertSql);
-            console.log(`Execution completed: ${className}`);
         }
         yield client.query('COMMIT');
         console.log('Migration completed');
@@ -79,7 +92,7 @@ const migrate = (migrates, poolParam) => __awaiter(void 0, void 0, void 0, funct
     }
 });
 exports.migrate = migrate;
-const rollback = (toNumber, poolParam) => __awaiter(void 0, void 0, void 0, function* () {
+const rollback = (toNumber, schemaName, poolParam) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     const pool = new pg_1.Pool({
         user: poolParam.user,
@@ -93,7 +106,7 @@ const rollback = (toNumber, poolParam) => __awaiter(void 0, void 0, void 0, func
     });
     try {
         // If the migration table does not exist, there is no target for rollback, so do not perform it
-        if ((yield isExistMigrationTable(pool)) == false) {
+        if ((yield isExistMigrationTable(pool, schemaName)) == false) {
             return;
         }
     }
@@ -105,13 +118,14 @@ const rollback = (toNumber, poolParam) => __awaiter(void 0, void 0, void 0, func
     const client = yield pool.connect();
     try {
         yield client.query('BEGIN');
-        const datas = yield getMigrations(pool);
+        const datas = yield getMigrations(pool, schemaName);
         for (const data of datas.datas) {
             if (data.migration_number < toNumber) {
                 break;
             }
             yield client.query(data.rollback_script);
-            yield client.query(`DELETE FROM migrations WHERE migration_number = ${data.migration_number}`);
+            const tableName = schemaName === '' ? 'migrations' : `"${schemaName}".migrations`;
+            yield client.query(`DELETE FROM ${tableName} WHERE migration_number = ${data.migration_number}`);
             console.log(`Execution completed: ${data.script_file}`);
         }
         yield client.query('COMMIT');
@@ -127,20 +141,35 @@ const rollback = (toNumber, poolParam) => __awaiter(void 0, void 0, void 0, func
     }
 });
 exports.rollback = rollback;
-const isExistMigrationTable = (pool) => __awaiter(void 0, void 0, void 0, function* () {
-    const existMigrationTableSql = `
+const isExistMigrationTable = (pool, schemaName) => __awaiter(void 0, void 0, void 0, function* () {
+    const values = ['migrations'];
+    let sql = `
         SELECT EXISTS (
             SELECT FROM information_schema.tables 
-            WHERE table_name = 'migrations'
-        );
+            WHERE table_name = $1
     `;
-    const res = yield pool.query(existMigrationTableSql);
+    if (schemaName !== "") {
+        sql += ` AND table_schema = $2`;
+        values.push(schemaName);
+    }
+    sql += `);`;
+    const res = yield pool.query(sql, values);
     return res.rows[0].exists;
 });
-const getMigrations = (pool) => __awaiter(void 0, void 0, void 0, function* () {
-    const datas = yield pool.query("SELECT * FROM migrations ORDER BY migration_number DESC;");
+const getMigrations = (pool, schemaName) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
+    const tableName = schemaName === '' ? 'migrations' : `"${schemaName}".migrations`;
+    const datas = yield pool.query(`
+        SELECT 
+            * 
+        FROM 
+            ${tableName} 
+        ORDER BY 
+            migration_number DESC;
+    `);
     return {
-        maxNumber: datas.rows.reduce((max, data) => data.migration_number > max ? data.migration_number : max, 0),
+        // すでに降順ソートされているので、最初の1件が最大値
+        maxNumber: ((_a = datas.rows[0]) === null || _a === void 0 ? void 0 : _a.migration_number) || 0,
         datas: datas.rows
     };
 });

package/dist/models/MigrateTable.d.ts

@@ -3,6 +3,8 @@ export declare class MigrateTable {
     protected readonly rollbackSql: string;
     protected readonly addGrantTables: Array<string>;
     protected readonly user: string;
+    protected readonly schema: string;
+    get Schema(): string;
     get MigrateSql(): string;
     get RollbackSql(): string;
     get AddGrantSql(): string | null;

package/dist/models/MigrateTable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MigrateTable.d.ts","sourceRoot":"","sources":["../../src/models/MigrateTable.ts"],"names":[],"mappings":"AAAA,qBAAa,YAAY;IAErB,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAM;IAC3C,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAM;IAC5C,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,KAAK,CAAC,MAAM,CAAC,CAAM;IACtD,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAM;IAErC,IAAI,UAAU,IAAI,MAAM,CAAmD;IAC3E,IAAI,WAAW,IAAI,MAAM,CAAoD;IAC7E,IAAI,WAAW,IAAI,MAAM,GAAG,IAAI,CAe/B;;gBAGW,IAAI,EAAE,MAAM;IAOxB,OAAO,CAAC,gBAAgB;CAqB3B"}
+{"version":3,"file":"MigrateTable.d.ts","sourceRoot":"","sources":["../../src/models/MigrateTable.ts"],"names":[],"mappings":"AAAA,qBAAa,YAAY;IAErB,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAM;IAC3C,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAM;IAC5C,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,KAAK,CAAC,MAAM,CAAC,CAAM;IACtD,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAM;IACrC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAY;IAE7C,IAAI,MAAM,IAAI,MAAM,CAAwB;IAC5C,IAAI,UAAU,IAAI,MAAM,CAAmD;IAC3E,IAAI,WAAW,IAAI,MAAM,CAAoD;IAC7E,IAAI,WAAW,IAAI,MAAM,GAAG,IAAI,CAe/B;;gBAGW,IAAI,EAAE,MAAM;IAOxB,OAAO,CAAC,gBAAgB;CAqB3B"}

package/dist/models/MigrateTable.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MigrateTable = void 0;
 class MigrateTable {
+    get Schema() { return this.schema; }
     get MigrateSql() { return this.trimSpaceLineSql(this.migrateSql); }
     get RollbackSql() { return this.trimSpaceLineSql(this.rollbackSql); }
     get AddGrantSql() {
@@ -15,7 +16,7 @@ class MigrateTable {
         }
         let sql = "";
         for (const table of tables) {
-            sql += `GRANT SELECT, INSERT, UPDATE, DELETE ON TABLE public.${table} TO ${this.user};`;
+            sql += `GRANT SELECT, INSERT, UPDATE, DELETE ON TABLE ${this.schema}.${table} TO ${this.user};`;
         }
         return sql;
     }
@@ -24,6 +25,7 @@ class MigrateTable {
         this.rollbackSql = '';
         this.addGrantTables = [];
         this.user = '';
+        this.schema = 'public';
         if (user !== undefined) {
             this.user = user;
         }

package/dist/models/SqlUtils/UpdateExpression.js

@@ -16,7 +16,7 @@ class UpdateExpression {
             expressions.push(`${key} = $${vars.length}`);
         }
         return {
-            expression: `UPDATE ${model.TableName} SET ${expressions.join(',')}`,
+            expression: `UPDATE ${model.SchemaTableName} SET ${expressions.join(',')}`,
             vars: vars
         };
     }

package/dist/models/SqlUtils/WhereExpression.js

@@ -14,7 +14,7 @@ class WhereExpression {
                 continue;
             }
             if (pk[keyColumn] === undefined || pk[keyColumn] === null) {
-                throw new Error(`No value is set for the primary key "${model.TableName}".${keyColumn}.`);
+                throw new Error(`No value is set for the primary key "${model.SchemaTableName}".${keyColumn}.`);
             }
             ValidateValueUtil_1.default.validateValue(column, pk[keyColumn]);
             newVars.push(pk[keyColumn]);

package/dist/models/TableDoc.js

@@ -213,10 +213,10 @@ td:nth-child(12) {
 `;
     const dbObj = {};
     for (const model of models) {
-        if (model.DbName in dbObj === false) {
-            dbObj[model.DbName] = [];
+        if (model.SchemaName in dbObj === false) {
+            dbObj[model.SchemaName] = [];
         }
-        dbObj[model.DbName].push(model);
+        dbObj[model.SchemaName].push(model);
     }
     const jsCripFuncs = {};
     for (const [keyDbName, models] of Object.entries(dbObj)) {
@@ -224,7 +224,7 @@ td:nth-child(12) {
     <div class="db-wrapper">
         <h2>${keyDbName} Database</h2>`;
         for (const model of models) {
-            const createFuncName = `clipboard_createTable_${model.DbName}_${model.TableName}`;
+            const createFuncName = `clipboard_createTable_${model.SchemaName}_${model.TableName}`;
             html += `
         <div class="table-wrapper">
             <div class="table-title-wrapper">
@@ -253,8 +253,8 @@ td:nth-child(12) {
             let index = 0;
             for (const [keyColName, column] of Object.entries(model.Columns)) {
                 index++;
-                const addFuncName = `clipboard_addColumn_${model.DbName}_${model.TableName}_${keyColName}`;
-                const dropFuncName = `clipboard_dropColumn_${model.DbName}_${model.TableName}_${keyColName}`;
+                const addFuncName = `clipboard_addColumn_${model.SchemaName}_${model.TableName}_${keyColName}`;
+                const dropFuncName = `clipboard_dropColumn_${model.SchemaName}_${model.TableName}_${keyColName}`;
                 // 外部キー用
                 let references = [];
                 for (const ref of model.GetReferences(keyColName)) {
@@ -293,8 +293,8 @@ td:nth-child(12) {
                         `}
                     </td>
                 </tr>`;
-                jsCripFuncs[addFuncName] = `ALTER TABLE ${model.TableName} ADD COLUMN ${keyColName} ${toColumnType(column)} ${toColumnAttibute(column)};`;
-                jsCripFuncs[dropFuncName] = `ALTER TABLE ${model.TableName} DROP COLUMN ${keyColName};`;
+                jsCripFuncs[addFuncName] = `ALTER TABLE ${model.SchemaTableName} ADD COLUMN ${keyColName} ${toColumnType(column)} ${toColumnAttibute(column)};`;
+                jsCripFuncs[dropFuncName] = `ALTER TABLE ${model.SchemaTableName} DROP COLUMN ${keyColName};`;
                 // CreateTable作成用
                 createColExpressions.push(`${keyColName} ${toColumnType(column)} ${toColumnAttibute(column)}`);
                 if (column.attribute === 'primary') {
@@ -309,7 +309,7 @@ td:nth-child(12) {
             for (const ref of model.References) {
                 expressions.push(`FOREIGN KEY (${ref.columns.map(col => col.target).join(', ')}) REFERENCES ${ref.table}(${ref.columns.map(col => col.ref).join(', ')})`);
             }
-            jsCripFuncs[createFuncName] = `CREATE TABLE ${model.TableName} (\n    ${expressions.join(',\n    ')}\n);`;
+            jsCripFuncs[createFuncName] = `CREATE TABLE ${model.SchemaTableName} (\n    ${expressions.join(',\n    ')}\n);`;
             html += `
             </table>
         </div>`;

package/dist/models/TableModel.d.ts

@@ -6,10 +6,11 @@ import { TOptionErrorMessage } from './Utils/MessageUtil';
 export declare class TableModel {
     protected readonly id: string;
     get Id(): string;
-    protected readonly dbName: string;
-    get DbName(): string;
+    protected readonly schemaName: string;
+    get SchemaName(): string;
     protected readonly tableName: string;
     get TableName(): string;
+    get SchemaTableName(): string;
     protected readonly tableDescription: string;
     get TableDescription(): string;
     protected readonly comment: string;

package/dist/models/TableModel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TableModel.d.ts","sourceRoot":"","sources":["../../src/models/TableModel.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"TableModel.d.ts","sourceRoot":"","sources":["../../src/models/TableModel.ts"],"names":[],"mappings":"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"}

package/dist/models/TableModel.js

@@ -23,13 +23,22 @@ const UpdateExpression_1 = __importDefault(require("./SqlUtils/UpdateExpression"
 const MessageUtil_1 = __importDefault(require("./Utils/MessageUtil"));
 class TableModel {
     get Id() { return this.id; }
-    get DbName() { return this.dbName; }
+    get SchemaName() { return this.schemaName; }
     get TableName() {
         if (this.tableName === "") {
             throw new Error("Please set the tableName for TableModel.");
         }
         return this.tableName;
     }
+    get SchemaTableName() {
+        if (this.tableName === "") {
+            throw new Error("Please set the tableName for TableModel.");
+        }
+        if (this.schemaName === "") {
+            return this.tableName;
+        }
+        return this.schemaName + "." + this.tableName;
+    }
     get TableDescription() { return this.tableDescription; }
     get Comment() { return this.comment; }
     get Columns() {
@@ -59,7 +68,7 @@ class TableModel {
         return this.tableAlias === undefined ? this.TableName : this.tableAlias;
     }
     get createSqlFromJoinWhere() {
-        let sql = ` FROM ${this.TableName} as "${this.TableAlias}"`;
+        let sql = ` FROM ${this.SchemaTableName} as "${this.TableAlias}"`;
         for (const join of this.joinConditions) {
             const joins = {
                 inner: ' INNER JOIN',
@@ -67,7 +76,7 @@ class TableModel {
                 full: ' FULL OUTER JOIN',
             };
             sql += joins[join.type];
-            sql += ` ${join.model.TableName} as "${join.model.TableAlias}" ON `;
+            sql += ` ${join.model.SchemaTableName} as "${join.model.TableAlias}" ON `;
             const query = WhereExpression_1.WhereExpression.createCondition(join.conditions, this, this.vars.length + 1);
             sql += query.expression;
             if (query.vars !== undefined) {
@@ -100,7 +109,7 @@ class TableModel {
     }
     constructor(client, tableAlias) {
         this.id = "";
-        this.dbName = "default";
+        this.schemaName = "";
         this.tableName = "";
         this.tableDescription = "";
         this.comment = "";
@@ -146,7 +155,7 @@ class TableModel {
             else {
                 query = WhereExpression_1.WhereExpression.createConditionPk(this, pkOrId);
             }
-            const sql = `SELECT ${selects.join(',')} FROM ${this.TableName} WHERE ${query.expression}`;
+            const sql = `SELECT ${selects.join(',')} FROM ${this.SchemaTableName} WHERE ${query.expression}`;
             let datas = yield this.executeQuery(sql, query.vars);
             return datas.rowCount == 0 ? null : datas.rows[0];
         });
@@ -317,7 +326,7 @@ class TableModel {
                     orderConditions.push(`WHEN ${columnInfo.expression} is null THEN ${i}`);
                     continue;
                 }
-                throw new Error(`${this.TableName}.${columnInfo.columnName} is a non-nullable column.`);
+                throw new Error(`${this.SchemaTableName}.${columnInfo.columnName} is a non-nullable column.`);
             }
             ValidateValueUtil_1.default.validateValue(columnInfo, value);
             switch (columnInfo.type) {
@@ -413,7 +422,7 @@ class TableModel {
             for (const [key, value] of Object.entries(options)) {
                 const column = this.getColumn(key);
                 if (isInsert === false && column.attribute === 'primary') {
-                    throw new Error(`${this.TableName}.${key} cannot be modified because it is a primary key.`);
+                    throw new Error(`${this.SchemaTableName}.${key} cannot be modified because it is a primary key.`);
                 }
                 if (value === null) {
                     if (column.attribute === 'nullable') {
@@ -516,7 +525,7 @@ class TableModel {
                 vars.push(value);
             }
             const params = vars.map((_, index) => `$${index + 1}`);
-            const sql = `INSERT INTO ${this.TableName} (${columns.join(",")}) VALUES (${params.join(",")});`;
+            const sql = `INSERT INTO ${this.SchemaTableName} (${columns.join(",")}) VALUES (${params.join(",")});`;
             yield this.executeQuery(sql, vars);
         });
     }
@@ -551,7 +560,7 @@ class TableModel {
             else {
                 whereQuery = WhereExpression_1.WhereExpression.createConditionPk(this, pkOrId);
             }
-            const sql = `DELETE FROM ${this.TableName} WHERE ${whereQuery.expression}`;
+            const sql = `DELETE FROM ${this.SchemaTableName} WHERE ${whereQuery.expression}`;
             const data = yield this.executeQuery(sql, whereQuery.vars);
             if (data.rowCount !== 1) {
                 this.throwUnprocessableException("301", this.errorMessages.find.replace('{pks}', ((_a = whereQuery.vars) !== null && _a !== void 0 ? _a : []).join(',')));
@@ -568,11 +577,11 @@ class TableModel {
                 this.vars.push(value);
                 updateExpressions.push(`${key} = $${this.vars.length}`);
             }
-            let sql = `UPDATE ${this.TableName} "${this.TableAlias}" SET ${updateExpressions.join(',')} `;
+            let sql = `UPDATE ${this.SchemaTableName} "${this.TableAlias}" SET ${updateExpressions.join(',')} `;
             if (this.joinConditions.length > 0) {
                 const tables = [];
                 for (const join of this.joinConditions) {
-                    tables.push(`${join.model.TableName} as "${join.model.TableAlias}"`);
+                    tables.push(`${join.model.SchemaTableName} as "${join.model.TableAlias}"`);
                     const query = WhereExpression_1.WhereExpression.createCondition(join.conditions, this, this.vars.length + 1);
                     this.whereExpressions.push(query.expression);
                     if (query.vars !== undefined) {
@@ -590,11 +599,11 @@ class TableModel {
     }
     executeDelete() {
         return __awaiter(this, void 0, void 0, function* () {
-            let sql = `DELETE FROM ${this.TableName} "${this.TableAlias}" `;
+            let sql = `DELETE FROM ${this.SchemaTableName} "${this.TableAlias}" `;
             if (this.joinConditions.length > 0) {
                 const tables = [];
                 for (const join of this.joinConditions) {
-                    tables.push(`${join.model.TableName} as "${join.model.TableAlias}"`);
+                    tables.push(`${join.model.SchemaTableName} as "${join.model.TableAlias}"`);
                     const query = WhereExpression_1.WhereExpression.createCondition(join.conditions, this, this.vars.length + 1);
                     this.whereExpressions.push(query.expression);
                     if (query.vars !== undefined) {

package/package.json

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