prostgles-server 4.0.38 → 4.0.40
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/ViewHandler.js +1 -1
- package/dist/DboBuilder/ViewHandler.js.map +1 -1
- package/dist/DboBuilder/getTablesForSchemaPostgresSQL.d.ts +3 -0
- package/dist/DboBuilder/getTablesForSchemaPostgresSQL.d.ts.map +1 -0
- package/dist/DboBuilder/getTablesForSchemaPostgresSQL.js +204 -0
- package/dist/DboBuilder/getTablesForSchemaPostgresSQL.js.map +1 -0
- package/dist/DboBuilder.d.ts.map +1 -1
- package/dist/DboBuilder.js +2 -199
- package/dist/DboBuilder.js.map +1 -1
- package/lib/DboBuilder/ViewHandler.js +1 -1
- package/lib/DboBuilder/ViewHandler.ts +1 -1
- package/lib/DboBuilder/getTablesForSchemaPostgresSQL.d.ts +3 -0
- package/lib/DboBuilder/getTablesForSchemaPostgresSQL.d.ts.map +1 -0
- package/lib/DboBuilder/getTablesForSchemaPostgresSQL.js +203 -0
- package/lib/DboBuilder/getTablesForSchemaPostgresSQL.ts +209 -0
- package/lib/DboBuilder.d.ts.map +1 -1
- package/lib/DboBuilder.js +2 -199
- package/lib/DboBuilder.ts +1 -206
- package/package.json +1 -1
- package/tests/client/PID.txt +1 -1
- package/tests/server/package-lock.json +1 -1
|
@@ -0,0 +1,209 @@
|
|
|
1
|
+
import { SQLResult } from "prostgles-types";
|
|
2
|
+
import { DboBuilder, TableSchemaColumn, TableSchema } from "../DboBuilder";
|
|
3
|
+
import { asValue } from "../PubSubManager/PubSubManager";
|
|
4
|
+
export async function getTablesForSchemaPostgresSQL({ db, runSQL }: DboBuilder, schema = "public"): Promise<TableSchema[]> {
|
|
5
|
+
const query =
|
|
6
|
+
`
|
|
7
|
+
SELECT
|
|
8
|
+
jsonb_build_object(
|
|
9
|
+
'insert', EXISTS (
|
|
10
|
+
SELECT 1
|
|
11
|
+
FROM information_schema.role_table_grants rg
|
|
12
|
+
WHERE rg.table_name = t.table_name
|
|
13
|
+
AND rg.privilege_type = 'INSERT'
|
|
14
|
+
),
|
|
15
|
+
'select', EXISTS (
|
|
16
|
+
SELECT 1
|
|
17
|
+
FROM information_schema.role_table_grants rg
|
|
18
|
+
WHERE rg.table_name = t.table_name
|
|
19
|
+
AND rg.privilege_type = 'SELECT'
|
|
20
|
+
),
|
|
21
|
+
'update', EXISTS (
|
|
22
|
+
SELECT 1
|
|
23
|
+
FROM information_schema.role_table_grants rg
|
|
24
|
+
WHERE rg.table_name = t.table_name
|
|
25
|
+
AND rg.privilege_type = 'UPDATE'
|
|
26
|
+
),
|
|
27
|
+
'delete', EXISTS (
|
|
28
|
+
SELECT 1
|
|
29
|
+
FROM information_schema.role_table_grants rg
|
|
30
|
+
WHERE rg.table_name = t.table_name
|
|
31
|
+
AND rg.privilege_type = 'DELETE'
|
|
32
|
+
)
|
|
33
|
+
) as privileges
|
|
34
|
+
, t.table_schema as schema, t.table_name as name
|
|
35
|
+
, cc.columns
|
|
36
|
+
, cc.table_oid as oid
|
|
37
|
+
, t.is_view
|
|
38
|
+
, t.view_definition
|
|
39
|
+
, array_to_json(vr.table_names) as parent_tables
|
|
40
|
+
, obj_description(cc.table_oid::regclass) as comment
|
|
41
|
+
FROM (
|
|
42
|
+
SELECT table_name,
|
|
43
|
+
table_schema,
|
|
44
|
+
is_view,
|
|
45
|
+
CASE WHEN is_view THEN pg_get_viewdef(format('%I.%I', table_schema, table_name)::REGCLASS, true) END as view_definition
|
|
46
|
+
FROM (
|
|
47
|
+
SELECT table_name, table_schema, table_type = 'VIEW' as is_view
|
|
48
|
+
FROM information_schema.tables
|
|
49
|
+
/* TODO - add support for materialized views
|
|
50
|
+
UNION ALL
|
|
51
|
+
SELECT table_name, table_schema
|
|
52
|
+
FROM (
|
|
53
|
+
SELECT relname as table_name, nspname as table_schema, true as is_view
|
|
54
|
+
FROM pg_catalog.pg_class AS _c
|
|
55
|
+
JOIN pg_catalog.pg_namespace AS _ns
|
|
56
|
+
ON _c.relnamespace = _ns.oid
|
|
57
|
+
WHERE relkind IN ( 'm' )
|
|
58
|
+
) materialized_views
|
|
59
|
+
*/
|
|
60
|
+
) tables_matviews
|
|
61
|
+
WHERE table_schema = ${asValue(schema)}
|
|
62
|
+
) t
|
|
63
|
+
INNER join (
|
|
64
|
+
SELECT ccc.table_oid, table_schema, table_name
|
|
65
|
+
, jsonb_agg((SELECT x FROM (
|
|
66
|
+
SELECT ccc.column_name as name,
|
|
67
|
+
ccc.data_type,
|
|
68
|
+
ccc.udt_name,
|
|
69
|
+
ccc.element_type,
|
|
70
|
+
ccc.element_udt_name,
|
|
71
|
+
ccc.is_pkey,
|
|
72
|
+
ccc.comment,
|
|
73
|
+
ccc.ordinal_position,
|
|
74
|
+
ccc.is_nullable = 'YES' as is_nullable,
|
|
75
|
+
ccc.references,
|
|
76
|
+
ccc.has_default,
|
|
77
|
+
ccc.column_default,
|
|
78
|
+
ccc.privileges
|
|
79
|
+
) as x) ORDER BY ccc.ordinal_position ) as columns
|
|
80
|
+
FROM (
|
|
81
|
+
SELECT c.table_schema, c.table_name, c.column_name, c.data_type, c.udt_name
|
|
82
|
+
, e.data_type as element_type
|
|
83
|
+
, e.udt_name as element_udt_name
|
|
84
|
+
, col_description(format('%I.%I', c.table_schema, c.table_name)::regclass::oid, c.ordinal_position) as comment
|
|
85
|
+
--, CASE WHEN fc.ftable IS NOT NULL THEN row_to_json((SELECT t FROM (SELECT fc.ftable, fc.fcols, fc.cols) t)) END as references
|
|
86
|
+
, fc.references
|
|
87
|
+
, c.is_identity = 'YES' OR EXISTS (
|
|
88
|
+
SELECT 1
|
|
89
|
+
FROM information_schema.table_constraints as tc
|
|
90
|
+
JOIN information_schema.key_column_usage AS kcu ON tc.constraint_name = kcu.constraint_name AND tc.table_schema = kcu.table_schema
|
|
91
|
+
WHERE kcu.table_schema = c.table_schema AND kcu.table_name = c.table_name AND kcu.column_name = c.column_name AND tc.constraint_type IN ('PRIMARY KEY')
|
|
92
|
+
) as is_pkey
|
|
93
|
+
, c.ordinal_position
|
|
94
|
+
, COALESCE(c.column_default IS NOT NULL OR c.identity_generation = 'ALWAYS', false) as has_default
|
|
95
|
+
, c.column_default
|
|
96
|
+
, format('%I.%I', c.table_schema, c.table_name)::regclass::oid AS table_oid
|
|
97
|
+
, c.is_nullable
|
|
98
|
+
, cp.privileges
|
|
99
|
+
FROM information_schema.columns c
|
|
100
|
+
LEFT JOIN (SELECT * FROM information_schema.element_types ) e
|
|
101
|
+
ON ((c.table_catalog, c.table_schema, c.table_name, 'TABLE', c.dtd_identifier)
|
|
102
|
+
= (e.object_catalog, e.object_schema, e.object_name, e.object_type, e.collection_type_identifier)
|
|
103
|
+
)
|
|
104
|
+
LEFT JOIN (
|
|
105
|
+
SELECT table_schema, table_name, column_name, json_agg(row_to_json((SELECT t FROM (SELECT cpp.privilege_type, cpp.is_grantable ) t))) as privileges
|
|
106
|
+
FROM information_schema.column_privileges cpp
|
|
107
|
+
GROUP BY table_schema, table_name, column_name
|
|
108
|
+
) cp
|
|
109
|
+
ON c.table_name = cp.table_name AND c.column_name = cp.column_name
|
|
110
|
+
LEFT JOIN (
|
|
111
|
+
--SELECT *
|
|
112
|
+
SELECT "table", unnest(ft.cols) as col, jsonb_agg(row_to_json((SELECT t FROM (SELECT ftable, fcols, cols) t))) as references
|
|
113
|
+
FROM (
|
|
114
|
+
SELECT
|
|
115
|
+
(SELECT r.relname from pg_class r where r.oid = c.conrelid) as table,
|
|
116
|
+
(SELECT array_agg(attname::text) from pg_attribute
|
|
117
|
+
where attrelid = c.conrelid and ARRAY[attnum] <@ c.conkey) as cols,
|
|
118
|
+
(SELECT array_agg(attname::text) from pg_attribute
|
|
119
|
+
where attrelid = c.confrelid and ARRAY[attnum] <@ c.confkey) as fcols,
|
|
120
|
+
(SELECT r.relname from pg_class r where r.oid = c.confrelid) as ftable
|
|
121
|
+
FROM pg_constraint c
|
|
122
|
+
) ft
|
|
123
|
+
WHERE ft.table IS NOT NULL
|
|
124
|
+
AND ft.ftable IS NOT NULL
|
|
125
|
+
-- c.confrelid = 'users'::regclass::oid
|
|
126
|
+
GROUP BY "table", unnest(cols)
|
|
127
|
+
) fc
|
|
128
|
+
ON fc.table = c.table_name
|
|
129
|
+
AND c.column_name::text = fc.col
|
|
130
|
+
) ccc
|
|
131
|
+
GROUP BY table_oid, table_schema, table_name
|
|
132
|
+
) cc
|
|
133
|
+
ON t.table_name = cc.table_name
|
|
134
|
+
AND t.table_schema = cc.table_schema
|
|
135
|
+
LEFT JOIN (
|
|
136
|
+
SELECT cl_r.relname as view_name, array_agg(DISTINCT cl_d.relname) AS table_names
|
|
137
|
+
FROM pg_rewrite AS r
|
|
138
|
+
JOIN pg_class AS cl_r ON r.ev_class=cl_r.oid
|
|
139
|
+
JOIN pg_depend AS d ON r.oid=d.objid
|
|
140
|
+
JOIN pg_class AS cl_d ON d.refobjid=cl_d.oid
|
|
141
|
+
WHERE cl_d.relkind IN ('r','v')
|
|
142
|
+
AND cl_d.relname <> cl_r.relname
|
|
143
|
+
GROUP BY cl_r.relname
|
|
144
|
+
) vr
|
|
145
|
+
ON t.table_name = vr.view_name
|
|
146
|
+
GROUP BY t.table_schema, t.table_name, t.is_view, t.view_definition, vr.table_names , cc.table_oid, cc.columns
|
|
147
|
+
ORDER BY schema, name
|
|
148
|
+
|
|
149
|
+
`;
|
|
150
|
+
// console.log(pgp.as.format(query, { schema }), schema);
|
|
151
|
+
let result: TableSchema[] = await db.any(query, { schema });
|
|
152
|
+
|
|
153
|
+
result = await Promise.all(result
|
|
154
|
+
.map(async tbl => {
|
|
155
|
+
|
|
156
|
+
/** Get view reference cols (based on parent table) */
|
|
157
|
+
let viewFCols: Pick<TableSchemaColumn, "name" | "references">[] = [];
|
|
158
|
+
if(tbl.is_view){
|
|
159
|
+
try {
|
|
160
|
+
const view_definition = tbl.view_definition?.endsWith(";")? tbl.view_definition.slice(0, -1) : tbl.view_definition;
|
|
161
|
+
const { fields } = await runSQL(`SELECT * FROM \n ( ${view_definition!} \n) t LIMIT 0`, {}, {}, undefined) as SQLResult<undefined>;
|
|
162
|
+
const ftables = result.filter(r => fields.some(f => f.tableID === r.oid));
|
|
163
|
+
ftables.forEach(ft => {
|
|
164
|
+
const fFields = fields.filter(f => f.tableID === ft.oid);
|
|
165
|
+
const pkeys = ft.columns.filter(c => c.is_pkey);
|
|
166
|
+
const fFieldPK = fFields.filter(ff => pkeys.some(p => p.name === ff.columnName));
|
|
167
|
+
const refCols = pkeys.length && fFieldPK.length === pkeys.length? fFieldPK : fFields.filter(ff => !["json", "jsonb", "xml"].includes(ff.udt_name));
|
|
168
|
+
const _fcols: typeof viewFCols = refCols.map(ff => {
|
|
169
|
+
const d: Pick<TableSchemaColumn, "name" | "references"> = {
|
|
170
|
+
name: ff.columnName!,
|
|
171
|
+
references: [{
|
|
172
|
+
ftable: ft.name,
|
|
173
|
+
fcols: [ff.columnName!],
|
|
174
|
+
cols: [ff.name]
|
|
175
|
+
}]
|
|
176
|
+
}
|
|
177
|
+
return d;
|
|
178
|
+
})
|
|
179
|
+
viewFCols = [
|
|
180
|
+
...viewFCols,
|
|
181
|
+
..._fcols
|
|
182
|
+
];
|
|
183
|
+
});
|
|
184
|
+
} catch(err){
|
|
185
|
+
console.error(err);
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
tbl.columns = tbl.columns.map(col => {
|
|
190
|
+
if (col.has_default) {
|
|
191
|
+
/** Hide pkey default value */
|
|
192
|
+
col.column_default = (col.udt_name !== "uuid" && !col.is_pkey && !col.column_default.startsWith("nextval(")) ? col.column_default : null;
|
|
193
|
+
}
|
|
194
|
+
|
|
195
|
+
const viewFCol = viewFCols?.find(fc => fc.name === col.name)
|
|
196
|
+
if(viewFCol){
|
|
197
|
+
col.references = viewFCol.references;
|
|
198
|
+
}
|
|
199
|
+
|
|
200
|
+
return col;
|
|
201
|
+
|
|
202
|
+
})//.slice(0).sort((a, b) => a.name.localeCompare(b.name))
|
|
203
|
+
// .sort((a, b) => a.ordinal_position - b.ordinal_position)
|
|
204
|
+
|
|
205
|
+
return tbl;
|
|
206
|
+
}));
|
|
207
|
+
|
|
208
|
+
return result;
|
|
209
|
+
}
|
package/lib/DboBuilder.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DboBuilder.d.ts","sourceRoot":"","sources":["DboBuilder.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,SAAS,MAAM,YAAY,CAAC;AAExC,OAAO,EAAE,GAAG,QAAQ,iCAAiC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"DboBuilder.d.ts","sourceRoot":"","sources":["DboBuilder.ts"],"names":[],"mappings":"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"}
|
package/lib/DboBuilder.js
CHANGED
|
@@ -31,6 +31,7 @@ exports.canEXECUTE = exports.prepareSort = exports.postgresToTsType = exports.is
|
|
|
31
31
|
const Bluebird = __importStar(require("bluebird"));
|
|
32
32
|
const pgPromise = __importStar(require("pg-promise"));
|
|
33
33
|
const runSQL_1 = require("./DboBuilder/runSQL");
|
|
34
|
+
const getTablesForSchemaPostgresSQL_1 = require("./DboBuilder/getTablesForSchemaPostgresSQL");
|
|
34
35
|
const prostgles_types_1 = require("prostgles-types");
|
|
35
36
|
const utils_1 = require("./utils");
|
|
36
37
|
const PubSubManager_1 = require("./PubSubManager/PubSubManager");
|
|
@@ -312,7 +313,7 @@ class DboBuilder {
|
|
|
312
313
|
return runSQL_1.runSQL.bind(this)(query, params, options, localParams);
|
|
313
314
|
};
|
|
314
315
|
async build() {
|
|
315
|
-
this.tablesOrViews = await getTablesForSchemaPostgresSQL(this);
|
|
316
|
+
this.tablesOrViews = await (0, getTablesForSchemaPostgresSQL_1.getTablesForSchemaPostgresSQL)(this);
|
|
316
317
|
this.constraints = await getConstraints(this.db);
|
|
317
318
|
await this.parseJoins();
|
|
318
319
|
this.dbo = {};
|
|
@@ -403,204 +404,6 @@ async function getConstraints(db, schema = "public", filter) {
|
|
|
403
404
|
${!filter ? "" : "AND rel.relname = ${} AND "}
|
|
404
405
|
`);
|
|
405
406
|
}
|
|
406
|
-
async function getTablesForSchemaPostgresSQL({ db, runSQL }, schema = "public") {
|
|
407
|
-
const query = `
|
|
408
|
-
SELECT
|
|
409
|
-
jsonb_build_object(
|
|
410
|
-
'insert', EXISTS (
|
|
411
|
-
SELECT 1
|
|
412
|
-
FROM information_schema.role_table_grants rg
|
|
413
|
-
WHERE rg.table_name = t.table_name
|
|
414
|
-
AND rg.privilege_type = 'INSERT'
|
|
415
|
-
),
|
|
416
|
-
'select', EXISTS (
|
|
417
|
-
SELECT 1
|
|
418
|
-
FROM information_schema.role_table_grants rg
|
|
419
|
-
WHERE rg.table_name = t.table_name
|
|
420
|
-
AND rg.privilege_type = 'SELECT'
|
|
421
|
-
),
|
|
422
|
-
'update', EXISTS (
|
|
423
|
-
SELECT 1
|
|
424
|
-
FROM information_schema.role_table_grants rg
|
|
425
|
-
WHERE rg.table_name = t.table_name
|
|
426
|
-
AND rg.privilege_type = 'UPDATE'
|
|
427
|
-
),
|
|
428
|
-
'delete', EXISTS (
|
|
429
|
-
SELECT 1
|
|
430
|
-
FROM information_schema.role_table_grants rg
|
|
431
|
-
WHERE rg.table_name = t.table_name
|
|
432
|
-
AND rg.privilege_type = 'DELETE'
|
|
433
|
-
)
|
|
434
|
-
) as privileges
|
|
435
|
-
, t.table_schema as schema, t.table_name as name
|
|
436
|
-
, cc.columns
|
|
437
|
-
, cc.table_oid as oid
|
|
438
|
-
, t.is_view
|
|
439
|
-
, t.view_definition
|
|
440
|
-
, array_to_json(vr.table_names) as parent_tables
|
|
441
|
-
, obj_description(cc.table_oid::regclass) as comment
|
|
442
|
-
FROM (
|
|
443
|
-
SELECT table_name,
|
|
444
|
-
table_schema,
|
|
445
|
-
is_view,
|
|
446
|
-
CASE WHEN is_view THEN pg_get_viewdef(format('%I.%I', table_schema, table_name)::REGCLASS, true) END as view_definition
|
|
447
|
-
FROM (
|
|
448
|
-
SELECT table_name, table_schema, table_type = 'VIEW' as is_view
|
|
449
|
-
FROM information_schema.tables
|
|
450
|
-
/* TODO - add support for materialized views
|
|
451
|
-
UNION ALL
|
|
452
|
-
SELECT table_name, table_schema
|
|
453
|
-
FROM (
|
|
454
|
-
SELECT relname as table_name, nspname as table_schema, true as is_view
|
|
455
|
-
FROM pg_catalog.pg_class AS _c
|
|
456
|
-
JOIN pg_catalog.pg_namespace AS _ns
|
|
457
|
-
ON _c.relnamespace = _ns.oid
|
|
458
|
-
WHERE relkind IN ( 'm' )
|
|
459
|
-
) materialized_views
|
|
460
|
-
*/
|
|
461
|
-
) tables_matviews
|
|
462
|
-
WHERE table_schema = ${(0, PubSubManager_1.asValue)(schema)}
|
|
463
|
-
) t
|
|
464
|
-
INNER join (
|
|
465
|
-
SELECT ccc.table_oid, table_schema, table_name
|
|
466
|
-
, jsonb_agg((SELECT x FROM (
|
|
467
|
-
SELECT ccc.column_name as name,
|
|
468
|
-
ccc.data_type,
|
|
469
|
-
ccc.udt_name,
|
|
470
|
-
ccc.element_type,
|
|
471
|
-
ccc.element_udt_name,
|
|
472
|
-
ccc.is_pkey,
|
|
473
|
-
ccc.comment,
|
|
474
|
-
ccc.ordinal_position,
|
|
475
|
-
ccc.is_nullable = 'YES' as is_nullable,
|
|
476
|
-
ccc.references,
|
|
477
|
-
ccc.has_default,
|
|
478
|
-
ccc.column_default,
|
|
479
|
-
ccc.privileges
|
|
480
|
-
) as x) ORDER BY ccc.ordinal_position ) as columns
|
|
481
|
-
FROM (
|
|
482
|
-
SELECT c.table_schema, c.table_name, c.column_name, c.data_type, c.udt_name
|
|
483
|
-
, e.data_type as element_type
|
|
484
|
-
, e.udt_name as element_udt_name
|
|
485
|
-
, col_description(format('%I.%I', c.table_schema, c.table_name)::regclass::oid, c.ordinal_position) as comment
|
|
486
|
-
--, CASE WHEN fc.ftable IS NOT NULL THEN row_to_json((SELECT t FROM (SELECT fc.ftable, fc.fcols, fc.cols) t)) END as references
|
|
487
|
-
, fc.references
|
|
488
|
-
, c.is_identity = 'YES' OR EXISTS (
|
|
489
|
-
SELECT 1
|
|
490
|
-
FROM information_schema.table_constraints as tc
|
|
491
|
-
JOIN information_schema.key_column_usage AS kcu ON tc.constraint_name = kcu.constraint_name AND tc.table_schema = kcu.table_schema
|
|
492
|
-
WHERE kcu.table_schema = c.table_schema AND kcu.table_name = c.table_name AND kcu.column_name = c.column_name AND tc.constraint_type IN ('PRIMARY KEY')
|
|
493
|
-
) as is_pkey
|
|
494
|
-
, c.ordinal_position
|
|
495
|
-
, COALESCE(c.column_default IS NOT NULL OR c.identity_generation = 'ALWAYS', false) as has_default
|
|
496
|
-
, c.column_default
|
|
497
|
-
, format('%I.%I', c.table_schema, c.table_name)::regclass::oid AS table_oid
|
|
498
|
-
, c.is_nullable
|
|
499
|
-
, cp.privileges
|
|
500
|
-
FROM information_schema.columns c
|
|
501
|
-
LEFT JOIN (SELECT * FROM information_schema.element_types ) e
|
|
502
|
-
ON ((c.table_catalog, c.table_schema, c.table_name, 'TABLE', c.dtd_identifier)
|
|
503
|
-
= (e.object_catalog, e.object_schema, e.object_name, e.object_type, e.collection_type_identifier)
|
|
504
|
-
)
|
|
505
|
-
LEFT JOIN (
|
|
506
|
-
SELECT table_schema, table_name, column_name, json_agg(row_to_json((SELECT t FROM (SELECT cpp.privilege_type, cpp.is_grantable ) t))) as privileges
|
|
507
|
-
FROM information_schema.column_privileges cpp
|
|
508
|
-
GROUP BY table_schema, table_name, column_name
|
|
509
|
-
) cp
|
|
510
|
-
ON c.table_name = cp.table_name AND c.column_name = cp.column_name
|
|
511
|
-
LEFT JOIN (
|
|
512
|
-
--SELECT *
|
|
513
|
-
SELECT "table", ft.cols, jsonb_agg(row_to_json((SELECT t FROM (SELECT ftable, fcols, cols) t))) as references
|
|
514
|
-
FROM (
|
|
515
|
-
SELECT
|
|
516
|
-
(SELECT r.relname from pg_class r where r.oid = c.conrelid) as table,
|
|
517
|
-
(SELECT array_agg(attname::text) from pg_attribute
|
|
518
|
-
where attrelid = c.conrelid and ARRAY[attnum] <@ c.conkey) as cols,
|
|
519
|
-
(SELECT array_agg(attname::text) from pg_attribute
|
|
520
|
-
where attrelid = c.confrelid and ARRAY[attnum] <@ c.confkey) as fcols,
|
|
521
|
-
(SELECT r.relname from pg_class r where r.oid = c.confrelid) as ftable
|
|
522
|
-
FROM pg_constraint c
|
|
523
|
-
) ft
|
|
524
|
-
WHERE ft.table IS NOT NULL
|
|
525
|
-
AND ft.ftable IS NOT NULL
|
|
526
|
-
-- c.confrelid = 'users'::regclass::oid
|
|
527
|
-
GROUP BY "table", cols
|
|
528
|
-
) fc
|
|
529
|
-
ON fc.table = c.table_name
|
|
530
|
-
AND c.column_name::text = ANY(fc.cols)
|
|
531
|
-
) ccc
|
|
532
|
-
GROUP BY table_oid, table_schema, table_name
|
|
533
|
-
) cc
|
|
534
|
-
ON t.table_name = cc.table_name
|
|
535
|
-
AND t.table_schema = cc.table_schema
|
|
536
|
-
LEFT JOIN (
|
|
537
|
-
SELECT cl_r.relname as view_name, array_agg(DISTINCT cl_d.relname) AS table_names
|
|
538
|
-
FROM pg_rewrite AS r
|
|
539
|
-
JOIN pg_class AS cl_r ON r.ev_class=cl_r.oid
|
|
540
|
-
JOIN pg_depend AS d ON r.oid=d.objid
|
|
541
|
-
JOIN pg_class AS cl_d ON d.refobjid=cl_d.oid
|
|
542
|
-
WHERE cl_d.relkind IN ('r','v')
|
|
543
|
-
AND cl_d.relname <> cl_r.relname
|
|
544
|
-
GROUP BY cl_r.relname
|
|
545
|
-
) vr
|
|
546
|
-
ON t.table_name = vr.view_name
|
|
547
|
-
GROUP BY t.table_schema, t.table_name, t.is_view, t.view_definition, vr.table_names , cc.table_oid, cc.columns
|
|
548
|
-
ORDER BY schema, name
|
|
549
|
-
|
|
550
|
-
`;
|
|
551
|
-
// console.log(pgp.as.format(query, { schema }), schema);
|
|
552
|
-
let result = await db.any(query, { schema });
|
|
553
|
-
result = await Promise.all(result
|
|
554
|
-
.map(async (tbl) => {
|
|
555
|
-
/** Get view reference cols (based on parent table) */
|
|
556
|
-
let viewFCols = [];
|
|
557
|
-
if (tbl.is_view) {
|
|
558
|
-
try {
|
|
559
|
-
const view_definition = tbl.view_definition?.endsWith(";") ? tbl.view_definition.slice(0, -1) : tbl.view_definition;
|
|
560
|
-
const { fields } = await runSQL(`SELECT * FROM \n ( ${view_definition} \n) t LIMIT 0`, {}, {}, undefined);
|
|
561
|
-
const ftables = result.filter(r => fields.some(f => f.tableID === r.oid));
|
|
562
|
-
ftables.forEach(ft => {
|
|
563
|
-
const fFields = fields.filter(f => f.tableID === ft.oid);
|
|
564
|
-
const pkeys = ft.columns.filter(c => c.is_pkey);
|
|
565
|
-
const fFieldPK = fFields.filter(ff => pkeys.some(p => p.name === ff.columnName));
|
|
566
|
-
const refCols = pkeys.length && fFieldPK.length === pkeys.length ? fFieldPK : fFields.filter(ff => !["json", "jsonb", "xml"].includes(ff.udt_name));
|
|
567
|
-
const _fcols = refCols.map(ff => {
|
|
568
|
-
const d = {
|
|
569
|
-
name: ff.columnName,
|
|
570
|
-
references: [{
|
|
571
|
-
ftable: ft.name,
|
|
572
|
-
fcols: [ff.columnName],
|
|
573
|
-
cols: [ff.name]
|
|
574
|
-
}]
|
|
575
|
-
};
|
|
576
|
-
return d;
|
|
577
|
-
});
|
|
578
|
-
viewFCols = [
|
|
579
|
-
...viewFCols,
|
|
580
|
-
..._fcols
|
|
581
|
-
];
|
|
582
|
-
});
|
|
583
|
-
}
|
|
584
|
-
catch (err) {
|
|
585
|
-
console.error(err);
|
|
586
|
-
}
|
|
587
|
-
}
|
|
588
|
-
tbl.columns = tbl.columns.map(col => {
|
|
589
|
-
if (col.has_default) {
|
|
590
|
-
/** Hide pkey default value */
|
|
591
|
-
col.column_default = (col.udt_name !== "uuid" && !col.is_pkey && !col.column_default.startsWith("nextval(")) ? col.column_default : null;
|
|
592
|
-
}
|
|
593
|
-
const viewFCol = viewFCols?.find(fc => fc.name === col.name);
|
|
594
|
-
if (viewFCol) {
|
|
595
|
-
col.references = viewFCol.references;
|
|
596
|
-
}
|
|
597
|
-
return col;
|
|
598
|
-
}); //.slice(0).sort((a, b) => a.name.localeCompare(b.name))
|
|
599
|
-
// .sort((a, b) => a.ordinal_position - b.ordinal_position)
|
|
600
|
-
return tbl;
|
|
601
|
-
}));
|
|
602
|
-
return result;
|
|
603
|
-
}
|
|
604
407
|
function isPlainObject(o) {
|
|
605
408
|
return Object(o) === o && Object.getPrototypeOf(o) === Object.prototype;
|
|
606
409
|
}
|