prostgles-server 4.2.349 → 4.2.352
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/ViewRelatedTables/getViewRelatedTableJoinCondition.d.ts.map +1 -1
- package/dist/DboBuilder/ViewRelatedTables/getViewRelatedTableJoinCondition.js +11 -12
- package/dist/DboBuilder/ViewRelatedTables/getViewRelatedTableJoinCondition.js.map +1 -1
- package/dist/DboBuilder/ViewRelatedTables/getViewRelatedTables.d.ts +1 -1
- package/dist/DboBuilder/ViewRelatedTables/getViewRelatedTables.d.ts.map +1 -1
- package/dist/DboBuilder/ViewRelatedTables/getViewRelatedTables.js +2 -2
- package/dist/DboBuilder/ViewRelatedTables/getViewRelatedTables.js.map +1 -1
- package/dist/DboBuilder/schema/getTablesForSchemaPostgresSQL.d.ts.map +1 -1
- package/dist/DboBuilder/schema/getTablesForSchemaPostgresSQL.js +2 -3
- package/dist/DboBuilder/schema/getTablesForSchemaPostgresSQL.js.map +1 -1
- package/dist/TableConfig/TableConfig.d.ts.map +1 -1
- package/dist/TableConfig/TableConfig.js.map +1 -1
- package/dist/getDbConnection.d.ts +9 -0
- package/dist/getDbConnection.d.ts.map +1 -0
- package/dist/getDbConnection.js +79 -0
- package/dist/getDbConnection.js.map +1 -0
- package/dist/initProstgles.d.ts +2 -2
- package/dist/initProstgles.d.ts.map +1 -1
- package/dist/initProstgles.js +11 -81
- package/dist/initProstgles.js.map +1 -1
- package/lib/DboBuilder/ViewRelatedTables/getViewRelatedTableJoinCondition.ts +11 -12
- package/lib/DboBuilder/ViewRelatedTables/getViewRelatedTables.ts +2 -2
- package/lib/DboBuilder/schema/getTablesForSchemaPostgresSQL.ts +4 -5
- package/lib/TableConfig/TableConfig.ts +2 -3
- package/lib/getDbConnection.ts +91 -0
- package/lib/initProstgles.ts +23 -99
- package/package.json +2 -2
- package/dist/DboBuilder/ViewRelatedTables/fetchAllViewRelatedTables.d.ts +0 -7
- package/dist/DboBuilder/ViewRelatedTables/fetchAllViewRelatedTables.d.ts.map +0 -1
- package/dist/DboBuilder/ViewRelatedTables/fetchAllViewRelatedTables.js +0 -18
- package/dist/DboBuilder/ViewRelatedTables/fetchAllViewRelatedTables.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getViewRelatedTableJoinCondition.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewRelatedTables/getViewRelatedTableJoinCondition.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC7D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAE7D,eAAO,MAAM,gCAAgC;gBAO/B,UAAU;oBACN,MAAM;qBACL,MAAM;cACb,QAAQ;gBACN,IACV,MAAM,EACN;QACE,KAAK,EAAE,WAAW,CAAC;QACnB,OAAO,EAAE;YACP,cAAc,EAAE,MAAM,CAAC;YACvB,cAAc,EAAE,MAAM,CAAC;YACvB,eAAe,EAAE,MAAM,CAAC;SACzB,EAAE,CAAC;KACL,CACF;;;;;;
|
|
1
|
+
{"version":3,"file":"getViewRelatedTableJoinCondition.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewRelatedTables/getViewRelatedTableJoinCondition.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC7D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAE7D,eAAO,MAAM,gCAAgC;gBAO/B,UAAU;oBACN,MAAM;qBACL,MAAM;cACb,QAAQ;gBACN,IACV,MAAM,EACN;QACE,KAAK,EAAE,WAAW,CAAC;QACnB,OAAO,EAAE;YACP,cAAc,EAAE,MAAM,CAAC;YACvB,cAAc,EAAE,MAAM,CAAC;YACvB,eAAe,EAAE,MAAM,CAAC;SACzB,EAAE,CAAC;KACL,CACF;;;;;;IAuEF,CAAC"}
|
|
@@ -23,17 +23,17 @@ const getViewRelatedTableJoinCondition = async ({ dboBuilder, viewDefinition, vi
|
|
|
23
23
|
if (joinColumns.length) {
|
|
24
24
|
try {
|
|
25
25
|
const { count } = await db.one(`
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
26
|
+
WITH ${tableName} AS (
|
|
27
|
+
SELECT *
|
|
28
|
+
FROM ${tableName}
|
|
29
|
+
LIMIT 0
|
|
30
|
+
)
|
|
31
|
+
|
|
32
|
+
SELECT COUNT(*) as count
|
|
33
|
+
FROM (
|
|
34
|
+
${viewDefinition}
|
|
35
|
+
) prostgles_view_ref_table_test
|
|
36
|
+
`);
|
|
37
37
|
const fullCondition = `
|
|
38
38
|
EXISTS (
|
|
39
39
|
SELECT 1
|
|
@@ -42,7 +42,6 @@ const getViewRelatedTableJoinCondition = async ({ dboBuilder, viewDefinition, vi
|
|
|
42
42
|
AND ${newQuery.whereOpts.condition || "TRUE"}
|
|
43
43
|
)`;
|
|
44
44
|
if (count.toString() === "0") {
|
|
45
|
-
// return relatedTableSubscription;
|
|
46
45
|
condition = fullCondition;
|
|
47
46
|
}
|
|
48
47
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getViewRelatedTableJoinCondition.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewRelatedTables/getViewRelatedTableJoinCondition.ts"],"names":[],"mappings":";;;AAAA,qDAA4C;AAC5C,+EAA6D;AAItD,MAAM,gCAAgC,GAAG,KAAK,EAAE,EACrD,UAAU,EACV,cAAc,EACd,UAAU,EACV,eAAe,EACf,QAAQ,GAiBT,EAAE,EAAE;IACH,MAAM,EAAE,GAAG,UAAU,CAAC,EAAE,CAAC;IACzB,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAC3B,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE;QAC3E,wCAAwC;QACxC,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;YAC5C,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,CACjC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,KAAK,EAAE,CAAC,gBAAgB,CAChD,EAAE,cAAc,CAAC;YAClB,OAAO;gBACL,GAAG,EAAE;gBACL,cAAc;aACf,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,MAAM,iBAAiB,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QAChE,MAAM,kBAAkB,GAAG,YAAY,CAAC,MAAM,CAC5C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,IAAI,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CACjE,CAAC;QACF,MAAM,oBAAoB,GACxB,iBAAiB,CAAC,MAAM,IAAI,iBAAiB,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAA,2BAAS,EAAC,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC;QAE5F,MAAM,WAAW,GAAG,oBAAoB,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,kBAAkB,CAAC;QAElF,IAAI,SAAS,GAAG,MAAM,CAAC;QAEvB,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC;QAC7B,IAAI,WAAW,CAAC,MAAM,EAAE,CAAC;YACvB,IAAI,CAAC;gBACH,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,EAAE,CAAC,GAAG,CAAoB;
|
|
1
|
+
{"version":3,"file":"getViewRelatedTableJoinCondition.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewRelatedTables/getViewRelatedTableJoinCondition.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import type { LocalParams } from "../DboBuilder";
|
|
|
2
2
|
import type { NewQuery } from "../QueryBuilder/QueryBuilder";
|
|
3
3
|
import type { ViewHandler } from "../ViewHandler/ViewHandler";
|
|
4
4
|
export declare const getViewRelatedTables: (viewHandler: ViewHandler, localParams: LocalParams | undefined, newQuery: NewQuery) => Promise<{
|
|
5
|
-
type: "view";
|
|
5
|
+
type: "view"; /** Get list of remaining used inner tables (tables whose columns do not appear in fields list but are still used by the view) */
|
|
6
6
|
viewName: string;
|
|
7
7
|
definition: string;
|
|
8
8
|
} & {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getViewRelatedTables.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewRelatedTables/getViewRelatedTables.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAe,MAAM,eAAe,CAAC;AAE9D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAI9D,eAAO,MAAM,oBAAoB,gBAClB,WAAW,eACX,WAAW,GAAG,SAAS,YAC1B,QAAQ
|
|
1
|
+
{"version":3,"file":"getViewRelatedTables.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewRelatedTables/getViewRelatedTables.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAe,MAAM,eAAe,CAAC;AAE9D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAI9D,eAAO,MAAM,oBAAoB,gBAClB,WAAW,eACX,WAAW,GAAG,SAAS,YAC1B,QAAQ;kBA8DlB,iIAAiI;;;;;;;;;EAmBlI,CAAC"}
|
|
@@ -6,7 +6,7 @@ const getAllViewRelatedTables_1 = require("./getAllViewRelatedTables");
|
|
|
6
6
|
const getViewRelatedTableJoinCondition_1 = require("./getViewRelatedTableJoinCondition");
|
|
7
7
|
const getViewRelatedTables = async (viewHandler, localParams, newQuery) => {
|
|
8
8
|
/** TODO: this needs to be memoized on schema fetch */
|
|
9
|
-
const { name: viewName,
|
|
9
|
+
const { name: viewName, dboBuilder } = viewHandler;
|
|
10
10
|
/** Get list of used columns and their parent tables */
|
|
11
11
|
const { view_definition = "" } = viewHandler.tableOrViewInfo;
|
|
12
12
|
let definition = view_definition?.trim();
|
|
@@ -39,7 +39,7 @@ const getViewRelatedTables = async (viewHandler, localParams, newQuery) => {
|
|
|
39
39
|
dboBuilder,
|
|
40
40
|
viewDefinition: definition,
|
|
41
41
|
viewTables,
|
|
42
|
-
viewNameEscaped,
|
|
42
|
+
viewNameEscaped: viewName,
|
|
43
43
|
newQuery,
|
|
44
44
|
});
|
|
45
45
|
const viewOptions = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getViewRelatedTables.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewRelatedTables/getViewRelatedTables.ts"],"names":[],"mappings":";;;AAEA,wDAAyE;AAGzE,uEAAoE;AACpE,yFAAsF;AAE/E,MAAM,oBAAoB,GAAG,KAAK,EACvC,WAAwB,EACxB,WAAoC,EACpC,QAAkB,EAClB,EAAE;IACF,sDAAsD;IACtD,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"getViewRelatedTables.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewRelatedTables/getViewRelatedTables.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getTablesForSchemaPostgresSQL.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/schema/getTablesForSchemaPostgresSQL.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAEjE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAAE,WAAW,EAAqB,MAAM,oBAAoB,CAAC;AAKzE,eAAO,MAAM,eAAe,YAAY,oBAAoB,CAAC,cAAc,CAAC;;;CAW3E,CAAC;AAIF,wBAAsB,6BAA6B,CACjD,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,GAAG,QAAQ,CAAC,EACjD,YAAY,EAAE,oBAAoB,CAAC,cAAc,CAAC,GACjD,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/schema/getTablesForSchemaPostgresSQL.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAEjE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAAE,WAAW,EAAqB,MAAM,oBAAoB,CAAC;AAKzE,eAAO,MAAM,eAAe,YAAY,oBAAoB,CAAC,cAAc,CAAC;;;CAW3E,CAAC;AAIF,wBAAsB,6BAA6B,CACjD,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,GAAG,QAAQ,CAAC,EACjD,YAAY,EAAE,oBAAoB,CAAC,cAAc,CAAC,GACjD,OAAO,CAAC;IACT,MAAM,EAAE,WAAW,EAAE,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACnC,CAAC,CAuSD"}
|
|
@@ -28,8 +28,8 @@ async function getTablesForSchemaPostgresSQL({ db, runSQL }, schemaFilter) {
|
|
|
28
28
|
* Multiple queries to reduce load on low power machines
|
|
29
29
|
*/
|
|
30
30
|
const { data: { fkeys }, duration: fkeysResponseDuration, } = await (0, getFkeys_1.getFkeys)(t, { sql, schemaNames });
|
|
31
|
-
const uniqueColsReq = await (0, prostgles_types_1.tryCatchV2)(
|
|
32
|
-
|
|
31
|
+
const uniqueColsReq = await (0, prostgles_types_1.tryCatchV2)(() => {
|
|
32
|
+
return t.any(`
|
|
33
33
|
select
|
|
34
34
|
t.relname as table_name,
|
|
35
35
|
(SELECT pnm.nspname FROM pg_catalog.pg_namespace pnm WHERE pnm.oid = i.relnamespace) as table_schema,
|
|
@@ -52,7 +52,6 @@ async function getTablesForSchemaPostgresSQL({ db, runSQL }, schemaFilter) {
|
|
|
52
52
|
t.relname,
|
|
53
53
|
i.relname;
|
|
54
54
|
`);
|
|
55
|
-
return res;
|
|
56
55
|
});
|
|
57
56
|
if (uniqueColsReq.error) {
|
|
58
57
|
throw uniqueColsReq.error;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getTablesForSchemaPostgresSQL.js","sourceRoot":"","sources":["../../../lib/DboBuilder/schema/getTablesForSchemaPostgresSQL.ts"],"names":[],"mappings":";;;AAAA,qDAAqD;AACrD,oDAAqD;AAGrD,6CAA0C;AAG1C,0CAAuC;AACvC,yDAAsD;AACtD,uEAAoE;AAE7D,MAAM,eAAe,GAAG,CAAC,SAA+C,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE;IAC9F,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,EAAE,CAAC,CAAC,CAAC,CAAC;IAC1D,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC;QACxB,MAAM,kCAAkC,CAAC;IAC3C,CAAC;IAED,OAAO;QACL,GAAG,EAAE,IAAI,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,0BAA0B;QAC5D,WAAW;KACZ,CAAC;AACJ,CAAC,CAAC;AAXW,QAAA,eAAe,mBAW1B;AAEF,sDAAsD;AACtD,oIAAoI;AAC7H,KAAK,UAAU,6BAA6B,CACjD,EAAE,EAAE,EAAE,MAAM,EAAqC,EACjD,YAAkD;IAKlD,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,IAAA,uBAAe,EAAC,YAAY,CAAC,CAAC;IAE3D,OAAO,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;QACvB;;WAEG;QACH,MAAM,EACJ,IAAI,EAAE,EAAE,KAAK,EAAE,EACf,QAAQ,EAAE,qBAAqB,GAChC,GAAG,MAAM,IAAA,mBAAQ,EAAC,CAAC,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,CAAC,CAAC;QAE5C,MAAM,aAAa,GAAG,MAAM,IAAA,4BAAU,EAAC,
|
|
1
|
+
{"version":3,"file":"getTablesForSchemaPostgresSQL.js","sourceRoot":"","sources":["../../../lib/DboBuilder/schema/getTablesForSchemaPostgresSQL.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TableConfig.d.ts","sourceRoot":"","sources":["../../lib/TableConfig/TableConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EACpB,iBAAiB,EACjB,SAAS,EACT,UAAU,EACV,KAAK,EACL,SAAS,
|
|
1
|
+
{"version":3,"file":"TableConfig.d.ts","sourceRoot":"","sources":["../../lib/TableConfig/TableConfig.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TableConfig.js","sourceRoot":"","sources":["../../lib/TableConfig/TableConfig.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"TableConfig.js","sourceRoot":"","sources":["../../lib/TableConfig/TableConfig.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import type { ProstglesInitOptions } from "./ProstglesTypes";
|
|
2
|
+
import type { DB, PGP } from "./initProstgles";
|
|
3
|
+
type GetDbConnectionArgs = Pick<ProstglesInitOptions, "DEBUG_MODE" | "onQuery" | "dbConnection" | "onNotice" | "onConnectionError">;
|
|
4
|
+
export declare const getDbConnection: ({ dbConnection, onQuery, onConnectionError, DEBUG_MODE, onNotice, }: GetDbConnectionArgs) => {
|
|
5
|
+
db: DB;
|
|
6
|
+
pgp: PGP;
|
|
7
|
+
};
|
|
8
|
+
export {};
|
|
9
|
+
//# sourceMappingURL=getDbConnection.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getDbConnection.d.ts","sourceRoot":"","sources":["../lib/getDbConnection.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,KAAK,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAG/C,KAAK,mBAAmB,GAAG,IAAI,CAC7B,oBAAoB,EACpB,YAAY,GAAG,SAAS,GAAG,cAAc,GAAG,UAAU,GAAG,mBAAmB,CAC7E,CAAC;AACF,eAAO,MAAM,eAAe,wEAMzB,mBAAmB;;SAAkB,GAAG;CA2E1C,CAAC"}
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getDbConnection = void 0;
|
|
4
|
+
const pgPromise = require("pg-promise");
|
|
5
|
+
const getDbConnection = function ({ dbConnection, onQuery, onConnectionError, DEBUG_MODE, onNotice, }) {
|
|
6
|
+
const onQueryOrError = !onQuery && !DEBUG_MODE ?
|
|
7
|
+
undefined
|
|
8
|
+
: (error, ctx) => {
|
|
9
|
+
if (onQuery) {
|
|
10
|
+
onQuery(error, ctx);
|
|
11
|
+
}
|
|
12
|
+
else if (DEBUG_MODE) {
|
|
13
|
+
if (error) {
|
|
14
|
+
console.error(error, ctx);
|
|
15
|
+
}
|
|
16
|
+
else {
|
|
17
|
+
console.log(ctx);
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
};
|
|
21
|
+
const pgp = pgPromise({
|
|
22
|
+
...(onQueryOrError && {
|
|
23
|
+
query: (ctx) => onQueryOrError(undefined, ctx),
|
|
24
|
+
}),
|
|
25
|
+
error: (err, ctx) => {
|
|
26
|
+
if (ctx.cn) {
|
|
27
|
+
onConnectionError?.(err, ctx);
|
|
28
|
+
}
|
|
29
|
+
onQueryOrError?.(err, ctx);
|
|
30
|
+
},
|
|
31
|
+
...((onNotice || DEBUG_MODE) && {
|
|
32
|
+
connect: function ({ client, useCount }) {
|
|
33
|
+
const isFresh = !useCount;
|
|
34
|
+
if (isFresh && !client.listeners("notice").length) {
|
|
35
|
+
client.on("notice", function (msg) {
|
|
36
|
+
if (onNotice) {
|
|
37
|
+
onNotice(msg, msg?.message);
|
|
38
|
+
}
|
|
39
|
+
else {
|
|
40
|
+
console.log("notice: %j", msg?.message);
|
|
41
|
+
}
|
|
42
|
+
});
|
|
43
|
+
}
|
|
44
|
+
if (isFresh && !client.listeners("error").length) {
|
|
45
|
+
client.on("error", function (msg) {
|
|
46
|
+
if (onNotice) {
|
|
47
|
+
onNotice(msg, msg?.message);
|
|
48
|
+
}
|
|
49
|
+
else {
|
|
50
|
+
console.log("error: %j", msg?.message);
|
|
51
|
+
}
|
|
52
|
+
});
|
|
53
|
+
}
|
|
54
|
+
},
|
|
55
|
+
}),
|
|
56
|
+
});
|
|
57
|
+
// pgp.pg.defaults.max = 70;
|
|
58
|
+
// /* Casts count/sum/max to bigint. Needs rework to remove casting "+count" and other issues; */
|
|
59
|
+
// pgp.pg.types.setTypeParser(20, BigInt);
|
|
60
|
+
/**
|
|
61
|
+
* Prevent timestamp casting to ensure we don't lose the microseconds.
|
|
62
|
+
* This is needed to ensure the filters work as expected for a given row
|
|
63
|
+
*
|
|
64
|
+
register(1114, parseTimestamp) // timestamp without time zone
|
|
65
|
+
register(1184, parseTimestampTz) // timestamp with time zone
|
|
66
|
+
*/
|
|
67
|
+
// pgp.pg.types.setTypeParser(1114, v => v); // timestamp without time zone
|
|
68
|
+
// pgp.pg.types.setTypeParser(1184, v => v); // timestamp with time zone
|
|
69
|
+
// pgp.pg.types.setTypeParser(1182, v => v); // date
|
|
70
|
+
pgp.pg.types.setTypeParser(pgp.pg.types.builtins.TIMESTAMP, (v) => v); // timestamp without time zone
|
|
71
|
+
pgp.pg.types.setTypeParser(pgp.pg.types.builtins.TIMESTAMPTZ, (v) => v); // timestamp with time zone
|
|
72
|
+
pgp.pg.types.setTypeParser(pgp.pg.types.builtins.DATE, (v) => v); // date
|
|
73
|
+
return {
|
|
74
|
+
db: pgp(dbConnection),
|
|
75
|
+
pgp,
|
|
76
|
+
};
|
|
77
|
+
};
|
|
78
|
+
exports.getDbConnection = getDbConnection;
|
|
79
|
+
//# sourceMappingURL=getDbConnection.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getDbConnection.js","sourceRoot":"","sources":["../lib/getDbConnection.ts"],"names":[],"mappings":"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"}
|
package/dist/initProstgles.d.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import * as pgPromise from "pg-promise";
|
|
2
1
|
import type pg from "pg-promise/typescript/pg-subset";
|
|
3
2
|
import type { AuthClientRequest, SessionUser } from "./Auth/AuthTypes";
|
|
4
3
|
import type { DBOFullyTyped } from "./DBSchemaBuilder/DBSchemaBuilder";
|
|
@@ -7,6 +6,7 @@ import type { ProstglesInitOptions } from "./ProstglesTypes";
|
|
|
7
6
|
import type { DbTableInfo } from "./PublishParser/PublishParser";
|
|
8
7
|
import { type PermissionScope } from "./PublishParser/PublishParser";
|
|
9
8
|
import { getClientHandlers } from "./WebsocketAPI/getClientHandlers";
|
|
9
|
+
import type pgPromise from "pg-promise";
|
|
10
10
|
/**
|
|
11
11
|
* Database connection details
|
|
12
12
|
*/
|
|
@@ -18,7 +18,7 @@ string | pg.IConnectionParameters<pg.IClient>;
|
|
|
18
18
|
export type DbConnectionOpts = pg.IDefaults;
|
|
19
19
|
export type PGP = pgPromise.IMain<{}, pg.IClient>;
|
|
20
20
|
export type DB = pgPromise.IDatabase<{}, pg.IClient>;
|
|
21
|
-
export type UpdateableOptions<S = void, SUser extends SessionUser = SessionUser> = Pick<ProstglesInitOptions<S, SUser>, "fileTable" | "restApi" | "tableConfig" | "schemaFilter" | "auth">;
|
|
21
|
+
export type UpdateableOptions<S = void, SUser extends SessionUser = SessionUser> = Pick<ProstglesInitOptions<S, SUser>, "fileTable" | "restApi" | "tableConfig" | "schemaFilter" | "auth" | "publish" | "publishMethods" | "publishRawSQL">;
|
|
22
22
|
export type OnInitReason = {
|
|
23
23
|
type: "schema change";
|
|
24
24
|
query: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initProstgles.d.ts","sourceRoot":"","sources":["../lib/initProstgles.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"initProstgles.d.ts","sourceRoot":"","sources":["../lib/initProstgles.ts"],"names":[],"mappings":"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"}
|
package/dist/initProstgles.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.initProstgles = void 0;
|
|
4
|
-
const pgPromise = require("pg-promise");
|
|
5
4
|
const prostgles_types_1 = require("prostgles-types");
|
|
6
5
|
const removeExpressRoute_1 = require("./Auth/utils/removeExpressRoute");
|
|
7
6
|
const DBEventsManager_1 = require("./DBEventsManager");
|
|
@@ -11,6 +10,7 @@ const SchemaWatch_1 = require("./SchemaWatch/SchemaWatch");
|
|
|
11
10
|
const runSQLFile_1 = require("./TableConfig/runSQLFile");
|
|
12
11
|
const utils_1 = require("./utils/utils");
|
|
13
12
|
const getClientHandlers_1 = require("./WebsocketAPI/getClientHandlers");
|
|
13
|
+
const getDbConnection_1 = require("./getDbConnection");
|
|
14
14
|
const clientOnlyUpdateKeys = ["auth"];
|
|
15
15
|
const initProstgles = async function (onReady, reason) {
|
|
16
16
|
this.loaded = false;
|
|
@@ -46,7 +46,7 @@ const initProstgles = async function (onReady, reason) {
|
|
|
46
46
|
: this.opts.dbConnection;
|
|
47
47
|
const application_name = `prostgles ${this.appId} ${existingAppName}`;
|
|
48
48
|
/* 1. Connect to db */
|
|
49
|
-
const { db, pgp } = getDbConnection({
|
|
49
|
+
const { db, pgp } = (0, getDbConnection_1.getDbConnection)({
|
|
50
50
|
onQuery: this.opts.onQuery,
|
|
51
51
|
onConnectionError: this.opts.onConnectionError,
|
|
52
52
|
DEBUG_MODE: this.opts.DEBUG_MODE,
|
|
@@ -115,15 +115,18 @@ const initProstgles = async function (onReady, reason) {
|
|
|
115
115
|
getTSSchema: this.getTSFileContent,
|
|
116
116
|
options: this.opts,
|
|
117
117
|
update: async (newOpts) => {
|
|
118
|
-
|
|
119
|
-
|
|
118
|
+
const optionsThatChanged = (0, prostgles_types_1.getObjectEntries)(newOpts)
|
|
119
|
+
.map((entry) => {
|
|
120
|
+
const [k, v] = entry;
|
|
120
121
|
if (!(0, prostgles_types_1.isEqual)(this.opts[k], newOpts[k])) {
|
|
121
|
-
optsHaveChanged = true;
|
|
122
122
|
//@ts-ignore
|
|
123
|
-
this.opts[k] =
|
|
123
|
+
this.opts[k] = v;
|
|
124
|
+
return entry;
|
|
124
125
|
}
|
|
125
|
-
|
|
126
|
-
|
|
126
|
+
return;
|
|
127
|
+
})
|
|
128
|
+
.filter(prostgles_types_1.isDefined);
|
|
129
|
+
if (!optionsThatChanged.length) {
|
|
127
130
|
console.warn("No options changed");
|
|
128
131
|
return;
|
|
129
132
|
}
|
|
@@ -193,77 +196,4 @@ const initProstgles = async function (onReady, reason) {
|
|
|
193
196
|
}
|
|
194
197
|
};
|
|
195
198
|
exports.initProstgles = initProstgles;
|
|
196
|
-
const getDbConnection = function ({ dbConnection, onQuery, onConnectionError, DEBUG_MODE, onNotice, }) {
|
|
197
|
-
const onQueryOrError = !onQuery && !DEBUG_MODE ?
|
|
198
|
-
undefined
|
|
199
|
-
: (error, ctx) => {
|
|
200
|
-
if (onQuery) {
|
|
201
|
-
onQuery(error, ctx);
|
|
202
|
-
}
|
|
203
|
-
else if (DEBUG_MODE) {
|
|
204
|
-
if (error) {
|
|
205
|
-
console.error(error, ctx);
|
|
206
|
-
}
|
|
207
|
-
else {
|
|
208
|
-
console.log(ctx);
|
|
209
|
-
}
|
|
210
|
-
}
|
|
211
|
-
};
|
|
212
|
-
const pgp = pgPromise({
|
|
213
|
-
...(onQueryOrError && {
|
|
214
|
-
query: (ctx) => onQueryOrError(undefined, ctx),
|
|
215
|
-
}),
|
|
216
|
-
error: (err, ctx) => {
|
|
217
|
-
if (ctx.cn) {
|
|
218
|
-
onConnectionError?.(err, ctx);
|
|
219
|
-
}
|
|
220
|
-
onQueryOrError?.(err, ctx);
|
|
221
|
-
},
|
|
222
|
-
...((onNotice || DEBUG_MODE) && {
|
|
223
|
-
connect: function ({ client, useCount }) {
|
|
224
|
-
const isFresh = !useCount;
|
|
225
|
-
if (isFresh && !client.listeners("notice").length) {
|
|
226
|
-
client.on("notice", function (msg) {
|
|
227
|
-
if (onNotice) {
|
|
228
|
-
onNotice(msg, msg?.message);
|
|
229
|
-
}
|
|
230
|
-
else {
|
|
231
|
-
console.log("notice: %j", msg?.message);
|
|
232
|
-
}
|
|
233
|
-
});
|
|
234
|
-
}
|
|
235
|
-
if (isFresh && !client.listeners("error").length) {
|
|
236
|
-
client.on("error", function (msg) {
|
|
237
|
-
if (onNotice) {
|
|
238
|
-
onNotice(msg, msg?.message);
|
|
239
|
-
}
|
|
240
|
-
else {
|
|
241
|
-
console.log("error: %j", msg?.message);
|
|
242
|
-
}
|
|
243
|
-
});
|
|
244
|
-
}
|
|
245
|
-
},
|
|
246
|
-
}),
|
|
247
|
-
});
|
|
248
|
-
// pgp.pg.defaults.max = 70;
|
|
249
|
-
// /* Casts count/sum/max to bigint. Needs rework to remove casting "+count" and other issues; */
|
|
250
|
-
// pgp.pg.types.setTypeParser(20, BigInt);
|
|
251
|
-
/**
|
|
252
|
-
* Prevent timestamp casting to ensure we don't lose the microseconds.
|
|
253
|
-
* This is needed to ensure the filters work as expected for a given row
|
|
254
|
-
*
|
|
255
|
-
register(1114, parseTimestamp) // timestamp without time zone
|
|
256
|
-
register(1184, parseTimestampTz) // timestamp with time zone
|
|
257
|
-
*/
|
|
258
|
-
// pgp.pg.types.setTypeParser(1114, v => v); // timestamp without time zone
|
|
259
|
-
// pgp.pg.types.setTypeParser(1184, v => v); // timestamp with time zone
|
|
260
|
-
// pgp.pg.types.setTypeParser(1182, v => v); // date
|
|
261
|
-
pgp.pg.types.setTypeParser(pgp.pg.types.builtins.TIMESTAMP, (v) => v); // timestamp without time zone
|
|
262
|
-
pgp.pg.types.setTypeParser(pgp.pg.types.builtins.TIMESTAMPTZ, (v) => v); // timestamp with time zone
|
|
263
|
-
pgp.pg.types.setTypeParser(pgp.pg.types.builtins.DATE, (v) => v); // date
|
|
264
|
-
return {
|
|
265
|
-
db: pgp(dbConnection),
|
|
266
|
-
pgp,
|
|
267
|
-
};
|
|
268
|
-
};
|
|
269
199
|
//# sourceMappingURL=initProstgles.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initProstgles.js","sourceRoot":"","sources":["../lib/initProstgles.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"initProstgles.js","sourceRoot":"","sources":["../lib/initProstgles.ts"],"names":[],"mappings":"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"}
|
|
@@ -54,17 +54,17 @@ export const getViewRelatedTableJoinCondition = async ({
|
|
|
54
54
|
if (joinColumns.length) {
|
|
55
55
|
try {
|
|
56
56
|
const { count } = await db.one<{ count: number }>(`
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
57
|
+
WITH ${tableName} AS (
|
|
58
|
+
SELECT *
|
|
59
|
+
FROM ${tableName}
|
|
60
|
+
LIMIT 0
|
|
61
|
+
)
|
|
62
|
+
|
|
63
|
+
SELECT COUNT(*) as count
|
|
64
|
+
FROM (
|
|
65
|
+
${viewDefinition}
|
|
66
|
+
) prostgles_view_ref_table_test
|
|
67
|
+
`);
|
|
68
68
|
|
|
69
69
|
const fullCondition = `
|
|
70
70
|
EXISTS (
|
|
@@ -75,7 +75,6 @@ export const getViewRelatedTableJoinCondition = async ({
|
|
|
75
75
|
)`;
|
|
76
76
|
|
|
77
77
|
if (count.toString() === "0") {
|
|
78
|
-
// return relatedTableSubscription;
|
|
79
78
|
condition = fullCondition;
|
|
80
79
|
}
|
|
81
80
|
} catch (e) {
|
|
@@ -12,7 +12,7 @@ export const getViewRelatedTables = async (
|
|
|
12
12
|
newQuery: NewQuery
|
|
13
13
|
) => {
|
|
14
14
|
/** TODO: this needs to be memoized on schema fetch */
|
|
15
|
-
const { name: viewName,
|
|
15
|
+
const { name: viewName, dboBuilder } = viewHandler;
|
|
16
16
|
|
|
17
17
|
/** Get list of used columns and their parent tables */
|
|
18
18
|
const { view_definition = "" } = viewHandler.tableOrViewInfo;
|
|
@@ -60,7 +60,7 @@ export const getViewRelatedTables = async (
|
|
|
60
60
|
dboBuilder,
|
|
61
61
|
viewDefinition: definition,
|
|
62
62
|
viewTables,
|
|
63
|
-
viewNameEscaped,
|
|
63
|
+
viewNameEscaped: viewName,
|
|
64
64
|
newQuery,
|
|
65
65
|
});
|
|
66
66
|
|
|
@@ -42,13 +42,13 @@ export async function getTablesForSchemaPostgresSQL(
|
|
|
42
42
|
duration: fkeysResponseDuration,
|
|
43
43
|
} = await getFkeys(t, { sql, schemaNames });
|
|
44
44
|
|
|
45
|
-
const uniqueColsReq = await tryCatchV2(
|
|
46
|
-
|
|
45
|
+
const uniqueColsReq = await tryCatchV2(() => {
|
|
46
|
+
return t.any<{
|
|
47
47
|
table_name: string;
|
|
48
48
|
table_schema: string;
|
|
49
49
|
index_name: string;
|
|
50
50
|
column_names: string[];
|
|
51
|
-
}
|
|
51
|
+
}>(`
|
|
52
52
|
select
|
|
53
53
|
t.relname as table_name,
|
|
54
54
|
(SELECT pnm.nspname FROM pg_catalog.pg_namespace pnm WHERE pnm.oid = i.relnamespace) as table_schema,
|
|
@@ -71,8 +71,6 @@ export async function getTablesForSchemaPostgresSQL(
|
|
|
71
71
|
t.relname,
|
|
72
72
|
i.relname;
|
|
73
73
|
`);
|
|
74
|
-
|
|
75
|
-
return res;
|
|
76
74
|
});
|
|
77
75
|
|
|
78
76
|
if (uniqueColsReq.error) {
|
|
@@ -224,6 +222,7 @@ export async function getTablesForSchemaPostgresSQL(
|
|
|
224
222
|
table.columns = clone(getTVColumns.data!.columns)
|
|
225
223
|
.filter((c) => c.table_oid === table.oid)
|
|
226
224
|
.map((c) => omitKeys(c, ["table_oid"]));
|
|
225
|
+
|
|
227
226
|
table.parent_tables =
|
|
228
227
|
getViewParentTables.data?.parent_tables.find((vr) => vr.oid === table.oid)?.table_names ??
|
|
229
228
|
[];
|
|
@@ -4,10 +4,9 @@ import type {
|
|
|
4
4
|
AnyObject,
|
|
5
5
|
ColumnInfo,
|
|
6
6
|
JSONB,
|
|
7
|
-
TableInfo
|
|
8
|
-
import {
|
|
9
|
-
isObject
|
|
7
|
+
TableInfo,
|
|
10
8
|
} from "prostgles-types";
|
|
9
|
+
import { isObject } from "prostgles-types";
|
|
11
10
|
import type { JoinInfo, LocalParams } from "../DboBuilder/DboBuilder";
|
|
12
11
|
import type { TableHandler } from "../DboBuilder/TableHandler/TableHandler";
|
|
13
12
|
import { uploadFile } from "../DboBuilder/uploadFile";
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
import * as pgPromise from "pg-promise";
|
|
2
|
+
import type { ProstglesInitOptions } from "./ProstglesTypes";
|
|
3
|
+
import type { DB, PGP } from "./initProstgles";
|
|
4
|
+
import type pg from "pg-promise/typescript/pg-subset";
|
|
5
|
+
|
|
6
|
+
type GetDbConnectionArgs = Pick<
|
|
7
|
+
ProstglesInitOptions,
|
|
8
|
+
"DEBUG_MODE" | "onQuery" | "dbConnection" | "onNotice" | "onConnectionError"
|
|
9
|
+
>;
|
|
10
|
+
export const getDbConnection = function ({
|
|
11
|
+
dbConnection,
|
|
12
|
+
onQuery,
|
|
13
|
+
onConnectionError,
|
|
14
|
+
DEBUG_MODE,
|
|
15
|
+
onNotice,
|
|
16
|
+
}: GetDbConnectionArgs): { db: DB; pgp: PGP } {
|
|
17
|
+
const onQueryOrError:
|
|
18
|
+
| undefined
|
|
19
|
+
| ((error: any, ctx: pgPromise.IEventContext<pg.IClient>) => void) =
|
|
20
|
+
!onQuery && !DEBUG_MODE ?
|
|
21
|
+
undefined
|
|
22
|
+
: (error, ctx) => {
|
|
23
|
+
if (onQuery) {
|
|
24
|
+
onQuery(error, ctx);
|
|
25
|
+
} else if (DEBUG_MODE) {
|
|
26
|
+
if (error) {
|
|
27
|
+
console.error(error, ctx);
|
|
28
|
+
} else {
|
|
29
|
+
console.log(ctx);
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
};
|
|
33
|
+
|
|
34
|
+
const pgp: PGP = pgPromise({
|
|
35
|
+
...(onQueryOrError && {
|
|
36
|
+
query: (ctx) => onQueryOrError(undefined, ctx),
|
|
37
|
+
}),
|
|
38
|
+
error: (err: Error, ctx) => {
|
|
39
|
+
if (ctx.cn) {
|
|
40
|
+
onConnectionError?.(err, ctx);
|
|
41
|
+
}
|
|
42
|
+
onQueryOrError?.(err, ctx);
|
|
43
|
+
},
|
|
44
|
+
...((onNotice || DEBUG_MODE) && {
|
|
45
|
+
connect: function ({ client, useCount }) {
|
|
46
|
+
const isFresh = !useCount;
|
|
47
|
+
if (isFresh && !client.listeners("notice").length) {
|
|
48
|
+
client.on("notice", function (msg) {
|
|
49
|
+
if (onNotice) {
|
|
50
|
+
onNotice(msg, msg?.message);
|
|
51
|
+
} else {
|
|
52
|
+
console.log("notice: %j", msg?.message);
|
|
53
|
+
}
|
|
54
|
+
});
|
|
55
|
+
}
|
|
56
|
+
if (isFresh && !client.listeners("error").length) {
|
|
57
|
+
client.on("error", function (msg) {
|
|
58
|
+
if (onNotice) {
|
|
59
|
+
onNotice(msg, msg?.message);
|
|
60
|
+
} else {
|
|
61
|
+
console.log("error: %j", msg?.message);
|
|
62
|
+
}
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
},
|
|
66
|
+
}),
|
|
67
|
+
});
|
|
68
|
+
// pgp.pg.defaults.max = 70;
|
|
69
|
+
|
|
70
|
+
// /* Casts count/sum/max to bigint. Needs rework to remove casting "+count" and other issues; */
|
|
71
|
+
// pgp.pg.types.setTypeParser(20, BigInt);
|
|
72
|
+
|
|
73
|
+
/**
|
|
74
|
+
* Prevent timestamp casting to ensure we don't lose the microseconds.
|
|
75
|
+
* This is needed to ensure the filters work as expected for a given row
|
|
76
|
+
*
|
|
77
|
+
register(1114, parseTimestamp) // timestamp without time zone
|
|
78
|
+
register(1184, parseTimestampTz) // timestamp with time zone
|
|
79
|
+
*/
|
|
80
|
+
// pgp.pg.types.setTypeParser(1114, v => v); // timestamp without time zone
|
|
81
|
+
// pgp.pg.types.setTypeParser(1184, v => v); // timestamp with time zone
|
|
82
|
+
// pgp.pg.types.setTypeParser(1182, v => v); // date
|
|
83
|
+
pgp.pg.types.setTypeParser(pgp.pg.types.builtins.TIMESTAMP, (v) => v); // timestamp without time zone
|
|
84
|
+
pgp.pg.types.setTypeParser(pgp.pg.types.builtins.TIMESTAMPTZ, (v) => v); // timestamp with time zone
|
|
85
|
+
pgp.pg.types.setTypeParser(pgp.pg.types.builtins.DATE, (v) => v); // date
|
|
86
|
+
|
|
87
|
+
return {
|
|
88
|
+
db: pgp(dbConnection),
|
|
89
|
+
pgp,
|
|
90
|
+
};
|
|
91
|
+
};
|
package/lib/initProstgles.ts
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import * as pgPromise from "pg-promise";
|
|
2
1
|
import type pg from "pg-promise/typescript/pg-subset";
|
|
3
|
-
import { getKeys, isEmpty, isEqual } from "prostgles-types";
|
|
2
|
+
import { getKeys, getObjectEntries, isDefined, isEmpty, isEqual } from "prostgles-types";
|
|
4
3
|
import type { AuthClientRequest, SessionUser } from "./Auth/AuthTypes";
|
|
5
4
|
import { removeExpressRoutesTest } from "./Auth/utils/removeExpressRoute";
|
|
6
5
|
import { DBEventsManager } from "./DBEventsManager";
|
|
@@ -14,6 +13,8 @@ import { SchemaWatch } from "./SchemaWatch/SchemaWatch";
|
|
|
14
13
|
import { runSQLFile } from "./TableConfig/runSQLFile";
|
|
15
14
|
import { sleep } from "./utils/utils";
|
|
16
15
|
import { getClientHandlers } from "./WebsocketAPI/getClientHandlers";
|
|
16
|
+
import { getDbConnection } from "./getDbConnection";
|
|
17
|
+
import type pgPromise from "pg-promise";
|
|
17
18
|
|
|
18
19
|
/**
|
|
19
20
|
* Database connection details
|
|
@@ -30,7 +31,14 @@ export type DB = pgPromise.IDatabase<{}, pg.IClient>;
|
|
|
30
31
|
|
|
31
32
|
export type UpdateableOptions<S = void, SUser extends SessionUser = SessionUser> = Pick<
|
|
32
33
|
ProstglesInitOptions<S, SUser>,
|
|
33
|
-
|
|
34
|
+
| "fileTable"
|
|
35
|
+
| "restApi"
|
|
36
|
+
| "tableConfig"
|
|
37
|
+
| "schemaFilter"
|
|
38
|
+
| "auth"
|
|
39
|
+
| "publish"
|
|
40
|
+
| "publishMethods"
|
|
41
|
+
| "publishRawSQL"
|
|
34
42
|
>;
|
|
35
43
|
export type OnInitReason =
|
|
36
44
|
| {
|
|
@@ -201,15 +209,18 @@ export const initProstgles = async function (
|
|
|
201
209
|
getTSSchema: this.getTSFileContent,
|
|
202
210
|
options: this.opts,
|
|
203
211
|
update: async (newOpts) => {
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
212
|
+
const optionsThatChanged = getObjectEntries(newOpts)
|
|
213
|
+
.map((entry) => {
|
|
214
|
+
const [k, v] = entry;
|
|
215
|
+
if (!isEqual(this.opts[k], newOpts[k])) {
|
|
216
|
+
//@ts-ignore
|
|
217
|
+
this.opts[k] = v;
|
|
218
|
+
return entry;
|
|
219
|
+
}
|
|
220
|
+
return;
|
|
221
|
+
})
|
|
222
|
+
.filter(isDefined);
|
|
223
|
+
if (!optionsThatChanged.length) {
|
|
213
224
|
console.warn("No options changed");
|
|
214
225
|
return;
|
|
215
226
|
}
|
|
@@ -285,90 +296,3 @@ export const initProstgles = async function (
|
|
|
285
296
|
throw "init issues: " + (e as Error).toString();
|
|
286
297
|
}
|
|
287
298
|
};
|
|
288
|
-
|
|
289
|
-
type GetDbConnectionArgs = Pick<
|
|
290
|
-
ProstglesInitOptions,
|
|
291
|
-
"DEBUG_MODE" | "onQuery" | "dbConnection" | "onNotice" | "onConnectionError"
|
|
292
|
-
>;
|
|
293
|
-
const getDbConnection = function ({
|
|
294
|
-
dbConnection,
|
|
295
|
-
onQuery,
|
|
296
|
-
onConnectionError,
|
|
297
|
-
DEBUG_MODE,
|
|
298
|
-
onNotice,
|
|
299
|
-
}: GetDbConnectionArgs): { db: DB; pgp: PGP } {
|
|
300
|
-
const onQueryOrError:
|
|
301
|
-
| undefined
|
|
302
|
-
| ((error: any, ctx: pgPromise.IEventContext<pg.IClient>) => void) =
|
|
303
|
-
!onQuery && !DEBUG_MODE ?
|
|
304
|
-
undefined
|
|
305
|
-
: (error, ctx) => {
|
|
306
|
-
if (onQuery) {
|
|
307
|
-
onQuery(error, ctx);
|
|
308
|
-
} else if (DEBUG_MODE) {
|
|
309
|
-
if (error) {
|
|
310
|
-
console.error(error, ctx);
|
|
311
|
-
} else {
|
|
312
|
-
console.log(ctx);
|
|
313
|
-
}
|
|
314
|
-
}
|
|
315
|
-
};
|
|
316
|
-
|
|
317
|
-
const pgp: PGP = pgPromise({
|
|
318
|
-
...(onQueryOrError && {
|
|
319
|
-
query: (ctx) => onQueryOrError(undefined, ctx),
|
|
320
|
-
}),
|
|
321
|
-
error: (err: Error, ctx) => {
|
|
322
|
-
if (ctx.cn) {
|
|
323
|
-
onConnectionError?.(err, ctx);
|
|
324
|
-
}
|
|
325
|
-
onQueryOrError?.(err, ctx);
|
|
326
|
-
},
|
|
327
|
-
...((onNotice || DEBUG_MODE) && {
|
|
328
|
-
connect: function ({ client, useCount }) {
|
|
329
|
-
const isFresh = !useCount;
|
|
330
|
-
if (isFresh && !client.listeners("notice").length) {
|
|
331
|
-
client.on("notice", function (msg) {
|
|
332
|
-
if (onNotice) {
|
|
333
|
-
onNotice(msg, msg?.message);
|
|
334
|
-
} else {
|
|
335
|
-
console.log("notice: %j", msg?.message);
|
|
336
|
-
}
|
|
337
|
-
});
|
|
338
|
-
}
|
|
339
|
-
if (isFresh && !client.listeners("error").length) {
|
|
340
|
-
client.on("error", function (msg) {
|
|
341
|
-
if (onNotice) {
|
|
342
|
-
onNotice(msg, msg?.message);
|
|
343
|
-
} else {
|
|
344
|
-
console.log("error: %j", msg?.message);
|
|
345
|
-
}
|
|
346
|
-
});
|
|
347
|
-
}
|
|
348
|
-
},
|
|
349
|
-
}),
|
|
350
|
-
});
|
|
351
|
-
// pgp.pg.defaults.max = 70;
|
|
352
|
-
|
|
353
|
-
// /* Casts count/sum/max to bigint. Needs rework to remove casting "+count" and other issues; */
|
|
354
|
-
// pgp.pg.types.setTypeParser(20, BigInt);
|
|
355
|
-
|
|
356
|
-
/**
|
|
357
|
-
* Prevent timestamp casting to ensure we don't lose the microseconds.
|
|
358
|
-
* This is needed to ensure the filters work as expected for a given row
|
|
359
|
-
*
|
|
360
|
-
register(1114, parseTimestamp) // timestamp without time zone
|
|
361
|
-
register(1184, parseTimestampTz) // timestamp with time zone
|
|
362
|
-
*/
|
|
363
|
-
// pgp.pg.types.setTypeParser(1114, v => v); // timestamp without time zone
|
|
364
|
-
// pgp.pg.types.setTypeParser(1184, v => v); // timestamp with time zone
|
|
365
|
-
// pgp.pg.types.setTypeParser(1182, v => v); // date
|
|
366
|
-
pgp.pg.types.setTypeParser(pgp.pg.types.builtins.TIMESTAMP, (v) => v); // timestamp without time zone
|
|
367
|
-
pgp.pg.types.setTypeParser(pgp.pg.types.builtins.TIMESTAMPTZ, (v) => v); // timestamp with time zone
|
|
368
|
-
pgp.pg.types.setTypeParser(pgp.pg.types.builtins.DATE, (v) => v); // date
|
|
369
|
-
|
|
370
|
-
return {
|
|
371
|
-
db: pgp(dbConnection),
|
|
372
|
-
pgp,
|
|
373
|
-
};
|
|
374
|
-
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "prostgles-server",
|
|
3
|
-
"version": "4.2.
|
|
3
|
+
"version": "4.2.352",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -57,7 +57,7 @@
|
|
|
57
57
|
"pg": "^8.15.6",
|
|
58
58
|
"pg-cursor": "^2.14.6",
|
|
59
59
|
"pg-promise": "^11.13.0",
|
|
60
|
-
"prostgles-types": "^4.0.
|
|
60
|
+
"prostgles-types": "^4.0.184"
|
|
61
61
|
},
|
|
62
62
|
"devDependencies": {
|
|
63
63
|
"@eslint/js": "^9.22.0",
|
|
@@ -1,7 +0,0 @@
|
|
|
1
|
-
import type { DBHandlerServer } from "../DboBuilder";
|
|
2
|
-
export declare const fetchAllViewRelatedTables: (dbo: DBHandlerServer, viewName: string) => Promise<{
|
|
3
|
-
table_name: string;
|
|
4
|
-
table_schema: string;
|
|
5
|
-
table_oid: number;
|
|
6
|
-
}[]>;
|
|
7
|
-
//# sourceMappingURL=fetchAllViewRelatedTables.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"fetchAllViewRelatedTables.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewRelatedTables/fetchAllViewRelatedTables.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAErD,eAAO,MAAM,yBAAyB,QAAe,eAAe,YAAY,MAAM;gBAiBtE,MAAM;kBACJ,MAAM;eACT,MAAM;IAEpB,CAAC"}
|
|
@@ -1,18 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.fetchAllViewRelatedTables = void 0;
|
|
4
|
-
const fetchAllViewRelatedTables = async (dbo, viewName) => {
|
|
5
|
-
const tables = await dbo.sql(`
|
|
6
|
-
SELECT DISTINCT
|
|
7
|
-
vcu.table_name,
|
|
8
|
-
vcu.table_schema,
|
|
9
|
-
c.oid AS table_oid
|
|
10
|
-
FROM information_schema.view_column_usage vcu
|
|
11
|
-
JOIN pg_class c ON c.relname = vcu.table_name
|
|
12
|
-
JOIN pg_namespace n ON n.oid = c.relnamespace AND n.nspname = vcu.table_schema
|
|
13
|
-
WHERE vcu.view_name = \${viewName}
|
|
14
|
-
`, { viewName }, { returnType: "rows" });
|
|
15
|
-
return tables;
|
|
16
|
-
};
|
|
17
|
-
exports.fetchAllViewRelatedTables = fetchAllViewRelatedTables;
|
|
18
|
-
//# sourceMappingURL=fetchAllViewRelatedTables.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"fetchAllViewRelatedTables.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewRelatedTables/fetchAllViewRelatedTables.ts"],"names":[],"mappings":";;;AAEO,MAAM,yBAAyB,GAAG,KAAK,EAAE,GAAoB,EAAE,QAAgB,EAAE,EAAE;IACxF,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,GAAI,CAC3B;;;;;;;;;GASD,EACC,EAAE,QAAQ,EAAE,EACZ,EAAE,UAAU,EAAE,MAAM,EAAE,CACvB,CAAC;IAEF,OAAO,MAIJ,CAAC;AACN,CAAC,CAAC;AArBW,QAAA,yBAAyB,6BAqBpC"}
|