prostgles-server 4.2.467 → 4.2.468
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/DboBuilder.d.ts +24 -23
- package/dist/DboBuilder/DboBuilder.d.ts.map +1 -1
- package/dist/DboBuilder/DboBuilder.js +4 -8
- package/dist/DboBuilder/DboBuilder.js.map +1 -1
- package/dist/DboBuilder/QueryStreamer.d.ts.map +1 -1
- package/dist/DboBuilder/QueryStreamer.js +2 -5
- package/dist/DboBuilder/QueryStreamer.js.map +1 -1
- package/dist/DboBuilder/runSql/runSQL.d.ts +20 -1
- package/dist/DboBuilder/runSql/runSQL.d.ts.map +1 -1
- package/dist/DboBuilder/runSql/runSQL.js +5 -11
- package/dist/DboBuilder/runSql/runSQL.js.map +1 -1
- package/dist/DboBuilder/runSql/runSqlUtils.d.ts +7 -7
- package/dist/DboBuilder/runSql/runSqlUtils.d.ts.map +1 -1
- package/dist/DboBuilder/runSql/runSqlUtils.js +9 -6
- package/dist/DboBuilder/runSql/runSqlUtils.js.map +1 -1
- package/dist/Filtering.d.ts +1 -1
- package/lib/DboBuilder/DboBuilder.ts +6 -32
- package/lib/DboBuilder/QueryStreamer.ts +2 -8
- package/lib/DboBuilder/runSql/runSQL.ts +5 -15
- package/lib/DboBuilder/runSql/runSqlUtils.ts +13 -10
- package/package.json +1 -1
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type pg from "pg-promise/typescript/pg-subset";
|
|
1
2
|
import type { SQLHandler } from "prostgles-types";
|
|
2
3
|
import type { DB, Prostgles } from "../Prostgles";
|
|
3
4
|
import type { Join } from "../ProstglesTypes";
|
|
@@ -11,25 +12,8 @@ import type { JoinPaths } from "./ViewHandler/ViewHandler";
|
|
|
11
12
|
import { ViewHandler } from "./ViewHandler/ViewHandler";
|
|
12
13
|
import type { PGConstraint } from "./dboBuilderUtils";
|
|
13
14
|
import { type getDbTypes } from "./runSql/runSqlUtils";
|
|
14
|
-
import type pg from "pg-promise/typescript/pg-subset";
|
|
15
15
|
export * from "./DboBuilderTypes";
|
|
16
16
|
export * from "./dboBuilderUtils";
|
|
17
|
-
type OidInfo = {
|
|
18
|
-
/**
|
|
19
|
-
* Oid
|
|
20
|
-
*/
|
|
21
|
-
relid: number;
|
|
22
|
-
relname: string;
|
|
23
|
-
schemaname: string;
|
|
24
|
-
};
|
|
25
|
-
type TableOidInfo = OidInfo & {
|
|
26
|
-
pkey_columns: string[] | null;
|
|
27
|
-
};
|
|
28
|
-
type TableOidColumnInfo = OidInfo & {
|
|
29
|
-
column_name: string;
|
|
30
|
-
udt_name: string;
|
|
31
|
-
ordinal_position: number;
|
|
32
|
-
};
|
|
33
17
|
export declare class DboBuilder {
|
|
34
18
|
tablesOrViews?: TableSchema[];
|
|
35
19
|
/**
|
|
@@ -46,13 +30,11 @@ export declare class DboBuilder {
|
|
|
46
30
|
/**
|
|
47
31
|
* Used for db.sql field type details
|
|
48
32
|
*/
|
|
49
|
-
|
|
50
|
-
USER_TABLES: TableOidInfo[] | undefined;
|
|
51
|
-
USER_TABLE_COLUMNS: TableOidColumnInfo[] | undefined;
|
|
33
|
+
dbTypesCache?: Awaited<ReturnType<typeof getDbTypes>>;
|
|
52
34
|
DATA_TYPES_DBKEY: string;
|
|
53
35
|
queryStreamer: QueryStreamer;
|
|
54
36
|
get tables(): DbTableInfo[];
|
|
55
|
-
getDetailedFieldInfo: (fields: pg.IColumn[]) => {
|
|
37
|
+
getDetailedFieldInfo: (fields: pg.IColumn[]) => Promise<{
|
|
56
38
|
tsDataType: "string" | "number" | "boolean" | "any" | "number[]" | "boolean[]" | "string[]" | "any[]";
|
|
57
39
|
dataType: import("prostgles-types").PG_COLUMN_UDT_DATA_TYPE;
|
|
58
40
|
udt_name: import("prostgles-types").PG_COLUMN_UDT_DATA_TYPE;
|
|
@@ -67,7 +49,7 @@ export declare class DboBuilder {
|
|
|
67
49
|
dataTypeSize: number;
|
|
68
50
|
dataTypeModifier: number;
|
|
69
51
|
format: string;
|
|
70
|
-
}[]
|
|
52
|
+
}[]>;
|
|
71
53
|
getPubSubManagerPromise?: Promise<PubSubManager>;
|
|
72
54
|
getPubSubManager: () => Promise<PubSubManager>;
|
|
73
55
|
tableTsDefinitions?: string;
|
|
@@ -100,6 +82,25 @@ export declare class DboBuilder {
|
|
|
100
82
|
}) => string;
|
|
101
83
|
getShortestJoinPath: (viewHandler: ViewHandler, target: string) => JoinPaths[number] | undefined;
|
|
102
84
|
getTX: <R, TH extends DbTxTableHandlers>(cb: TxCB<Promise<R> | R, TH>) => Promise<R>;
|
|
103
|
-
cacheDBTypes: (force?: boolean | undefined) => Promise<
|
|
85
|
+
cacheDBTypes: (force?: boolean | undefined) => Promise<{
|
|
86
|
+
dataTypesMap: Map<number, {
|
|
87
|
+
oid: number;
|
|
88
|
+
typname: import("prostgles-types").PG_COLUMN_UDT_DATA_TYPE;
|
|
89
|
+
}>;
|
|
90
|
+
userTablesMap: Map<number, {
|
|
91
|
+
relid: number;
|
|
92
|
+
relname: string;
|
|
93
|
+
schemaname: string;
|
|
94
|
+
pkey_columns: string[] | null;
|
|
95
|
+
}>;
|
|
96
|
+
userTableColumnsMap: Map<string, {
|
|
97
|
+
relid: number;
|
|
98
|
+
schemaname: string;
|
|
99
|
+
relname: string;
|
|
100
|
+
column_name: string;
|
|
101
|
+
udt_name: string;
|
|
102
|
+
ordinal_position: number;
|
|
103
|
+
}>;
|
|
104
|
+
}>;
|
|
104
105
|
}
|
|
105
106
|
//# sourceMappingURL=DboBuilder.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DboBuilder.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/DboBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAc,MAAM,iBAAiB,CAAC;AAI9D,OAAO,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAGjF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAE7C,OAAO,KAAK,EACV,eAAe,EACf,iBAAiB,EAEjB,gBAAgB,EAChB,WAAW,EACX,IAAI,EACL,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAQtD,OAAO,EAAwB,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"DboBuilder.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/DboBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,9 +49,7 @@ class DboBuilder {
|
|
|
49
49
|
/**
|
|
50
50
|
* Used for db.sql field type details
|
|
51
51
|
*/
|
|
52
|
-
|
|
53
|
-
USER_TABLES;
|
|
54
|
-
USER_TABLE_COLUMNS;
|
|
52
|
+
dbTypesCache;
|
|
55
53
|
DATA_TYPES_DBKEY = "";
|
|
56
54
|
queryStreamer;
|
|
57
55
|
get tables() {
|
|
@@ -68,11 +66,9 @@ class DboBuilder {
|
|
|
68
66
|
})
|
|
69
67
|
.filter(prostgles_types_1.isDefined);
|
|
70
68
|
}
|
|
71
|
-
getDetailedFieldInfo = (fields) =>
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
USER_TABLE_COLUMNS: this.USER_TABLE_COLUMNS,
|
|
75
|
-
}, fields);
|
|
69
|
+
getDetailedFieldInfo = async (fields) => {
|
|
70
|
+
return (0, runSqlUtils_1.getDetailedFieldInfo)(await this.cacheDBTypes(), fields);
|
|
71
|
+
};
|
|
76
72
|
getPubSubManagerPromise;
|
|
77
73
|
getPubSubManager = async () => {
|
|
78
74
|
this.getPubSubManagerPromise ??= (async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DboBuilder.js","sourceRoot":"","sources":["../../lib/DboBuilder/DboBuilder.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"DboBuilder.js","sourceRoot":"","sources":["../../lib/DboBuilder/DboBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryStreamer.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/QueryStreamer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,UAAU,MAAM,WAAW,CAAC;AACxC,OAAO,KAAK,EAAE,UAAU,EAAyB,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAGhG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAKtD,KAAK,qBAAqB,GAAG;IAC3B,MAAM,EAAE,YAAY,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,UAAU,GAAG,SAAS,CAAC;IAChC,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AACF,KAAK,aAAa,GAAG,qBAAqB,GAAG;IAC3C,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,UAAU,GAAG,SAAS,CAAC;IAC/B,MAAM,EAAE,EAAE,CAAC,MAAM,GAAG,SAAS,CAAC;IAC9B,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,OAAO,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;CAC/B,CAAC;AAiBF,qBAAa,aAAa;IACxB,EAAE,EAAE,EAAE,CAAC;IACP,UAAU,EAAE,UAAU,CAAC;IACvB,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAa;IACnE,WAAW,EAAE,EAAE,CAAC,MAAM,CAAC;gBACX,UAAU,EAAE,UAAU;IAmBlC,aAAa,GAAI,SAAS,CAAC,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,CAAC,GAAG,SAAS,EAAE,eAAe,EAAE,CAAC,YAAY,eAQxF;IACF,YAAY,GAAI,UAAU,MAAM,UAS9B;IAEF,MAAM,GAAI,OAAO,qBAAqB,KAAG,qBAAqB,
|
|
1
|
+
{"version":3,"file":"QueryStreamer.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/QueryStreamer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,UAAU,MAAM,WAAW,CAAC;AACxC,OAAO,KAAK,EAAE,UAAU,EAAyB,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAGhG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAKtD,KAAK,qBAAqB,GAAG;IAC3B,MAAM,EAAE,YAAY,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,UAAU,GAAG,SAAS,CAAC;IAChC,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AACF,KAAK,aAAa,GAAG,qBAAqB,GAAG;IAC3C,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,UAAU,GAAG,SAAS,CAAC;IAC/B,MAAM,EAAE,EAAE,CAAC,MAAM,GAAG,SAAS,CAAC;IAC9B,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,OAAO,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;CAC/B,CAAC;AAiBF,qBAAa,aAAa;IACxB,EAAE,EAAE,EAAE,CAAC;IACP,UAAU,EAAE,UAAU,CAAC;IACvB,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAa;IACnE,WAAW,EAAE,EAAE,CAAC,MAAM,CAAC;gBACX,UAAU,EAAE,UAAU;IAmBlC,aAAa,GAAI,SAAS,CAAC,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,CAAC,GAAG,SAAS,EAAE,eAAe,EAAE,CAAC,YAAY,eAQxF;IACF,YAAY,GAAI,UAAU,MAAM,UAS9B;IAEF,MAAM,GAAI,OAAO,qBAAqB,KAAG,qBAAqB,CA6O5D;CACH"}
|
|
@@ -89,6 +89,7 @@ class QueryStreamer {
|
|
|
89
89
|
let processID = -1;
|
|
90
90
|
let streamState;
|
|
91
91
|
const startStream = async (client, query) => {
|
|
92
|
+
await this.dboBuilder.cacheDBTypes();
|
|
92
93
|
const socketQuery = this.socketQueries.get(socketId)?.get(id);
|
|
93
94
|
if (!socketQuery) {
|
|
94
95
|
throw "socket query not found";
|
|
@@ -98,11 +99,7 @@ class QueryStreamer {
|
|
|
98
99
|
const emit = ({ reachedEnd, rows, info, }) => {
|
|
99
100
|
if (!info.fields)
|
|
100
101
|
throw "No fields";
|
|
101
|
-
const fields = (0, runSqlUtils_1.getDetailedFieldInfo)(
|
|
102
|
-
DATA_TYPES: this.dboBuilder.DATA_TYPES,
|
|
103
|
-
USER_TABLES: this.dboBuilder.USER_TABLES,
|
|
104
|
-
USER_TABLE_COLUMNS: this.dboBuilder.USER_TABLE_COLUMNS,
|
|
105
|
-
}, info.fields);
|
|
102
|
+
const fields = (0, runSqlUtils_1.getDetailedFieldInfo)(this.dboBuilder.dbTypesCache, info.fields);
|
|
106
103
|
const packet = {
|
|
107
104
|
type: "data",
|
|
108
105
|
rows,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryStreamer.js","sourceRoot":"","sources":["../../lib/DboBuilder/QueryStreamer.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"QueryStreamer.js","sourceRoot":"","sources":["../../lib/DboBuilder/QueryStreamer.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,26 @@ import type { AuthClientRequest } from "../../Auth/AuthTypes";
|
|
|
3
3
|
import type { DB, Prostgles } from "../../Prostgles";
|
|
4
4
|
import type { DboBuilder, LocalParams } from "../DboBuilder";
|
|
5
5
|
export declare function runSQL(this: DboBuilder, queryWithoutRLS: string, args: unknown, options: SQLOptions | undefined, localParams: LocalParams | undefined): Promise<any>;
|
|
6
|
-
export declare function cacheDBTypes(this: DboBuilder, force?: boolean): Promise<
|
|
6
|
+
export declare function cacheDBTypes(this: DboBuilder, force?: boolean): Promise<{
|
|
7
|
+
dataTypesMap: Map<number, {
|
|
8
|
+
oid: number;
|
|
9
|
+
typname: import("prostgles-types").PG_COLUMN_UDT_DATA_TYPE;
|
|
10
|
+
}>;
|
|
11
|
+
userTablesMap: Map<number, {
|
|
12
|
+
relid: number;
|
|
13
|
+
relname: string;
|
|
14
|
+
schemaname: string;
|
|
15
|
+
pkey_columns: string[] | null;
|
|
16
|
+
}>;
|
|
17
|
+
userTableColumnsMap: Map<string, {
|
|
18
|
+
relid: number;
|
|
19
|
+
schemaname: string;
|
|
20
|
+
relname: string;
|
|
21
|
+
column_name: string;
|
|
22
|
+
udt_name: string;
|
|
23
|
+
ordinal_position: number;
|
|
24
|
+
}>;
|
|
25
|
+
}>;
|
|
7
26
|
export declare const canRunSQL: (prostgles: Prostgles, clientReq: AuthClientRequest | undefined) => Promise<boolean>;
|
|
8
27
|
export declare const canCreateTables: (db: DB) => Promise<boolean>;
|
|
9
28
|
//# sourceMappingURL=runSQL.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runSQL.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/runSql/runSQL.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAa,UAAU,EAA4B,MAAM,iBAAiB,CAAC;AACvF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAG7D,wBAAsB,MAAM,CAC1B,IAAI,EAAE,UAAU,EAChB,eAAe,EAAE,MAAM,EACvB,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,UAAU,GAAG,SAAS,EAC/B,WAAW,EAAE,WAAW,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"runSQL.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/runSql/runSQL.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAa,UAAU,EAA4B,MAAM,iBAAiB,CAAC;AACvF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAG7D,wBAAsB,MAAM,CAC1B,IAAI,EAAE,UAAU,EAChB,eAAe,EAAE,MAAM,EACvB,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,UAAU,GAAG,SAAS,EAC/B,WAAW,EAAE,WAAW,GAAG,SAAS,gBA6GrC;AAyBD,wBAAsB,YAAY,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,UAAQ;;;;;;;;;;;;;;;;;;;GAKjE;AAED,eAAO,MAAM,SAAS,GACpB,WAAW,SAAS,EACpB,WAAW,iBAAiB,GAAG,SAAS,KACvC,OAAO,CAAC,OAAO,CAMjB,CAAC;AAEF,eAAO,MAAM,eAAe,GAAU,IAAI,EAAE,KAAG,OAAO,CAAC,OAAO,CAI7D,CAAC"}
|
|
@@ -18,7 +18,6 @@ async function runSQL(queryWithoutRLS, args, options, localParams) {
|
|
|
18
18
|
" AND restart server: \n (linux) sudo service postgresql restart\n (mac) brew services restart postgres\n ");
|
|
19
19
|
}
|
|
20
20
|
}
|
|
21
|
-
await this.cacheDBTypes();
|
|
22
21
|
if (!(await (0, exports.canRunSQL)(this.prostgles, localParams?.clientReq))) {
|
|
23
22
|
throw "Not allowed to run SQL";
|
|
24
23
|
}
|
|
@@ -99,14 +98,11 @@ async function runSQL(queryWithoutRLS, args, options, localParams) {
|
|
|
99
98
|
return rows.map((r) => Object.values(r)[0]);
|
|
100
99
|
}
|
|
101
100
|
else {
|
|
101
|
+
const typesCache = await this.cacheDBTypes();
|
|
102
102
|
const qres = {
|
|
103
103
|
duration: 0,
|
|
104
104
|
...queryResult,
|
|
105
|
-
fields: (0, runSqlUtils_1.getDetailedFieldInfo)(
|
|
106
|
-
DATA_TYPES: this.DATA_TYPES,
|
|
107
|
-
USER_TABLES: this.USER_TABLES,
|
|
108
|
-
USER_TABLE_COLUMNS: this.USER_TABLE_COLUMNS,
|
|
109
|
-
}, fields),
|
|
105
|
+
fields: (0, runSqlUtils_1.getDetailedFieldInfo)(typesCache, fields),
|
|
110
106
|
};
|
|
111
107
|
return qres;
|
|
112
108
|
}
|
|
@@ -126,12 +122,10 @@ const onSQLResult = async function (queryWithoutRLS, { command }, allowListen, c
|
|
|
126
122
|
}
|
|
127
123
|
};
|
|
128
124
|
async function cacheDBTypes(force = false) {
|
|
129
|
-
if (force || !this.
|
|
130
|
-
|
|
131
|
-
this.DATA_TYPES ??= DATA_TYPES;
|
|
132
|
-
this.USER_TABLES ??= USER_TABLES;
|
|
133
|
-
this.USER_TABLE_COLUMNS ??= USER_TABLE_COLUMNS;
|
|
125
|
+
if (force || !this.dbTypesCache) {
|
|
126
|
+
this.dbTypesCache = await (0, runSqlUtils_1.getDbTypes)(this.db);
|
|
134
127
|
}
|
|
128
|
+
return this.dbTypesCache;
|
|
135
129
|
}
|
|
136
130
|
const canRunSQL = async (prostgles, clientReq) => {
|
|
137
131
|
if (!clientReq)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runSQL.js","sourceRoot":"","sources":["../../../lib/DboBuilder/runSql/runSQL.ts"],"names":[],"mappings":";;;AASA,
|
|
1
|
+
{"version":3,"file":"runSQL.js","sourceRoot":"","sources":["../../../lib/DboBuilder/runSql/runSQL.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,26 +2,26 @@ import type pg from "pg-promise/typescript/pg-subset";
|
|
|
2
2
|
import { type PG_COLUMN_UDT_DATA_TYPE } from "prostgles-types";
|
|
3
3
|
import type { DB } from "../../Prostgles";
|
|
4
4
|
export declare const getDbTypes: (db: DB) => Promise<{
|
|
5
|
-
|
|
5
|
+
dataTypesMap: Map<number, {
|
|
6
6
|
oid: number;
|
|
7
7
|
typname: PG_COLUMN_UDT_DATA_TYPE;
|
|
8
|
-
}
|
|
9
|
-
|
|
8
|
+
}>;
|
|
9
|
+
userTablesMap: Map<number, {
|
|
10
10
|
relid: number;
|
|
11
11
|
relname: string;
|
|
12
12
|
schemaname: string;
|
|
13
13
|
pkey_columns: string[] | null;
|
|
14
|
-
}
|
|
15
|
-
|
|
14
|
+
}>;
|
|
15
|
+
userTableColumnsMap: Map<string, {
|
|
16
16
|
relid: number;
|
|
17
17
|
schemaname: string;
|
|
18
18
|
relname: string;
|
|
19
19
|
column_name: string;
|
|
20
20
|
udt_name: string;
|
|
21
21
|
ordinal_position: number;
|
|
22
|
-
}
|
|
22
|
+
}>;
|
|
23
23
|
}>;
|
|
24
|
-
export declare const getDetailedFieldInfo: ({
|
|
24
|
+
export declare const getDetailedFieldInfo: ({ dataTypesMap, userTablesMap, userTableColumnsMap }: Awaited<ReturnType<typeof getDbTypes>>, fields: pg.IColumn[]) => {
|
|
25
25
|
tsDataType: "string" | "number" | "boolean" | "any" | "number[]" | "boolean[]" | "string[]" | "any[]";
|
|
26
26
|
dataType: PG_COLUMN_UDT_DATA_TYPE;
|
|
27
27
|
udt_name: PG_COLUMN_UDT_DATA_TYPE;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runSqlUtils.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/runSql/runSqlUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,iCAAiC,CAAC;AACtD,OAAO,EAAoB,KAAK,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AACjF,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,iBAAiB,CAAC;AAE1C,eAAO,MAAM,UAAU,GAAU,IAAI,EAAE;;aAE9B,MAAM;iBACF,uBAAuB;;;eAGzB,MAAM;iBACJ,MAAM;oBACH,MAAM;sBACJ,MAAM,EAAE,GAAG,IAAI;;;
|
|
1
|
+
{"version":3,"file":"runSqlUtils.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/runSql/runSqlUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,iCAAiC,CAAC;AACtD,OAAO,EAAoB,KAAK,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AACjF,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,iBAAiB,CAAC;AAE1C,eAAO,MAAM,UAAU,GAAU,IAAI,EAAE;;aAE9B,MAAM;iBACF,uBAAuB;;;eAGzB,MAAM;iBACJ,MAAM;oBACH,MAAM;sBACJ,MAAM,EAAE,GAAG,IAAI;;;eAqBtB,MAAM;oBACD,MAAM;iBACT,MAAM;qBACF,MAAM;kBACT,MAAM;0BACE,MAAM;;EAW3B,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAC/B,sDAAsD,OAAO,CAAC,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC,EAC5F,QAAQ,EAAE,CAAC,OAAO,EAAE;;;;;;;;;;;;;;;GAkBrB,CAAC"}
|
|
@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getDetailedFieldInfo = exports.getDbTypes = void 0;
|
|
4
4
|
const prostgles_types_1 = require("prostgles-types");
|
|
5
5
|
const getDbTypes = async (db) => {
|
|
6
|
-
const
|
|
7
|
-
const
|
|
6
|
+
const dataTypes = await db.any("SELECT oid, typname FROM pg_type");
|
|
7
|
+
const userTables = await db.any(`
|
|
8
8
|
SELECT
|
|
9
9
|
relid,
|
|
10
10
|
relname,
|
|
@@ -21,18 +21,21 @@ const getDbTypes = async (db) => {
|
|
|
21
21
|
ON t.relid = c.table_oid
|
|
22
22
|
GROUP BY relid, relname, schemaname
|
|
23
23
|
`);
|
|
24
|
-
const
|
|
24
|
+
const dataTypesMap = new Map(dataTypes.map((dt) => [Number(dt.oid), dt]));
|
|
25
|
+
const userTablesMap = new Map(userTables.map((t) => [Number(t.relid), t]));
|
|
26
|
+
const userTableColumns = await db.any(`
|
|
25
27
|
SELECT t.relid, t.schemaname, t.relname, c.column_name, c.udt_name, c.ordinal_position
|
|
26
28
|
FROM information_schema.columns c
|
|
27
29
|
INNER JOIN pg_catalog.pg_statio_user_tables t
|
|
28
30
|
ON c.table_schema = t.schemaname AND c.table_name = t.relname
|
|
29
31
|
`);
|
|
30
|
-
|
|
32
|
+
const userTableColumnsMap = new Map(userTableColumns.map((c) => [[c.relid, c.ordinal_position].join("-"), c]));
|
|
33
|
+
return { dataTypesMap, userTablesMap, userTableColumnsMap };
|
|
31
34
|
};
|
|
32
35
|
exports.getDbTypes = getDbTypes;
|
|
33
|
-
const getDetailedFieldInfo = ({
|
|
36
|
+
const getDetailedFieldInfo = ({ dataTypesMap, userTablesMap, userTableColumnsMap }, fields) => {
|
|
34
37
|
return fields.map((f) => {
|
|
35
|
-
const dataType =
|
|
38
|
+
const dataType = dataTypesMap.get(+f.dataTypeID)?.typname ?? "text", table = userTablesMap.get(+f.tableID), column = userTableColumnsMap.get([f.tableID, f.columnID].join("-")), tsDataType = (0, prostgles_types_1.postgresToTsType)(dataType);
|
|
36
39
|
return {
|
|
37
40
|
...f,
|
|
38
41
|
tsDataType,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runSqlUtils.js","sourceRoot":"","sources":["../../../lib/DboBuilder/runSql/runSqlUtils.ts"],"names":[],"mappings":";;;AACA,qDAAiF;AAG1E,MAAM,UAAU,GAAG,KAAK,EAAE,EAAM,EAAE,EAAE;IACzC,MAAM,
|
|
1
|
+
{"version":3,"file":"runSqlUtils.js","sourceRoot":"","sources":["../../../lib/DboBuilder/runSql/runSqlUtils.ts"],"names":[],"mappings":";;;AACA,qDAAiF;AAG1E,MAAM,UAAU,GAAG,KAAK,EAAE,EAAM,EAAE,EAAE;IACzC,MAAM,SAAS,GAAG,MAAM,EAAE,CAAC,GAAG,CAG3B,kCAAkC,CAAC,CAAC;IACvC,MAAM,UAAU,GAAG,MAAM,EAAE,CAAC,GAAG,CAK5B;;;;;;;;;;;;;;;;GAgBF,CAAC,CAAC;IACH,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;IAC1E,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3E,MAAM,gBAAgB,GAAG,MAAM,EAAE,CAAC,GAAG,CAOlC;;;;;GAKF,CAAC,CAAC;IACH,MAAM,mBAAmB,GAAG,IAAI,GAAG,CACjC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAC1E,CAAC;IACF,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,mBAAmB,EAAE,CAAC;AAC9D,CAAC,CAAC;AA9CW,QAAA,UAAU,cA8CrB;AAEK,MAAM,oBAAoB,GAAG,CAClC,EAAE,YAAY,EAAE,aAAa,EAAE,mBAAmB,EAA0C,EAC5F,MAAoB,EACpB,EAAE;IACF,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACtB,MAAM,QAAQ,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,OAAO,IAAI,MAAM,EACjE,KAAK,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,EACrC,MAAM,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EACnE,UAAU,GAAG,IAAA,kCAAgB,EAAC,QAAQ,CAAC,CAAC;QAE1C,OAAO;YACL,GAAG,CAAC;YACJ,UAAU;YACV,QAAQ;YACR,QAAQ,EAAE,QAAQ;YAClB,SAAS,EAAE,KAAK,EAAE,OAAO;YACzB,WAAW,EAAE,KAAK,EAAE,UAAU;YAC9B,UAAU,EAAE,MAAM,EAAE,WAAW;SAChC,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AApBW,QAAA,oBAAoB,wBAoB/B"}
|
package/dist/Filtering.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { FullFilter } from "prostgles-types";
|
|
2
2
|
import { type SelectItemValidated } from "./DboBuilder/QueryBuilder/QueryBuilder";
|
|
3
|
-
export declare const FILTER_OPERANDS: readonly ["$ilike", "$like", "$nilike", "$nlike", ...("?" | "@>" | "<@" | "?|" | "?&" | "||" | "
|
|
3
|
+
export declare const FILTER_OPERANDS: readonly ["$ilike", "$like", "$nilike", "$nlike", ...("?" | "-" | "@>" | "<@" | "?|" | "?&" | "||" | "#-" | "@?" | "@@")[], "=", "$eq", "<>", ">", "<", ">=", "<=", "$eq", "$ne", "$gt", "$gte", "$lt", "$lte", "$isDistinctFrom", "$isNotDistinctFrom", "$between", "$notBetween", "$in", "$nin"];
|
|
4
4
|
export declare const FILTER_OPERAND_TO_SQL_OPERAND: Record<(typeof FILTER_OPERANDS)[number], string>;
|
|
5
5
|
/**
|
|
6
6
|
* Parse a single filter
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type pg from "pg-promise/typescript/pg-subset";
|
|
1
2
|
import type { SQLHandler, SQLOptions } from "prostgles-types";
|
|
2
3
|
import { getSerialisableError, isDefined, tryCatchV2 } from "prostgles-types";
|
|
3
4
|
import { getDBGeneratedSchema } from "../DBSchemaBuilder/getDBGeneratedSchema";
|
|
@@ -34,30 +35,10 @@ import { prepareShortestJoinPaths } from "./prepareShortestJoinPaths";
|
|
|
34
35
|
import { cacheDBTypes, runSQL } from "./runSql/runSQL";
|
|
35
36
|
import { getDetailedFieldInfo, type getDbTypes } from "./runSql/runSqlUtils";
|
|
36
37
|
import { getTablesForSchemaPostgresSQL } from "./schema/getTablesForSchemaPostgresSQL";
|
|
37
|
-
import type pg from "pg-promise/typescript/pg-subset";
|
|
38
38
|
|
|
39
39
|
export * from "./DboBuilderTypes";
|
|
40
40
|
export * from "./dboBuilderUtils";
|
|
41
41
|
|
|
42
|
-
type OidInfo = {
|
|
43
|
-
/**
|
|
44
|
-
* Oid
|
|
45
|
-
*/
|
|
46
|
-
relid: number;
|
|
47
|
-
relname: string;
|
|
48
|
-
schemaname: string;
|
|
49
|
-
};
|
|
50
|
-
|
|
51
|
-
type TableOidInfo = OidInfo & {
|
|
52
|
-
pkey_columns: string[] | null;
|
|
53
|
-
};
|
|
54
|
-
|
|
55
|
-
type TableOidColumnInfo = OidInfo & {
|
|
56
|
-
column_name: string;
|
|
57
|
-
udt_name: string;
|
|
58
|
-
ordinal_position: number;
|
|
59
|
-
};
|
|
60
|
-
|
|
61
42
|
export class DboBuilder {
|
|
62
43
|
tablesOrViews?: TableSchema[];
|
|
63
44
|
/**
|
|
@@ -79,9 +60,8 @@ export class DboBuilder {
|
|
|
79
60
|
/**
|
|
80
61
|
* Used for db.sql field type details
|
|
81
62
|
*/
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
USER_TABLE_COLUMNS: TableOidColumnInfo[] | undefined;
|
|
63
|
+
dbTypesCache?: Awaited<ReturnType<typeof getDbTypes>>;
|
|
64
|
+
|
|
85
65
|
DATA_TYPES_DBKEY = "";
|
|
86
66
|
|
|
87
67
|
queryStreamer: QueryStreamer;
|
|
@@ -100,15 +80,9 @@ export class DboBuilder {
|
|
|
100
80
|
.filter(isDefined);
|
|
101
81
|
}
|
|
102
82
|
|
|
103
|
-
getDetailedFieldInfo = (fields: pg.IColumn[]) =>
|
|
104
|
-
getDetailedFieldInfo(
|
|
105
|
-
|
|
106
|
-
DATA_TYPES: this.DATA_TYPES!,
|
|
107
|
-
USER_TABLES: this.USER_TABLES!,
|
|
108
|
-
USER_TABLE_COLUMNS: this.USER_TABLE_COLUMNS!,
|
|
109
|
-
},
|
|
110
|
-
fields,
|
|
111
|
-
);
|
|
83
|
+
getDetailedFieldInfo = async (fields: pg.IColumn[]) => {
|
|
84
|
+
return getDetailedFieldInfo(await this.cacheDBTypes(), fields);
|
|
85
|
+
};
|
|
112
86
|
|
|
113
87
|
getPubSubManagerPromise?: Promise<PubSubManager>;
|
|
114
88
|
getPubSubManager = async (): Promise<PubSubManager> => {
|
|
@@ -122,6 +122,7 @@ export class QueryStreamer {
|
|
|
122
122
|
let streamState: "started" | "ended" | "errored" | undefined;
|
|
123
123
|
|
|
124
124
|
const startStream = async (client: pg.Client | undefined, query: ClientStreamedRequest) => {
|
|
125
|
+
await this.dboBuilder.cacheDBTypes();
|
|
125
126
|
const socketQuery = this.socketQueries.get(socketId)?.get(id);
|
|
126
127
|
if (!socketQuery) {
|
|
127
128
|
throw "socket query not found";
|
|
@@ -137,14 +138,7 @@ export class QueryStreamer {
|
|
|
137
138
|
| { reachedEnd: true; rows: any[]; info: Info }
|
|
138
139
|
| { reachedEnd: false; rows: any[]; info: Omit<Info, "command"> }) => {
|
|
139
140
|
if (!(info as any).fields) throw "No fields";
|
|
140
|
-
const fields = getDetailedFieldInfo(
|
|
141
|
-
{
|
|
142
|
-
DATA_TYPES: this.dboBuilder.DATA_TYPES!,
|
|
143
|
-
USER_TABLES: this.dboBuilder.USER_TABLES!,
|
|
144
|
-
USER_TABLE_COLUMNS: this.dboBuilder.USER_TABLE_COLUMNS!,
|
|
145
|
-
},
|
|
146
|
-
info.fields,
|
|
147
|
-
);
|
|
141
|
+
const fields = getDetailedFieldInfo(this.dboBuilder.dbTypesCache!, info.fields);
|
|
148
142
|
const packet: SocketSQLStreamPacket = {
|
|
149
143
|
type: "data",
|
|
150
144
|
rows,
|
|
@@ -32,8 +32,6 @@ export async function runSQL(
|
|
|
32
32
|
}
|
|
33
33
|
}
|
|
34
34
|
|
|
35
|
-
await this.cacheDBTypes();
|
|
36
|
-
|
|
37
35
|
if (!(await canRunSQL(this.prostgles, localParams?.clientReq))) {
|
|
38
36
|
throw "Not allowed to run SQL";
|
|
39
37
|
}
|
|
@@ -115,17 +113,11 @@ export async function runSQL(
|
|
|
115
113
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
|
|
116
114
|
return rows.map((r) => Object.values(r)[0]);
|
|
117
115
|
} else {
|
|
116
|
+
const typesCache = await this.cacheDBTypes();
|
|
118
117
|
const qres: SQLResult<typeof returnType> = {
|
|
119
118
|
duration: 0,
|
|
120
119
|
...queryResult,
|
|
121
|
-
fields: getDetailedFieldInfo(
|
|
122
|
-
{
|
|
123
|
-
DATA_TYPES: this.DATA_TYPES!,
|
|
124
|
-
USER_TABLES: this.USER_TABLES!,
|
|
125
|
-
USER_TABLE_COLUMNS: this.USER_TABLE_COLUMNS!,
|
|
126
|
-
},
|
|
127
|
-
fields,
|
|
128
|
-
),
|
|
120
|
+
fields: getDetailedFieldInfo(typesCache, fields),
|
|
129
121
|
};
|
|
130
122
|
return qres;
|
|
131
123
|
}
|
|
@@ -155,12 +147,10 @@ const onSQLResult = async function (
|
|
|
155
147
|
};
|
|
156
148
|
|
|
157
149
|
export async function cacheDBTypes(this: DboBuilder, force = false) {
|
|
158
|
-
if (force || !this.
|
|
159
|
-
|
|
160
|
-
this.DATA_TYPES ??= DATA_TYPES;
|
|
161
|
-
this.USER_TABLES ??= USER_TABLES;
|
|
162
|
-
this.USER_TABLE_COLUMNS ??= USER_TABLE_COLUMNS;
|
|
150
|
+
if (force || !this.dbTypesCache) {
|
|
151
|
+
this.dbTypesCache = await getDbTypes(this.db);
|
|
163
152
|
}
|
|
153
|
+
return this.dbTypesCache;
|
|
164
154
|
}
|
|
165
155
|
|
|
166
156
|
export const canRunSQL = async (
|
|
@@ -3,11 +3,11 @@ import { postgresToTsType, type PG_COLUMN_UDT_DATA_TYPE } from "prostgles-types"
|
|
|
3
3
|
import type { DB } from "../../Prostgles";
|
|
4
4
|
|
|
5
5
|
export const getDbTypes = async (db: DB) => {
|
|
6
|
-
const
|
|
6
|
+
const dataTypes = await db.any<{
|
|
7
7
|
oid: number;
|
|
8
8
|
typname: PG_COLUMN_UDT_DATA_TYPE;
|
|
9
9
|
}>("SELECT oid, typname FROM pg_type");
|
|
10
|
-
const
|
|
10
|
+
const userTables = await db.any<{
|
|
11
11
|
relid: number;
|
|
12
12
|
relname: string;
|
|
13
13
|
schemaname: string;
|
|
@@ -29,7 +29,9 @@ export const getDbTypes = async (db: DB) => {
|
|
|
29
29
|
ON t.relid = c.table_oid
|
|
30
30
|
GROUP BY relid, relname, schemaname
|
|
31
31
|
`);
|
|
32
|
-
const
|
|
32
|
+
const dataTypesMap = new Map(dataTypes.map((dt) => [Number(dt.oid), dt]));
|
|
33
|
+
const userTablesMap = new Map(userTables.map((t) => [Number(t.relid), t]));
|
|
34
|
+
const userTableColumns = await db.any<{
|
|
33
35
|
relid: number;
|
|
34
36
|
schemaname: string;
|
|
35
37
|
relname: string;
|
|
@@ -42,19 +44,20 @@ export const getDbTypes = async (db: DB) => {
|
|
|
42
44
|
INNER JOIN pg_catalog.pg_statio_user_tables t
|
|
43
45
|
ON c.table_schema = t.schemaname AND c.table_name = t.relname
|
|
44
46
|
`);
|
|
45
|
-
|
|
47
|
+
const userTableColumnsMap = new Map(
|
|
48
|
+
userTableColumns.map((c) => [[c.relid, c.ordinal_position].join("-"), c]),
|
|
49
|
+
);
|
|
50
|
+
return { dataTypesMap, userTablesMap, userTableColumnsMap };
|
|
46
51
|
};
|
|
47
52
|
|
|
48
53
|
export const getDetailedFieldInfo = (
|
|
49
|
-
{
|
|
54
|
+
{ dataTypesMap, userTablesMap, userTableColumnsMap }: Awaited<ReturnType<typeof getDbTypes>>,
|
|
50
55
|
fields: pg.IColumn[],
|
|
51
56
|
) => {
|
|
52
57
|
return fields.map((f) => {
|
|
53
|
-
const dataType =
|
|
54
|
-
table =
|
|
55
|
-
column =
|
|
56
|
-
(c) => +c.relid === +f.tableID && c.ordinal_position === f.columnID,
|
|
57
|
-
),
|
|
58
|
+
const dataType = dataTypesMap.get(+f.dataTypeID)?.typname ?? "text",
|
|
59
|
+
table = userTablesMap.get(+f.tableID),
|
|
60
|
+
column = userTableColumnsMap.get([f.tableID, f.columnID].join("-")),
|
|
58
61
|
tsDataType = postgresToTsType(dataType);
|
|
59
62
|
|
|
60
63
|
return {
|