pg-mvc-service 2.1.22 → 2.1.24
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/Service.d.ts.map +1 -1
- package/dist/Service.js +1 -3
- package/dist/documents/Swagger.js +1 -1
- package/dist/models/MigrateRollback.d.ts +1 -1
- package/dist/models/MigrateRollback.d.ts.map +1 -1
- package/dist/models/MigrateRollback.js +70 -41
- package/dist/models/MigrateTable.d.ts +2 -0
- package/dist/models/MigrateTable.d.ts.map +1 -1
- package/dist/models/MigrateTable.js +3 -1
- package/package.json +1 -1
package/dist/Service.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Service.d.ts","sourceRoot":"","sources":["../src/Service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Service.d.ts","sourceRoot":"","sources":["../src/Service.ts"],"names":[],"mappings":"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"}
|
package/dist/Service.js
CHANGED
|
@@ -123,9 +123,7 @@ class Service {
|
|
|
123
123
|
this.Res.cookie(key, value, Object.assign(Object.assign({}, config), { maxAge: (options === null || options === void 0 ? void 0 : options.maxAgeSec) !== undefined ? options.maxAgeSec * 1000 : undefined }));
|
|
124
124
|
}
|
|
125
125
|
else if (this.Module === 'hono') {
|
|
126
|
-
(0, cookie_1.setCookie)(this.C, key, value, Object.assign(Object.assign({}, config), {
|
|
127
|
-
// HonoのmaxAgeは秒単位なので変換
|
|
128
|
-
maxAge: options === null || options === void 0 ? void 0 : options.maxAgeSec,
|
|
126
|
+
(0, cookie_1.setCookie)(this.C, key, value, Object.assign(Object.assign({}, config), { maxAge: options === null || options === void 0 ? void 0 : options.maxAgeSec,
|
|
129
127
|
// HonoのsameSiteはPascalCase（Strict等）
|
|
130
128
|
sameSite: (config.sameSite.charAt(0).toUpperCase() + config.sameSite.slice(1)) }));
|
|
131
129
|
}
|
|
@@ -70,7 +70,7 @@ info:
|
|
|
70
70
|
description: API documentation for your service
|
|
71
71
|
servers:
|
|
72
72
|
- url: ${pathOrUrl !== null && pathOrUrl !== void 0 ? pathOrUrl : '/'}
|
|
73
|
-
description: ${name} API IF定義書
|
|
73
|
+
description: "${name} API IF定義書"
|
|
74
74
|
tags:\n`;
|
|
75
75
|
for (const tag of tags) {
|
|
76
76
|
swaggerInfo += ` - name: ${tag}\n`;
|
|
@@ -7,7 +7,7 @@ export declare const migrate: (migrates: Array<MigrateTable>, poolParam: {
|
|
|
7
7
|
port?: number;
|
|
8
8
|
isSsl?: boolean;
|
|
9
9
|
}) => Promise<void>;
|
|
10
|
-
export declare const rollback: (toNumber: number, poolParam: {
|
|
10
|
+
export declare const rollback: (toNumber: number, schemaName: string, poolParam: {
|
|
11
11
|
host: string;
|
|
12
12
|
user: string;
|
|
13
13
|
dbName: string;
|
|
@@ -1 +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,
|
|
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,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"}
|
|
@@ -13,6 +13,13 @@ exports.rollback = exports.migrate = void 0;
|
|
|
13
13
|
const pg_1 = require("pg");
|
|
14
14
|
const migrate = (migrates, poolParam) => __awaiter(void 0, void 0, void 0, function* () {
|
|
15
15
|
var _a;
|
|
16
|
+
const migratesBySchema = {};
|
|
17
|
+
for (const migrate of migrates) {
|
|
18
|
+
if (migrate.Schema in migratesBySchema === false) {
|
|
19
|
+
migratesBySchema[migrate.Schema] = [];
|
|
20
|
+
}
|
|
21
|
+
migratesBySchema[migrate.Schema].push(migrate);
|
|
22
|
+
}
|
|
16
23
|
const pool = new pg_1.Pool({
|
|
17
24
|
user: poolParam.user,
|
|
18
25
|
password: poolParam.password,
|
|
@@ -25,15 +32,18 @@ const migrate = (migrates, poolParam) => __awaiter(void 0, void 0, void 0, funct
|
|
|
25
32
|
});
|
|
26
33
|
// create migration table
|
|
27
34
|
try {
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
35
|
+
for (const keySchema of Object.keys(migratesBySchema)) {
|
|
36
|
+
if ((yield isExistMigrationTable(pool, keySchema)) == false) {
|
|
37
|
+
const tableName = keySchema === '' ? 'migrations' : `"${keySchema}".migrations`;
|
|
38
|
+
const sql = `
|
|
39
|
+
CREATE TABLE ${tableName} (
|
|
40
|
+
migration_number int,
|
|
41
|
+
script_file VARCHAR(50),
|
|
42
|
+
rollback_script VARCHAR(5000),
|
|
43
|
+
create_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP
|
|
44
|
+
);`;
|
|
45
|
+
yield pool.query(sql);
|
|
46
|
+
}
|
|
37
47
|
}
|
|
38
48
|
}
|
|
39
49
|
catch (ex) {
|
|
@@ -44,27 +54,30 @@ const migrate = (migrates, poolParam) => __awaiter(void 0, void 0, void 0, funct
|
|
|
44
54
|
const client = yield pool.connect();
|
|
45
55
|
try {
|
|
46
56
|
client.query('BEGIN');
|
|
47
|
-
const
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
const
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
57
|
+
for (const [keySchema, migrates] of Object.entries(migratesBySchema)) {
|
|
58
|
+
const datas = yield getMigrations(pool, keySchema);
|
|
59
|
+
let maxNumber = datas.maxNumber;
|
|
60
|
+
for (const migrate of migrates) {
|
|
61
|
+
const className = migrate.constructor.name;
|
|
62
|
+
if (datas.datas.filter(data => data.script_file === className).length > 0) {
|
|
63
|
+
console.log(`Already executed: ${className}`);
|
|
64
|
+
continue;
|
|
65
|
+
}
|
|
66
|
+
yield client.query(migrate.MigrateSql);
|
|
67
|
+
const grantSql = migrate.AddGrantSql;
|
|
68
|
+
if (grantSql !== null) {
|
|
69
|
+
yield client.query(grantSql);
|
|
70
|
+
}
|
|
71
|
+
const tableName = keySchema === '' ? 'migrations' : `"${keySchema}".migrations`;
|
|
72
|
+
const migrateInsertSql = `
|
|
73
|
+
INSERT INTO ${tableName}
|
|
74
|
+
(migration_number, script_file, rollback_script)
|
|
75
|
+
VALUES (${maxNumber + 1}, '${className}', '${migrate.RollbackSql}');
|
|
76
|
+
`;
|
|
77
|
+
maxNumber++;
|
|
78
|
+
yield client.query(migrateInsertSql);
|
|
79
|
+
console.log(`Execution completed: ${className}`);
|
|
54
80
|
}
|
|
55
|
-
yield client.query(migrate.MigrateSql);
|
|
56
|
-
const grantSql = migrate.AddGrantSql;
|
|
57
|
-
if (grantSql !== null) {
|
|
58
|
-
yield client.query(grantSql);
|
|
59
|
-
}
|
|
60
|
-
const migrateInsertSql = `
|
|
61
|
-
INSERT INTO migrations
|
|
62
|
-
(migration_number, script_file, rollback_script)
|
|
63
|
-
VALUES (${maxNumber + 1}, '${className}', '${migrate.RollbackSql}');
|
|
64
|
-
`;
|
|
65
|
-
maxNumber++;
|
|
66
|
-
yield client.query(migrateInsertSql);
|
|
67
|
-
console.log(`Execution completed: ${className}`);
|
|
68
81
|
}
|
|
69
82
|
yield client.query('COMMIT');
|
|
70
83
|
console.log('Migration completed');
|
|
@@ -79,7 +92,7 @@ const migrate = (migrates, poolParam) => __awaiter(void 0, void 0, void 0, funct
|
|
|
79
92
|
}
|
|
80
93
|
});
|
|
81
94
|
exports.migrate = migrate;
|
|
82
|
-
const rollback = (toNumber, poolParam) => __awaiter(void 0, void 0, void 0, function* () {
|
|
95
|
+
const rollback = (toNumber, schemaName, poolParam) => __awaiter(void 0, void 0, void 0, function* () {
|
|
83
96
|
var _a;
|
|
84
97
|
const pool = new pg_1.Pool({
|
|
85
98
|
user: poolParam.user,
|
|
@@ -93,7 +106,7 @@ const rollback = (toNumber, poolParam) => __awaiter(void 0, void 0, void 0, func
|
|
|
93
106
|
});
|
|
94
107
|
try {
|
|
95
108
|
// If the migration table does not exist, there is no target for rollback, so do not perform it
|
|
96
|
-
if ((yield isExistMigrationTable(pool)) == false) {
|
|
109
|
+
if ((yield isExistMigrationTable(pool, schemaName)) == false) {
|
|
97
110
|
return;
|
|
98
111
|
}
|
|
99
112
|
}
|
|
@@ -105,13 +118,14 @@ const rollback = (toNumber, poolParam) => __awaiter(void 0, void 0, void 0, func
|
|
|
105
118
|
const client = yield pool.connect();
|
|
106
119
|
try {
|
|
107
120
|
yield client.query('BEGIN');
|
|
108
|
-
const datas = yield getMigrations(pool);
|
|
121
|
+
const datas = yield getMigrations(pool, schemaName);
|
|
109
122
|
for (const data of datas.datas) {
|
|
110
123
|
if (data.migration_number < toNumber) {
|
|
111
124
|
break;
|
|
112
125
|
}
|
|
113
126
|
yield client.query(data.rollback_script);
|
|
114
|
-
|
|
127
|
+
const tableName = schemaName === '' ? 'migrations' : `"${schemaName}".migrations`;
|
|
128
|
+
yield client.query(`DELETE FROM ${tableName} WHERE migration_number = ${data.migration_number}`);
|
|
115
129
|
console.log(`Execution completed: ${data.script_file}`);
|
|
116
130
|
}
|
|
117
131
|
yield client.query('COMMIT');
|
|
@@ -127,20 +141,35 @@ const rollback = (toNumber, poolParam) => __awaiter(void 0, void 0, void 0, func
|
|
|
127
141
|
}
|
|
128
142
|
});
|
|
129
143
|
exports.rollback = rollback;
|
|
130
|
-
const isExistMigrationTable = (pool) => __awaiter(void 0, void 0, void 0, function* () {
|
|
131
|
-
const
|
|
144
|
+
const isExistMigrationTable = (pool, schemaName) => __awaiter(void 0, void 0, void 0, function* () {
|
|
145
|
+
const values = ['migrations'];
|
|
146
|
+
let sql = `
|
|
132
147
|
SELECT EXISTS (
|
|
133
148
|
SELECT FROM information_schema.tables
|
|
134
|
-
WHERE table_name =
|
|
135
|
-
);
|
|
149
|
+
WHERE table_name = $1
|
|
136
150
|
`;
|
|
137
|
-
|
|
151
|
+
if (schemaName !== "") {
|
|
152
|
+
sql += ` AND table_schema = $2`;
|
|
153
|
+
values.push(schemaName);
|
|
154
|
+
}
|
|
155
|
+
sql += `);`;
|
|
156
|
+
const res = yield pool.query(sql, values);
|
|
138
157
|
return res.rows[0].exists;
|
|
139
158
|
});
|
|
140
|
-
const getMigrations = (pool) => __awaiter(void 0, void 0, void 0, function* () {
|
|
141
|
-
|
|
159
|
+
const getMigrations = (pool, schemaName) => __awaiter(void 0, void 0, void 0, function* () {
|
|
160
|
+
var _a;
|
|
161
|
+
const tableName = schemaName === '' ? 'migrations' : `"${schemaName}".migrations`;
|
|
162
|
+
const datas = yield pool.query(`
|
|
163
|
+
SELECT
|
|
164
|
+
*
|
|
165
|
+
FROM
|
|
166
|
+
${tableName}
|
|
167
|
+
ORDER BY
|
|
168
|
+
migration_number DESC;
|
|
169
|
+
`);
|
|
142
170
|
return {
|
|
143
|
-
|
|
171
|
+
// すでに降順ソートされているので、最初の1件が最大値
|
|
172
|
+
maxNumber: ((_a = datas.rows[0]) === null || _a === void 0 ? void 0 : _a.migration_number) || 0,
|
|
144
173
|
datas: datas.rows
|
|
145
174
|
};
|
|
146
175
|
});
|
|
@@ -3,6 +3,8 @@ export declare class MigrateTable {
|
|
|
3
3
|
protected readonly rollbackSql: string;
|
|
4
4
|
protected readonly addGrantTables: Array<string>;
|
|
5
5
|
protected readonly user: string;
|
|
6
|
+
protected readonly schema: string;
|
|
7
|
+
get Schema(): string;
|
|
6
8
|
get MigrateSql(): string;
|
|
7
9
|
get RollbackSql(): string;
|
|
8
10
|
get AddGrantSql(): string | null;
|
|
@@ -1 +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;
|
|
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;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"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.MigrateTable = void 0;
|
|
4
4
|
class MigrateTable {
|
|
5
|
+
get Schema() { return this.schema; }
|
|
5
6
|
get MigrateSql() { return this.trimSpaceLineSql(this.migrateSql); }
|
|
6
7
|
get RollbackSql() { return this.trimSpaceLineSql(this.rollbackSql); }
|
|
7
8
|
get AddGrantSql() {
|
|
@@ -15,7 +16,7 @@ class MigrateTable {
|
|
|
15
16
|
}
|
|
16
17
|
let sql = "";
|
|
17
18
|
for (const table of tables) {
|
|
18
|
-
sql += `GRANT SELECT, INSERT, UPDATE, DELETE ON TABLE
|
|
19
|
+
sql += `GRANT SELECT, INSERT, UPDATE, DELETE ON TABLE ${this.schema}.${table} TO ${this.user};`;
|
|
19
20
|
}
|
|
20
21
|
return sql;
|
|
21
22
|
}
|
|
@@ -24,6 +25,7 @@ class MigrateTable {
|
|
|
24
25
|
this.rollbackSql = '';
|
|
25
26
|
this.addGrantTables = [];
|
|
26
27
|
this.user = '';
|
|
28
|
+
this.schema = 'public';
|
|
27
29
|
if (user !== undefined) {
|
|
28
30
|
this.user = user;
|
|
29
31
|
}
|