pg-mvc-service 2.1.21 → 2.1.22
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/models/SqlUtils/UpdateExpression.js +1 -1
- package/dist/models/SqlUtils/WhereExpression.js +1 -1
- package/dist/models/TableDoc.js +9 -9
- package/dist/models/TableModel.d.ts +3 -2
- package/dist/models/TableModel.d.ts.map +1 -1
- package/dist/models/TableModel.js +22 -13
- package/package.json +1 -1
|
@@ -16,7 +16,7 @@ class UpdateExpression {
|
|
|
16
16
|
expressions.push(`${key} = $${vars.length}`);
|
|
17
17
|
}
|
|
18
18
|
return {
|
|
19
|
-
expression: `UPDATE ${model.
|
|
19
|
+
expression: `UPDATE ${model.SchemaTableName} SET ${expressions.join(',')}`,
|
|
20
20
|
vars: vars
|
|
21
21
|
};
|
|
22
22
|
}
|
|
@@ -14,7 +14,7 @@ class WhereExpression {
|
|
|
14
14
|
continue;
|
|
15
15
|
}
|
|
16
16
|
if (pk[keyColumn] === undefined || pk[keyColumn] === null) {
|
|
17
|
-
throw new Error(`No value is set for the primary key "${model.
|
|
17
|
+
throw new Error(`No value is set for the primary key "${model.SchemaTableName}".${keyColumn}.`);
|
|
18
18
|
}
|
|
19
19
|
ValidateValueUtil_1.default.validateValue(column, pk[keyColumn]);
|
|
20
20
|
newVars.push(pk[keyColumn]);
|
package/dist/models/TableDoc.js
CHANGED
|
@@ -213,10 +213,10 @@ td:nth-child(12) {
|
|
|
213
213
|
`;
|
|
214
214
|
const dbObj = {};
|
|
215
215
|
for (const model of models) {
|
|
216
|
-
if (model.
|
|
217
|
-
dbObj[model.
|
|
216
|
+
if (model.SchemaName in dbObj === false) {
|
|
217
|
+
dbObj[model.SchemaName] = [];
|
|
218
218
|
}
|
|
219
|
-
dbObj[model.
|
|
219
|
+
dbObj[model.SchemaName].push(model);
|
|
220
220
|
}
|
|
221
221
|
const jsCripFuncs = {};
|
|
222
222
|
for (const [keyDbName, models] of Object.entries(dbObj)) {
|
|
@@ -224,7 +224,7 @@ td:nth-child(12) {
|
|
|
224
224
|
<div class="db-wrapper">
|
|
225
225
|
<h2>${keyDbName} Database</h2>`;
|
|
226
226
|
for (const model of models) {
|
|
227
|
-
const createFuncName = `clipboard_createTable_${model.
|
|
227
|
+
const createFuncName = `clipboard_createTable_${model.SchemaName}_${model.TableName}`;
|
|
228
228
|
html += `
|
|
229
229
|
<div class="table-wrapper">
|
|
230
230
|
<div class="table-title-wrapper">
|
|
@@ -253,8 +253,8 @@ td:nth-child(12) {
|
|
|
253
253
|
let index = 0;
|
|
254
254
|
for (const [keyColName, column] of Object.entries(model.Columns)) {
|
|
255
255
|
index++;
|
|
256
|
-
const addFuncName = `clipboard_addColumn_${model.
|
|
257
|
-
const dropFuncName = `clipboard_dropColumn_${model.
|
|
256
|
+
const addFuncName = `clipboard_addColumn_${model.SchemaName}_${model.TableName}_${keyColName}`;
|
|
257
|
+
const dropFuncName = `clipboard_dropColumn_${model.SchemaName}_${model.TableName}_${keyColName}`;
|
|
258
258
|
// 外部キー用
|
|
259
259
|
let references = [];
|
|
260
260
|
for (const ref of model.GetReferences(keyColName)) {
|
|
@@ -293,8 +293,8 @@ td:nth-child(12) {
|
|
|
293
293
|
`}
|
|
294
294
|
</td>
|
|
295
295
|
</tr>`;
|
|
296
|
-
jsCripFuncs[addFuncName] = `ALTER TABLE ${model.
|
|
297
|
-
jsCripFuncs[dropFuncName] = `ALTER TABLE ${model.
|
|
296
|
+
jsCripFuncs[addFuncName] = `ALTER TABLE ${model.SchemaTableName} ADD COLUMN ${keyColName} ${toColumnType(column)} ${toColumnAttibute(column)};`;
|
|
297
|
+
jsCripFuncs[dropFuncName] = `ALTER TABLE ${model.SchemaTableName} DROP COLUMN ${keyColName};`;
|
|
298
298
|
// CreateTable作成用
|
|
299
299
|
createColExpressions.push(`${keyColName} ${toColumnType(column)} ${toColumnAttibute(column)}`);
|
|
300
300
|
if (column.attribute === 'primary') {
|
|
@@ -309,7 +309,7 @@ td:nth-child(12) {
|
|
|
309
309
|
for (const ref of model.References) {
|
|
310
310
|
expressions.push(`FOREIGN KEY (${ref.columns.map(col => col.target).join(', ')}) REFERENCES ${ref.table}(${ref.columns.map(col => col.ref).join(', ')})`);
|
|
311
311
|
}
|
|
312
|
-
jsCripFuncs[createFuncName] = `CREATE TABLE ${model.
|
|
312
|
+
jsCripFuncs[createFuncName] = `CREATE TABLE ${model.SchemaTableName} (\n ${expressions.join(',\n ')}\n);`;
|
|
313
313
|
html += `
|
|
314
314
|
</table>
|
|
315
315
|
</div>`;
|
|
@@ -6,10 +6,11 @@ import { TOptionErrorMessage } from './Utils/MessageUtil';
|
|
|
6
6
|
export declare class TableModel {
|
|
7
7
|
protected readonly id: string;
|
|
8
8
|
get Id(): string;
|
|
9
|
-
protected readonly
|
|
10
|
-
get
|
|
9
|
+
protected readonly schemaName: string;
|
|
10
|
+
get SchemaName(): string;
|
|
11
11
|
protected readonly tableName: string;
|
|
12
12
|
get TableName(): string;
|
|
13
|
+
get SchemaTableName(): string;
|
|
13
14
|
protected readonly tableDescription: string;
|
|
14
15
|
get TableDescription(): string;
|
|
15
16
|
protected readonly comment: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TableModel.d.ts","sourceRoot":"","sources":["../../src/models/TableModel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AACtC,OAAO,EAAE,kBAAkB,EAAE,OAAO,EAAoB,aAAa,EAAE,WAAW,EAAe,UAAU,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAIlM,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAE9C,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAElD,OAAoB,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAEvE,qBAAa,UAAU;IAEnB,SAAS,CAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAM;IACnC,IAAI,EAAE,IAAI,MAAM,CAAoB;IACpC,SAAS,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"TableModel.d.ts","sourceRoot":"","sources":["../../src/models/TableModel.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,13 +23,22 @@ const UpdateExpression_1 = __importDefault(require("./SqlUtils/UpdateExpression"
|
|
|
23
23
|
const MessageUtil_1 = __importDefault(require("./Utils/MessageUtil"));
|
|
24
24
|
class TableModel {
|
|
25
25
|
get Id() { return this.id; }
|
|
26
|
-
get
|
|
26
|
+
get SchemaName() { return this.schemaName; }
|
|
27
27
|
get TableName() {
|
|
28
28
|
if (this.tableName === "") {
|
|
29
29
|
throw new Error("Please set the tableName for TableModel.");
|
|
30
30
|
}
|
|
31
31
|
return this.tableName;
|
|
32
32
|
}
|
|
33
|
+
get SchemaTableName() {
|
|
34
|
+
if (this.tableName === "") {
|
|
35
|
+
throw new Error("Please set the tableName for TableModel.");
|
|
36
|
+
}
|
|
37
|
+
if (this.schemaName === "") {
|
|
38
|
+
return this.tableName;
|
|
39
|
+
}
|
|
40
|
+
return this.schemaName + "." + this.tableName;
|
|
41
|
+
}
|
|
33
42
|
get TableDescription() { return this.tableDescription; }
|
|
34
43
|
get Comment() { return this.comment; }
|
|
35
44
|
get Columns() {
|
|
@@ -59,7 +68,7 @@ class TableModel {
|
|
|
59
68
|
return this.tableAlias === undefined ? this.TableName : this.tableAlias;
|
|
60
69
|
}
|
|
61
70
|
get createSqlFromJoinWhere() {
|
|
62
|
-
let sql = ` FROM ${this.
|
|
71
|
+
let sql = ` FROM ${this.SchemaTableName} as "${this.TableAlias}"`;
|
|
63
72
|
for (const join of this.joinConditions) {
|
|
64
73
|
const joins = {
|
|
65
74
|
inner: ' INNER JOIN',
|
|
@@ -67,7 +76,7 @@ class TableModel {
|
|
|
67
76
|
full: ' FULL OUTER JOIN',
|
|
68
77
|
};
|
|
69
78
|
sql += joins[join.type];
|
|
70
|
-
sql += ` ${join.model.
|
|
79
|
+
sql += ` ${join.model.SchemaTableName} as "${join.model.TableAlias}" ON `;
|
|
71
80
|
const query = WhereExpression_1.WhereExpression.createCondition(join.conditions, this, this.vars.length + 1);
|
|
72
81
|
sql += query.expression;
|
|
73
82
|
if (query.vars !== undefined) {
|
|
@@ -100,7 +109,7 @@ class TableModel {
|
|
|
100
109
|
}
|
|
101
110
|
constructor(client, tableAlias) {
|
|
102
111
|
this.id = "";
|
|
103
|
-
this.
|
|
112
|
+
this.schemaName = "";
|
|
104
113
|
this.tableName = "";
|
|
105
114
|
this.tableDescription = "";
|
|
106
115
|
this.comment = "";
|
|
@@ -146,7 +155,7 @@ class TableModel {
|
|
|
146
155
|
else {
|
|
147
156
|
query = WhereExpression_1.WhereExpression.createConditionPk(this, pkOrId);
|
|
148
157
|
}
|
|
149
|
-
const sql = `SELECT ${selects.join(',')} FROM ${this.
|
|
158
|
+
const sql = `SELECT ${selects.join(',')} FROM ${this.SchemaTableName} WHERE ${query.expression}`;
|
|
150
159
|
let datas = yield this.executeQuery(sql, query.vars);
|
|
151
160
|
return datas.rowCount == 0 ? null : datas.rows[0];
|
|
152
161
|
});
|
|
@@ -317,7 +326,7 @@ class TableModel {
|
|
|
317
326
|
orderConditions.push(`WHEN ${columnInfo.expression} is null THEN ${i}`);
|
|
318
327
|
continue;
|
|
319
328
|
}
|
|
320
|
-
throw new Error(`${this.
|
|
329
|
+
throw new Error(`${this.SchemaTableName}.${columnInfo.columnName} is a non-nullable column.`);
|
|
321
330
|
}
|
|
322
331
|
ValidateValueUtil_1.default.validateValue(columnInfo, value);
|
|
323
332
|
switch (columnInfo.type) {
|
|
@@ -413,7 +422,7 @@ class TableModel {
|
|
|
413
422
|
for (const [key, value] of Object.entries(options)) {
|
|
414
423
|
const column = this.getColumn(key);
|
|
415
424
|
if (isInsert === false && column.attribute === 'primary') {
|
|
416
|
-
throw new Error(`${this.
|
|
425
|
+
throw new Error(`${this.SchemaTableName}.${key} cannot be modified because it is a primary key.`);
|
|
417
426
|
}
|
|
418
427
|
if (value === null) {
|
|
419
428
|
if (column.attribute === 'nullable') {
|
|
@@ -516,7 +525,7 @@ class TableModel {
|
|
|
516
525
|
vars.push(value);
|
|
517
526
|
}
|
|
518
527
|
const params = vars.map((_, index) => `$${index + 1}`);
|
|
519
|
-
const sql = `INSERT INTO ${this.
|
|
528
|
+
const sql = `INSERT INTO ${this.SchemaTableName} (${columns.join(",")}) VALUES (${params.join(",")});`;
|
|
520
529
|
yield this.executeQuery(sql, vars);
|
|
521
530
|
});
|
|
522
531
|
}
|
|
@@ -551,7 +560,7 @@ class TableModel {
|
|
|
551
560
|
else {
|
|
552
561
|
whereQuery = WhereExpression_1.WhereExpression.createConditionPk(this, pkOrId);
|
|
553
562
|
}
|
|
554
|
-
const sql = `DELETE FROM ${this.
|
|
563
|
+
const sql = `DELETE FROM ${this.SchemaTableName} WHERE ${whereQuery.expression}`;
|
|
555
564
|
const data = yield this.executeQuery(sql, whereQuery.vars);
|
|
556
565
|
if (data.rowCount !== 1) {
|
|
557
566
|
this.throwUnprocessableException("301", this.errorMessages.find.replace('{pks}', ((_a = whereQuery.vars) !== null && _a !== void 0 ? _a : []).join(',')));
|
|
@@ -568,11 +577,11 @@ class TableModel {
|
|
|
568
577
|
this.vars.push(value);
|
|
569
578
|
updateExpressions.push(`${key} = $${this.vars.length}`);
|
|
570
579
|
}
|
|
571
|
-
let sql = `UPDATE ${this.
|
|
580
|
+
let sql = `UPDATE ${this.SchemaTableName} "${this.TableAlias}" SET ${updateExpressions.join(',')} `;
|
|
572
581
|
if (this.joinConditions.length > 0) {
|
|
573
582
|
const tables = [];
|
|
574
583
|
for (const join of this.joinConditions) {
|
|
575
|
-
tables.push(`${join.model.
|
|
584
|
+
tables.push(`${join.model.SchemaTableName} as "${join.model.TableAlias}"`);
|
|
576
585
|
const query = WhereExpression_1.WhereExpression.createCondition(join.conditions, this, this.vars.length + 1);
|
|
577
586
|
this.whereExpressions.push(query.expression);
|
|
578
587
|
if (query.vars !== undefined) {
|
|
@@ -590,11 +599,11 @@ class TableModel {
|
|
|
590
599
|
}
|
|
591
600
|
executeDelete() {
|
|
592
601
|
return __awaiter(this, void 0, void 0, function* () {
|
|
593
|
-
let sql = `DELETE FROM ${this.
|
|
602
|
+
let sql = `DELETE FROM ${this.SchemaTableName} "${this.TableAlias}" `;
|
|
594
603
|
if (this.joinConditions.length > 0) {
|
|
595
604
|
const tables = [];
|
|
596
605
|
for (const join of this.joinConditions) {
|
|
597
|
-
tables.push(`${join.model.
|
|
606
|
+
tables.push(`${join.model.SchemaTableName} as "${join.model.TableAlias}"`);
|
|
598
607
|
const query = WhereExpression_1.WhereExpression.createCondition(join.conditions, this, this.vars.length + 1);
|
|
599
608
|
this.whereExpressions.push(query.expression);
|
|
600
609
|
if (query.vars !== undefined) {
|