prostgles-server 2.0.32 → 2.0.33
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/FileManager.d.ts.map +1 -1
- package/dist/FileManager.js +12 -3
- package/dist/FileManager.js.map +1 -1
- package/dist/TableConfig.d.ts +3 -1
- package/dist/TableConfig.d.ts.map +1 -1
- package/dist/TableConfig.js +44 -29
- package/dist/TableConfig.js.map +1 -1
- package/lib/FileManager.ts +14 -3
- package/lib/TableConfig.ts +55 -34
- package/package.json +1 -1
- package/tests/server/media/{0210704b-d90a-4740-b2be-b18789db685d.txt → 1695f83b-1cee-4521-80f6-a1c7493c4a9a.txt} +0 -0
- package/tests/server/media/{97cb1b78-ae80-4e15-8626-b6168d58f9a6.txt → 299a1da2-bf86-4762-8702-4d669a81aa50.txt} +0 -0
- package/tests/server/media/{bf73fbb5-ca65-4aee-8c94-093fbccdda0c.txt → be751807-88e9-433a-bddb-db9917f46807.txt} +0 -0
- package/tests/server/media/{fdc0ec2c-f2cd-4ba4-9520-1b3807d56e29.txt → dfbe8a90-9146-468c-a0cc-c3e7d49bc25d.txt} +0 -0
- package/tests/server/package-lock.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileManager.d.ts","sourceRoot":"","sources":["../lib/FileManager.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,EAAE,EAAE,MAAM,SAAS,CAAC;AAO7B,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAMvD,eAAO,MAAM,eAAe,SAAgB,MAAM,aAAW,OAAO,CAAC,MAAM,CAE1E,CAAA;AAED,oBAAY,YAAY,GAAG;IACzB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,WAAW,CAAC;IACV;;OAEG;IACD;QAAE,MAAM,EAAE;YAAE,KAAK,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,GAC7C;QAAE,OAAO,EACL;YAAE,KAAK,EAAE,MAAM,CAAA;SAAE,GACjB;YAAE,MAAM,EAAE,MAAM,CAAA;SAAE,CAAA;KACrB,CAAA;CACN,CAAA;AAED,oBAAY,QAAQ,GAAG;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;CAEzB,CAAA;AAED,oBAAY,WAAW,GAAG;IACxB;;;OAGG;IACH,eAAe,EAAE,MAAM,CAAC;CACzB,CAAA;AAED,oBAAY,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AACF,oBAAY,YAAY,GAAG;IACzB;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,WAAW;IAE9B,QAAQ,EAAE,EAAE,CAAC;IAEb,MAAM,EAAE,QAAQ,GAAG,WAAW,CAAC;IAC/B,YAAY,EAAE,YAAY,CAAC;IAE3B,SAAS,EAAE,SAAS,CAAC;IACrB,IAAI,GAAG,IAAI,SAAS,CAA8B;IAClD,IAAI,EAAE,IAAI,EAAE,CAA6B;IAEzC,SAAS,EAAE,MAAM,CAAC;IAElB,OAAO,CAAC,SAAS,CAAS;gBAEd,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,EAAE,YAAY,CAAC,EAAE,YAAY;IAahE,OAAO,CACX,IAAI,EAAE,MAAM,GAAG,MAAM,EACrB,QAAQ,EAAE,MAAM,EAChB,iBAAiB,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,EAC5C,qBAAqB,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,EAChD,YAAY,UAAO,GAClB,OAAO,CAAC;QACT,IAAI,EAAE,MAAM,CAAC;QACb,GAAG,EAAE,MAAM,GAAG,iBAAiB,CAAC;QAChC,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;YAgFY,MAAM;IAiEpB,aAAa,WAAkB;QAC7B,IAAI,EAAE,UAAU,CAAC;QACjB,iBAAiB,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAC7C,qBAAqB,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACjD,YAAY,CAAC,EAAE,YAAY,CAAC;KAC7B,KAAG,OAAO,CAAC,YAAY,CAAC,CA6CxB;YAEa,UAAU;IASxB,OAAO,CAAC,kBAAkB,CAAqE;IAE/F,IAAI,QAAe,SAAS,
|
|
1
|
+
{"version":3,"file":"FileManager.d.ts","sourceRoot":"","sources":["../lib/FileManager.ts"],"names":[],"mappings":"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"}
|
package/dist/FileManager.js
CHANGED
|
@@ -166,11 +166,20 @@ class FileManager {
|
|
|
166
166
|
const mediaTable = this.dbo[tableName];
|
|
167
167
|
try {
|
|
168
168
|
const { name } = req.params;
|
|
169
|
-
if (typeof name !== "string")
|
|
169
|
+
if (typeof name !== "string" || !name)
|
|
170
170
|
throw "Invalid media name";
|
|
171
171
|
const media = yield mediaTable.findOne({ name }, { select: { id: 1, name: 1, signed_url: 1, signed_url_expires: 1, content_type: 1 } }, { httpReq: req });
|
|
172
|
-
if (!media)
|
|
172
|
+
if (!media) {
|
|
173
|
+
/**
|
|
174
|
+
* Redirect to login !??
|
|
175
|
+
*/
|
|
176
|
+
// const mediaExists = await mediaTable.count({ name });
|
|
177
|
+
// if(mediaExists && this.prostgles.authHandler){
|
|
178
|
+
// } else {
|
|
179
|
+
// throw "Invalid media";
|
|
180
|
+
// }
|
|
173
181
|
throw "Invalid media";
|
|
182
|
+
}
|
|
174
183
|
if (this.s3Client) {
|
|
175
184
|
let url = media.signed_url;
|
|
176
185
|
const expires = +(media.signed_url_expires || 0);
|
|
@@ -189,7 +198,7 @@ class FileManager {
|
|
|
189
198
|
}
|
|
190
199
|
catch (e) {
|
|
191
200
|
console.log(e);
|
|
192
|
-
res.status(404).json({ err: "Invalid media" });
|
|
201
|
+
res.status(404).json({ err: "Invalid/missing media" });
|
|
193
202
|
}
|
|
194
203
|
}));
|
|
195
204
|
}
|
package/dist/FileManager.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileManager.js","sourceRoot":"","sources":["../lib/FileManager.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"FileManager.js","sourceRoot":"","sources":["../lib/FileManager.ts"],"names":[],"mappings":"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"}
|
package/dist/TableConfig.d.ts
CHANGED
|
@@ -5,6 +5,7 @@ declare type ColExtraInfo = {
|
|
|
5
5
|
hint?: string;
|
|
6
6
|
};
|
|
7
7
|
declare type BaseTableDefinition = {
|
|
8
|
+
dropIfExistsCascade?: boolean;
|
|
8
9
|
dropIfExists?: boolean;
|
|
9
10
|
};
|
|
10
11
|
declare type LookupTableDefinition<LANG_IDS> = {
|
|
@@ -42,9 +43,10 @@ declare type ReferencedColumn = {
|
|
|
42
43
|
nullable?: boolean;
|
|
43
44
|
};
|
|
44
45
|
};
|
|
46
|
+
declare type ColumnConfig = BaseColumn & (SQLDefColumn | ReferencedColumn);
|
|
45
47
|
declare type TableDefinition = {
|
|
46
48
|
columns: {
|
|
47
|
-
[column_name: string]:
|
|
49
|
+
[column_name: string]: ColumnConfig;
|
|
48
50
|
};
|
|
49
51
|
};
|
|
50
52
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TableConfig.d.ts","sourceRoot":"","sources":["../lib/TableConfig.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGvD,aAAK,YAAY,GAAG;IAChB,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACtB,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,aAAK,mBAAmB,GAAG;IACvB,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAA;AAED,aAAK,qBAAqB,CAAC,QAAQ,IAAI;IACnC,aAAa,EAAE;QACX,MAAM,EAAE;YACJ,CAAC,QAAQ,EAAE,MAAM,GAAG,EAAE,GAAG;iBACpB,OAAO,IAAI,MAAM,QAAQ,GAAG,MAAM;aACtC,CAAA;SACJ,CAAA;KACJ,CAAA;CACJ,CAAA;AAED,aAAK,UAAU,GAAG;IACd;;OAEG;IACH,IAAI,CAAC,EAAE,YAAY,CAAC;CAEvB,CAAA;AAED,aAAK,YAAY,GAAG;IAEhB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAA;AAED,aAAK,gBAAgB,GAAG;IAEpB;;OAEG;IACC,UAAU,CAAC,EAAE;QAGb,SAAS,EAAE,MAAM,CAAC;QAElB;;WAEG;QACH,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACtB,CAAA;CACJ,CAAA;AAED,aAAK,eAAe,GAAG;IACnB,OAAO,EAAE;QACL,CAAC,WAAW,EAAE,MAAM,GAAG,
|
|
1
|
+
{"version":3,"file":"TableConfig.d.ts","sourceRoot":"","sources":["../lib/TableConfig.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGvD,aAAK,YAAY,GAAG;IAChB,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACtB,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,aAAK,mBAAmB,GAAG;IACvB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAA;AAED,aAAK,qBAAqB,CAAC,QAAQ,IAAI;IACnC,aAAa,EAAE;QACX,MAAM,EAAE;YACJ,CAAC,QAAQ,EAAE,MAAM,GAAG,EAAE,GAAG;iBACpB,OAAO,IAAI,MAAM,QAAQ,GAAG,MAAM;aACtC,CAAA;SACJ,CAAA;KACJ,CAAA;CACJ,CAAA;AAED,aAAK,UAAU,GAAG;IACd;;OAEG;IACH,IAAI,CAAC,EAAE,YAAY,CAAC;CAEvB,CAAA;AAED,aAAK,YAAY,GAAG;IAEhB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAA;AAED,aAAK,gBAAgB,GAAG;IAEpB;;OAEG;IACC,UAAU,CAAC,EAAE;QAGb,SAAS,EAAE,MAAM,CAAC;QAElB;;WAEG;QACH,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACtB,CAAA;CACJ,CAAA;AAED,aAAK,YAAY,GAAG,UAAU,GAAG,CAAC,YAAY,GAAG,gBAAgB,CAAC,CAAA;AAElE,aAAK,eAAe,GAAG;IACnB,OAAO,EAAE;QACL,CAAC,WAAW,EAAE,MAAM,GAAG,YAAY,CAAA;KACtC,CAAA;CACJ,CAAA;AAED;;GAEG;AACH,oBAAY,WAAW,CAAC,QAAQ,GAAG;IAAE,EAAE,EAAE,CAAC,CAAC;IAAC,EAAE,EAAE,CAAC,CAAA;CAAE,IAAI;IACnD,CAAC,UAAU,EAAE,MAAM,GAAG,mBAAmB,GAAG,CAAC,eAAe,GAAG,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC;CACnG,CAAA;AAED;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,iBAAiB;IAElC,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,IAAI,GAAG,IAAI,SAAS,CAA8B;IAClD,IAAI,EAAE,IAAI,EAAE,CAA6B;IACzC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,SAAS,CAAA;gBAER,SAAS,EAAE,SAAS;IAKhC,UAAU,WAAY;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAC,KAAG,YAAY,GAAG,SAAS,CAE5E;IAED,WAAW,WAAY;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,GAAG,CAAA;KAAE,KAAG,IAAI,CAQtE;IAEK,IAAI;CA6Fb"}
|
package/dist/TableConfig.js
CHANGED
|
@@ -45,12 +45,15 @@ class TableConfigurator {
|
|
|
45
45
|
Object.keys(this.config).map(tableName => {
|
|
46
46
|
var _a, _b, _c;
|
|
47
47
|
const tableConf = this.config[tableName];
|
|
48
|
+
const { dropIfExists = false, dropIfExistsCascade = false } = tableConf;
|
|
49
|
+
if (dropIfExistsCascade) {
|
|
50
|
+
queries.push(`DROP TABLE IF EXISTS ${tableName} CASCADE;`);
|
|
51
|
+
}
|
|
52
|
+
else if (dropIfExists) {
|
|
53
|
+
queries.push(`DROP TABLE IF EXISTS ${tableName} ;`);
|
|
54
|
+
}
|
|
48
55
|
if ("isLookupTable" in tableConf && Object.keys((_a = tableConf.isLookupTable) === null || _a === void 0 ? void 0 : _a.values).length) {
|
|
49
56
|
const rows = Object.keys((_b = tableConf.isLookupTable) === null || _b === void 0 ? void 0 : _b.values).map(id => { var _a; return (Object.assign({ id }, ((_a = tableConf.isLookupTable) === null || _a === void 0 ? void 0 : _a.values[id]))); });
|
|
50
|
-
const { dropIfExists = false } = tableConf;
|
|
51
|
-
if (dropIfExists) {
|
|
52
|
-
queries.push(`DROP TABLE IF EXISTS ${tableName} CASCADE;`);
|
|
53
|
-
}
|
|
54
57
|
if (dropIfExists || !((_c = this.dbo) === null || _c === void 0 ? void 0 : _c[tableName])) {
|
|
55
58
|
const keys = Object.keys(rows[0]).filter(k => k !== "id");
|
|
56
59
|
queries.push(`CREATE TABLE IF NOT EXISTS ${tableName} (
|
|
@@ -73,32 +76,44 @@ class TableConfigurator {
|
|
|
73
76
|
yield Promise.all(Object.keys(this.config).map((tableName) => __awaiter(this, void 0, void 0, function* () {
|
|
74
77
|
const tableConf = this.config[tableName];
|
|
75
78
|
if ("columns" in tableConf) {
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
}
|
|
79
|
+
const getColDef = (name, colConf) => {
|
|
80
|
+
if ("references" in colConf && colConf.references) {
|
|
81
|
+
const { nullable, tableName: lookupTable, columnName: lookupCol = "id", defaultValue } = colConf.references;
|
|
82
|
+
return ` ${prostgles_types_1.asName(name)} TEXT ${!nullable ? " NOT NULL " : ""} ${defaultValue ? ` DEFAULT ${PubSubManager_1.asValue(defaultValue)} ` : ""} REFERENCES ${lookupTable} (${lookupCol}) `;
|
|
83
|
+
}
|
|
84
|
+
else if ("sqlDefinition" in colConf && colConf.sqlDefinition) {
|
|
85
|
+
return ` ${prostgles_types_1.asName(name)} ${colConf.sqlDefinition} `;
|
|
86
|
+
}
|
|
87
|
+
};
|
|
88
|
+
const colDefs = [];
|
|
89
|
+
Object.keys(tableConf.columns).map(colName => {
|
|
90
|
+
const colConf = tableConf.columns[colName];
|
|
91
|
+
if (!this.dbo[tableName]) {
|
|
92
|
+
colDefs.push(getColDef(colName, colConf));
|
|
93
|
+
}
|
|
94
|
+
else if (!this.dbo[tableName].columns.find(c => colName === c.name)) {
|
|
95
|
+
if ("references" in colConf && colConf.references) {
|
|
96
|
+
const { tableName: lookupTable, } = colConf.references;
|
|
97
|
+
queries.push(`
|
|
98
|
+
ALTER TABLE ${prostgles_types_1.asName(tableName)}
|
|
99
|
+
ADD COLUMN ${getColDef(colName, colConf)};
|
|
100
|
+
`);
|
|
101
|
+
console.log(`TableConfigurator: ${tableName}(${colName})` + " referenced lookup table " + lookupTable);
|
|
100
102
|
}
|
|
101
|
-
|
|
103
|
+
else if ("sqlDefinition" in colConf && colConf.sqlDefinition) {
|
|
104
|
+
queries.push(`
|
|
105
|
+
ALTER TABLE ${prostgles_types_1.asName(tableName)}
|
|
106
|
+
ADD COLUMN ${getColDef(colName, colConf)};
|
|
107
|
+
`);
|
|
108
|
+
console.log(`TableConfigurator: created/added column ${tableName}(${colName}) ` + colConf.sqlDefinition);
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
});
|
|
112
|
+
if (colDefs.length) {
|
|
113
|
+
queries.push(`CREATE TABLE ${prostgles_types_1.asName(tableName)} (
|
|
114
|
+
${colDefs.join(", \n")}
|
|
115
|
+
);`);
|
|
116
|
+
console.error("TableConfigurator: Created table: \n" + queries[0]);
|
|
102
117
|
}
|
|
103
118
|
}
|
|
104
119
|
})));
|
package/dist/TableConfig.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TableConfig.js","sourceRoot":"","sources":["../lib/TableConfig.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,qDAAoD;AAIpD,mDAA0C;
|
|
1
|
+
{"version":3,"file":"TableConfig.js","sourceRoot":"","sources":["../lib/TableConfig.ts"],"names":[],"mappings":"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"}
|
package/lib/FileManager.ts
CHANGED
|
@@ -434,11 +434,22 @@ export default class FileManager {
|
|
|
434
434
|
try {
|
|
435
435
|
|
|
436
436
|
const { name } = req.params;
|
|
437
|
-
if(typeof name !== "string") throw "Invalid media name";
|
|
437
|
+
if(typeof name !== "string" || !name) throw "Invalid media name";
|
|
438
438
|
|
|
439
439
|
const media = await mediaTable.findOne({ name }, { select: { id: 1, name: 1, signed_url: 1, signed_url_expires: 1, content_type: 1 } }, { httpReq: req });
|
|
440
440
|
|
|
441
|
-
if(!media)
|
|
441
|
+
if(!media) {
|
|
442
|
+
/**
|
|
443
|
+
* Redirect to login !??
|
|
444
|
+
*/
|
|
445
|
+
// const mediaExists = await mediaTable.count({ name });
|
|
446
|
+
// if(mediaExists && this.prostgles.authHandler){
|
|
447
|
+
|
|
448
|
+
// } else {
|
|
449
|
+
// throw "Invalid media";
|
|
450
|
+
// }
|
|
451
|
+
throw "Invalid media";
|
|
452
|
+
}
|
|
442
453
|
|
|
443
454
|
if(this.s3Client){
|
|
444
455
|
let url = media.signed_url;
|
|
@@ -461,7 +472,7 @@ export default class FileManager {
|
|
|
461
472
|
|
|
462
473
|
} catch(e){
|
|
463
474
|
console.log(e)
|
|
464
|
-
res.status(404).json({ err: "Invalid media" });
|
|
475
|
+
res.status(404).json({ err: "Invalid/missing media" });
|
|
465
476
|
}
|
|
466
477
|
});
|
|
467
478
|
}
|
package/lib/TableConfig.ts
CHANGED
|
@@ -11,6 +11,7 @@ type ColExtraInfo = {
|
|
|
11
11
|
};
|
|
12
12
|
|
|
13
13
|
type BaseTableDefinition = {
|
|
14
|
+
dropIfExistsCascade?: boolean;
|
|
14
15
|
dropIfExists?: boolean;
|
|
15
16
|
}
|
|
16
17
|
|
|
@@ -59,9 +60,11 @@ type ReferencedColumn = {
|
|
|
59
60
|
}
|
|
60
61
|
}
|
|
61
62
|
|
|
63
|
+
type ColumnConfig = BaseColumn & (SQLDefColumn | ReferencedColumn)
|
|
64
|
+
|
|
62
65
|
type TableDefinition = {
|
|
63
66
|
columns: {
|
|
64
|
-
[column_name: string]:
|
|
67
|
+
[column_name: string]: ColumnConfig
|
|
65
68
|
}
|
|
66
69
|
}
|
|
67
70
|
|
|
@@ -108,12 +111,14 @@ export default class TableConfigurator {
|
|
|
108
111
|
/* Create lookup tables */
|
|
109
112
|
Object.keys(this.config).map(tableName => {
|
|
110
113
|
const tableConf = this.config[tableName];
|
|
114
|
+
const { dropIfExists = false, dropIfExistsCascade = false } = tableConf;
|
|
115
|
+
if(dropIfExistsCascade){
|
|
116
|
+
queries.push(`DROP TABLE IF EXISTS ${tableName} CASCADE;`);
|
|
117
|
+
} else if(dropIfExists){
|
|
118
|
+
queries.push(`DROP TABLE IF EXISTS ${tableName} ;`);
|
|
119
|
+
}
|
|
111
120
|
if("isLookupTable" in tableConf && Object.keys(tableConf.isLookupTable?.values).length){
|
|
112
121
|
const rows = Object.keys(tableConf.isLookupTable?.values).map(id => ({ id, ...(tableConf.isLookupTable?.values[id]) }));
|
|
113
|
-
const { dropIfExists = false } = tableConf;
|
|
114
|
-
if(dropIfExists){
|
|
115
|
-
queries.push(`DROP TABLE IF EXISTS ${tableName} CASCADE;`);
|
|
116
|
-
}
|
|
117
122
|
if(dropIfExists || !this.dbo?.[tableName]){
|
|
118
123
|
const keys = Object.keys(rows[0]).filter(k => k !== "id");
|
|
119
124
|
queries.push(`CREATE TABLE IF NOT EXISTS ${tableName} (
|
|
@@ -139,37 +144,53 @@ export default class TableConfigurator {
|
|
|
139
144
|
await Promise.all(Object.keys(this.config).map(async tableName => {
|
|
140
145
|
const tableConf = this.config[tableName];
|
|
141
146
|
if("columns" in tableConf){
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
147
|
+
const getColDef = (name: string, colConf: ColumnConfig): string => {
|
|
148
|
+
|
|
149
|
+
if("references" in colConf && colConf.references){
|
|
150
|
+
|
|
151
|
+
const { nullable, tableName: lookupTable, columnName: lookupCol = "id", defaultValue } = colConf.references;
|
|
152
|
+
return ` ${asName(name)} TEXT ${!nullable? " NOT NULL " : ""} ${defaultValue? ` DEFAULT ${asValue(defaultValue)} ` : "" } REFERENCES ${lookupTable} (${lookupCol}) `;
|
|
153
|
+
|
|
154
|
+
} else if("sqlDefinition" in colConf && colConf.sqlDefinition){
|
|
148
155
|
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
if("references" in colConf && colConf.references){
|
|
152
|
-
|
|
153
|
-
const { nullable, tableName: lookupTable, columnName: lookupCol = "id", defaultValue } = colConf.references;
|
|
154
|
-
queries.push(`
|
|
155
|
-
ALTER TABLE ${asName(tableName)}
|
|
156
|
-
ADD COLUMN ${asName(colName)} TEXT ${!nullable? " NOT NULL " : ""}
|
|
157
|
-
${defaultValue? ` DEFAULT ${asValue(defaultValue)} ` : "" }
|
|
158
|
-
REFERENCES ${lookupTable} (${lookupCol}) ;
|
|
159
|
-
`)
|
|
160
|
-
console.log(`TableConfigurator: ${tableName}(${colName})` + " referenced lookup table " + lookupTable);
|
|
161
|
-
|
|
162
|
-
} else if("sqlDefinition" in colConf && colConf.sqlDefinition){
|
|
163
|
-
|
|
164
|
-
queries.push(`
|
|
165
|
-
ALTER TABLE ${asName(tableName)}
|
|
166
|
-
ADD COLUMN ${asName(colName)} ${colConf.sqlDefinition};
|
|
167
|
-
`)
|
|
168
|
-
console.log(`TableConfigurator: created/added column ${tableName}(${colName}) ` + colConf.sqlDefinition)
|
|
169
|
-
}
|
|
170
|
-
}
|
|
171
|
-
});
|
|
156
|
+
return ` ${asName(name)} ${colConf.sqlDefinition} `;
|
|
157
|
+
}
|
|
172
158
|
}
|
|
159
|
+
|
|
160
|
+
const colDefs = [];
|
|
161
|
+
Object.keys(tableConf.columns).map(colName => {
|
|
162
|
+
const colConf = tableConf.columns[colName];
|
|
163
|
+
|
|
164
|
+
if(!this.dbo[tableName]){
|
|
165
|
+
colDefs.push(getColDef(colName, colConf))
|
|
166
|
+
} else if(!this.dbo[tableName].columns.find(c => colName === c.name)) {
|
|
167
|
+
|
|
168
|
+
if("references" in colConf && colConf.references){
|
|
169
|
+
|
|
170
|
+
const { tableName: lookupTable, } = colConf.references;
|
|
171
|
+
queries.push(`
|
|
172
|
+
ALTER TABLE ${asName(tableName)}
|
|
173
|
+
ADD COLUMN ${getColDef(colName, colConf)};
|
|
174
|
+
`)
|
|
175
|
+
console.log(`TableConfigurator: ${tableName}(${colName})` + " referenced lookup table " + lookupTable);
|
|
176
|
+
|
|
177
|
+
} else if("sqlDefinition" in colConf && colConf.sqlDefinition){
|
|
178
|
+
|
|
179
|
+
queries.push(`
|
|
180
|
+
ALTER TABLE ${asName(tableName)}
|
|
181
|
+
ADD COLUMN ${getColDef(colName, colConf)};
|
|
182
|
+
`)
|
|
183
|
+
console.log(`TableConfigurator: created/added column ${tableName}(${colName}) ` + colConf.sqlDefinition)
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
});
|
|
187
|
+
|
|
188
|
+
if(colDefs.length){
|
|
189
|
+
queries.push(`CREATE TABLE ${asName(tableName)} (
|
|
190
|
+
${colDefs.join(", \n")}
|
|
191
|
+
);`)
|
|
192
|
+
console.error("TableConfigurator: Created table: \n" + queries[0])
|
|
193
|
+
}
|
|
173
194
|
}
|
|
174
195
|
}));
|
|
175
196
|
|
package/package.json
CHANGED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|