prostgles-server 4.1.39 → 4.1.41
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/DboBuilder/getTablesForSchemaPostgresSQL.d.ts.map +1 -1
- package/dist/DboBuilder/getTablesForSchemaPostgresSQL.js +14 -14
- package/dist/DboBuilder/getTablesForSchemaPostgresSQL.js.map +1 -1
- package/lib/DboBuilder/getTablesForSchemaPostgresSQL.ts +14 -15
- package/package.json +1 -1
- package/tests/client/PID.txt +1 -1
- package/tests/server/index.ts +1 -1
- package/tests/server/package-lock.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getTablesForSchemaPostgresSQL.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/getTablesForSchemaPostgresSQL.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAqB,WAAW,EAAE,MAAM,eAAe,CAAC;AAC3E,OAAO,EAAc,oBAAoB,EAAE,MAAM,cAAc,CAAC;AA6FhE,eAAO,MAAM,eAAe,YAAY,oBAAoB,CAAC,QAAQ,CAAC;;;CAWrE,CAAA;AAGD,wBAAsB,6BAA6B,CACjD,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,oBAAoB,CAAC,QAAQ,CAAC,GACjE,OAAO,CAAC;IACT,MAAM,EAAE,WAAW,EAAE,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACnC,CAAC,
|
|
1
|
+
{"version":3,"file":"getTablesForSchemaPostgresSQL.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/getTablesForSchemaPostgresSQL.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAqB,WAAW,EAAE,MAAM,eAAe,CAAC;AAC3E,OAAO,EAAc,oBAAoB,EAAE,MAAM,cAAc,CAAC;AA6FhE,eAAO,MAAM,eAAe,YAAY,oBAAoB,CAAC,QAAQ,CAAC;;;CAWrE,CAAA;AAGD,wBAAsB,6BAA6B,CACjD,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,oBAAoB,CAAC,QAAQ,CAAC,GACjE,OAAO,CAAC;IACT,MAAM,EAAE,WAAW,EAAE,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACnC,CAAC,CA0RD"}
|
|
@@ -206,6 +206,7 @@ async function getTablesForSchemaPostgresSQL({ db, runSQL }, schema) {
|
|
|
206
206
|
ON c.table_name = cp.table_name AND c.column_name = cp.column_name
|
|
207
207
|
) ccc
|
|
208
208
|
WHERE table_schema ${sql}
|
|
209
|
+
ORDER BY table_oid, ordinal_position
|
|
209
210
|
`, { schemaNames });
|
|
210
211
|
return { columns };
|
|
211
212
|
});
|
|
@@ -285,13 +286,13 @@ async function getTablesForSchemaPostgresSQL({ db, runSQL }, schema) {
|
|
|
285
286
|
}
|
|
286
287
|
let result = getTablesAndViews.tablesAndViews.concat(getMaterialViewsReq.materialViews);
|
|
287
288
|
result = await Promise.all(result
|
|
288
|
-
.map(async (
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
const refs = getFkeys.fkeys.filter(fc => fc.oid ===
|
|
289
|
+
.map(async (table) => {
|
|
290
|
+
table.name = table.escaped_identifier;
|
|
291
|
+
table.privileges.select = table.columns.some(c => c.privileges.SELECT);
|
|
292
|
+
table.privileges.insert = table.columns.some(c => c.privileges.INSERT);
|
|
293
|
+
table.privileges.update = table.columns.some(c => c.privileges.UPDATE);
|
|
294
|
+
table.columns = table.columns.map(c => {
|
|
295
|
+
const refs = getFkeys.fkeys.filter(fc => fc.oid === table.oid && fc.cols.includes(c.name));
|
|
295
296
|
if (refs.length)
|
|
296
297
|
c.references = refs.map(_ref => {
|
|
297
298
|
const ref = { ..._ref };
|
|
@@ -303,9 +304,9 @@ async function getTablesForSchemaPostgresSQL({ db, runSQL }, schema) {
|
|
|
303
304
|
});
|
|
304
305
|
/** Get view reference cols (based on parent table) */
|
|
305
306
|
let viewFCols = [];
|
|
306
|
-
if (
|
|
307
|
+
if (table.is_view) {
|
|
307
308
|
try {
|
|
308
|
-
const view_definition =
|
|
309
|
+
const view_definition = table.view_definition?.endsWith(";") ? table.view_definition.slice(0, -1) : table.view_definition;
|
|
309
310
|
const { fields } = await runSQL(`SELECT * FROM \n ( ${view_definition} \n) t LIMIT 0`, {}, {}, undefined);
|
|
310
311
|
const ftables = result.filter(r => fields.some(f => f.tableID === r.oid));
|
|
311
312
|
ftables.forEach(ft => {
|
|
@@ -334,7 +335,7 @@ async function getTablesForSchemaPostgresSQL({ db, runSQL }, schema) {
|
|
|
334
335
|
console.error(err);
|
|
335
336
|
}
|
|
336
337
|
}
|
|
337
|
-
|
|
338
|
+
table.columns = table.columns.map(col => {
|
|
338
339
|
if (col.has_default) {
|
|
339
340
|
/** Hide pkey default value */
|
|
340
341
|
col.column_default = (col.udt_name !== "uuid" && !col.is_pkey && !col.column_default.startsWith("nextval(")) ? col.column_default : null;
|
|
@@ -344,10 +345,9 @@ async function getTablesForSchemaPostgresSQL({ db, runSQL }, schema) {
|
|
|
344
345
|
col.references = viewFCol.references;
|
|
345
346
|
}
|
|
346
347
|
return col;
|
|
347
|
-
});
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
return tbl;
|
|
348
|
+
});
|
|
349
|
+
table.isHyperTable = getHyperTablesReq.hyperTables?.includes(table.name);
|
|
350
|
+
return table;
|
|
351
351
|
}));
|
|
352
352
|
const res = {
|
|
353
353
|
result,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getTablesForSchemaPostgresSQL.js","sourceRoot":"","sources":["../../lib/DboBuilder/getTablesForSchemaPostgresSQL.ts"],"names":[],"mappings":";;;AAAA,qDAAoD;AACpD,oDAAyE;AAGzE,oCAAiC;AAEjC,MAAM,gBAAgB,GAAG,CAAC,EAAU,EAAE,MAAsC,EAAE,EAAE;IAC9E,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,IAAA,uBAAe,EAAC,MAAM,CAAC,CAAC;IAErD,MAAM,KAAK,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBA8DG,GAAG;;GAEnB,CAAC;IAEF;;;;;;;;;;;;;;;;MAgBE;IAEF,OAAO,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;AACxC,CAAC,CAAA;AAEM,MAAM,eAAe,GAAG,CAAC,SAAyC,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE;IACxF,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACxC,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACxD,IAAG,CAAC,WAAW,CAAC,MAAM,EAAC;QACrB,MAAM,kCAAkC,CAAC;KAC1C;IAED,OAAO;QACL,GAAG,EAAE,IAAI,WAAW,CAAA,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,0BAA0B;QAC3D,WAAW;KACZ,CAAA;AACH,CAAC,CAAA;AAXY,QAAA,eAAe,mBAW3B;AACD,uLAAuL;AAEhL,KAAK,UAAU,6BAA6B,CACjD,EAAE,EAAE,EAAE,MAAM,EAAc,EAAE,MAAsC;IAKlE,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,IAAA,uBAAe,EAAC,MAAM,CAAC,CAAC;IAErD,OAAO,EAAE,CAAC,EAAE,CAAC,KAAK,EAAC,CAAC,EAAC,EAAE;QAErB;;WAEG;QACH,MAAM,QAAQ,GAAG,MAAM,IAAA,eAAQ,EAAC,KAAK,IAAI,EAAE;YAEzC,MAAM,KAAK,GAKL,MAAM,CAAC,CAAC,GAAG,CAAC;;;;;;;;;;wBAUA,GAAG;;;;;;;;;;;;;;;;;OAiBpB,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;YAEpB,OAAO,EAAE,KAAK,EAAE,CAAC;QACnB,CAAC,CAAC,CAAC;QACH,IAAG,QAAQ,CAAC,KAAK,KAAK,SAAS,EAAC;YAC9B,MAAM,QAAQ,CAAC,KAAK,CAAC;SACtB;QAED,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAW,CAAC,CAAC,CAAC;QACzE,IAAG,OAAO,EAAC;YACT,MAAM,wDAAwD,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;SAChG;QAED,MAAM,YAAY,GAAG,MAAM,IAAA,eAAQ,EAAC,KAAK,IAAI,EAAE;YAC7C,MAAM,OAAO,GAAmD,MAAM,CAAC,CAAC,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sCA0C5C,GAAG;;;;;;;;;;qCAUJ,GAAG;;;;;+BAKT,GAAG
|
|
1
|
+
{"version":3,"file":"getTablesForSchemaPostgresSQL.js","sourceRoot":"","sources":["../../lib/DboBuilder/getTablesForSchemaPostgresSQL.ts"],"names":[],"mappings":"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"}
|
|
@@ -227,6 +227,7 @@ export async function getTablesForSchemaPostgresSQL(
|
|
|
227
227
|
ON c.table_name = cp.table_name AND c.column_name = cp.column_name
|
|
228
228
|
) ccc
|
|
229
229
|
WHERE table_schema ${sql}
|
|
230
|
+
ORDER BY table_oid, ordinal_position
|
|
230
231
|
`, { schemaNames });
|
|
231
232
|
|
|
232
233
|
return { columns };
|
|
@@ -312,13 +313,13 @@ export async function getTablesForSchemaPostgresSQL(
|
|
|
312
313
|
|
|
313
314
|
let result = getTablesAndViews.tablesAndViews.concat(getMaterialViewsReq.materialViews);
|
|
314
315
|
result = await Promise.all(result
|
|
315
|
-
.map(async
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
const refs = getFkeys.fkeys!.filter(fc => fc.oid ===
|
|
316
|
+
.map(async table => {
|
|
317
|
+
table.name = table.escaped_identifier;
|
|
318
|
+
table.privileges.select = table.columns.some(c => c.privileges.SELECT);
|
|
319
|
+
table.privileges.insert = table.columns.some(c => c.privileges.INSERT);
|
|
320
|
+
table.privileges.update = table.columns.some(c => c.privileges.UPDATE);
|
|
321
|
+
table.columns = table.columns.map(c => {
|
|
322
|
+
const refs = getFkeys.fkeys!.filter(fc => fc.oid === table.oid && fc.cols.includes(c.name));
|
|
322
323
|
if(refs.length) c.references = refs.map(_ref => {
|
|
323
324
|
const ref = { ..._ref };
|
|
324
325
|
//@ts-ignore
|
|
@@ -330,9 +331,9 @@ export async function getTablesForSchemaPostgresSQL(
|
|
|
330
331
|
|
|
331
332
|
/** Get view reference cols (based on parent table) */
|
|
332
333
|
let viewFCols: Pick<TableSchemaColumn, "name" | "references">[] = [];
|
|
333
|
-
if(
|
|
334
|
+
if(table.is_view){
|
|
334
335
|
try {
|
|
335
|
-
const view_definition =
|
|
336
|
+
const view_definition = table.view_definition?.endsWith(";")? table.view_definition.slice(0, -1) : table.view_definition;
|
|
336
337
|
const { fields } = await runSQL(`SELECT * FROM \n ( ${view_definition!} \n) t LIMIT 0`, {}, {}, undefined) as SQLResult<undefined>;
|
|
337
338
|
const ftables = result.filter(r => fields.some(f => f.tableID === r.oid));
|
|
338
339
|
ftables.forEach(ft => {
|
|
@@ -361,7 +362,7 @@ export async function getTablesForSchemaPostgresSQL(
|
|
|
361
362
|
}
|
|
362
363
|
}
|
|
363
364
|
|
|
364
|
-
|
|
365
|
+
table.columns = table.columns.map(col => {
|
|
365
366
|
if (col.has_default) {
|
|
366
367
|
/** Hide pkey default value */
|
|
367
368
|
col.column_default = (col.udt_name !== "uuid" && !col.is_pkey && !col.column_default.startsWith("nextval(")) ? col.column_default : null;
|
|
@@ -374,12 +375,10 @@ export async function getTablesForSchemaPostgresSQL(
|
|
|
374
375
|
|
|
375
376
|
return col;
|
|
376
377
|
|
|
377
|
-
})
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
tbl.isHyperTable = getHyperTablesReq.hyperTables?.includes(tbl.name);
|
|
378
|
+
});
|
|
379
|
+
table.isHyperTable = getHyperTablesReq.hyperTables?.includes(table.name);
|
|
381
380
|
|
|
382
|
-
return
|
|
381
|
+
return table;
|
|
383
382
|
}));
|
|
384
383
|
|
|
385
384
|
const res = {
|
package/package.json
CHANGED
package/tests/client/PID.txt
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
162005
|
package/tests/server/index.ts
CHANGED