prostgles-server 4.2.491 → 4.2.493
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/subscribe.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/subscribe.js +4 -2
- package/dist/DboBuilder/ViewHandler/subscribe.js.map +1 -1
- package/dist/DboBuilder/ViewRelatedTables/getViewRelatedTableJoinCondition.d.ts +1 -1
- package/dist/DboBuilder/ViewRelatedTables/getViewRelatedTableJoinCondition.js +1 -1
- package/dist/DboBuilder/ViewRelatedTables/getViewRelatedTableJoinCondition.js.map +1 -1
- package/dist/DboBuilder/ViewRelatedTables/getViewRelatedTables.d.ts +2 -4
- package/dist/DboBuilder/ViewRelatedTables/getViewRelatedTables.d.ts.map +1 -1
- package/dist/DboBuilder/ViewRelatedTables/getViewRelatedTables.js +1 -1
- package/dist/DboBuilder/ViewRelatedTables/getViewRelatedTables.js.map +1 -1
- package/dist/DboBuilder/getSubscribeRelatedTables.js +2 -2
- package/dist/DboBuilder/getSubscribeRelatedTables.js.map +1 -1
- package/dist/PubSubManager/PubSubManager.d.ts +3 -5
- package/dist/PubSubManager/PubSubManager.d.ts.map +1 -1
- package/dist/PubSubManager/PubSubManager.js.map +1 -1
- package/dist/PubSubManager/addSub.d.ts +2 -4
- package/dist/PubSubManager/addSub.d.ts.map +1 -1
- package/dist/PubSubManager/addSub.js +1 -1
- package/dist/PubSubManager/addSub.js.map +1 -1
- package/dist/PubSubManager/addTrigger.d.ts +1 -1
- package/dist/PubSubManager/addTrigger.d.ts.map +1 -1
- package/dist/PubSubManager/init/getDataWatchFunctionQuery.d.ts.map +1 -1
- package/dist/PubSubManager/init/getDataWatchFunctionQuery.js +54 -69
- package/dist/PubSubManager/init/getDataWatchFunctionQuery.js.map +1 -1
- package/dist/PubSubManager/notifListener.d.ts.map +1 -1
- package/dist/PubSubManager/notifListener.js +49 -35
- package/dist/PubSubManager/notifListener.js.map +1 -1
- package/lib/DboBuilder/ViewHandler/subscribe.ts +5 -2
- package/lib/DboBuilder/ViewRelatedTables/getViewRelatedTableJoinCondition.ts +1 -1
- package/lib/DboBuilder/ViewRelatedTables/getViewRelatedTables.ts +1 -1
- package/lib/DboBuilder/getSubscribeRelatedTables.ts +2 -2
- package/lib/PubSubManager/PubSubManager.ts +3 -5
- package/lib/PubSubManager/addSub.ts +3 -5
- package/lib/PubSubManager/addTrigger.ts +1 -1
- package/lib/PubSubManager/init/getDataWatchFunctionQuery.ts +53 -68
- package/lib/PubSubManager/notifListener.ts +54 -46
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subscribe.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/subscribe.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAExF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAIzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAGjD,MAAM,MAAM,MAAM,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,KAAK,CAAC,EAAE,OAAO,KAAK,GAAG,CAAC;AAElE,eAAO,MAAM,iBAAiB,GAC5B,aAAa,MAAM,GAAG,SAAS,EAC/B,aAAa,MAAM,GAAG,SAAS,wBAGhC,CAAC;AAEF,iBAAe,SAAS,CACtB,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IAAE,WAAW,EAAE,MAAM,GAAG,CAAA;CAAE,CAAC,CAAC;AACvC,iBAAe,SAAS,CACtB,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,eAAe,GAAG,SAAS,EACxC,WAAW,EAAE,WAAW,GACvB,OAAO,CAAC,oBAAoB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"subscribe.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/subscribe.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAExF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAIzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAGjD,MAAM,MAAM,MAAM,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,KAAK,CAAC,EAAE,OAAO,KAAK,GAAG,CAAC;AAElE,eAAO,MAAM,iBAAiB,GAC5B,aAAa,MAAM,GAAG,SAAS,EAC/B,aAAa,MAAM,GAAG,SAAS,wBAGhC,CAAC;AAEF,iBAAe,SAAS,CACtB,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IAAE,WAAW,EAAE,MAAM,GAAG,CAAA;CAAE,CAAC,CAAC;AACvC,iBAAe,SAAS,CACtB,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,eAAe,GAAG,SAAS,EACxC,WAAW,EAAE,WAAW,GACvB,OAAO,CAAC,oBAAoB,CAAC,CAAC;AA8HjC,OAAO,EAAE,SAAS,EAAE,CAAC"}
|
|
@@ -36,7 +36,9 @@ async function subscribe(filter, params, onData, table_rules, localParams) {
|
|
|
36
36
|
localParams,
|
|
37
37
|
newQuery,
|
|
38
38
|
});
|
|
39
|
-
const
|
|
39
|
+
const [firstField, ...otherFields] = newQuery.select
|
|
40
|
+
.filter((s) => s.selected)
|
|
41
|
+
.flatMap((c) => c.fields);
|
|
40
42
|
const commonSubOpts = {
|
|
41
43
|
table_info: this.tableOrViewInfo,
|
|
42
44
|
viewOptions,
|
|
@@ -46,7 +48,7 @@ async function subscribe(filter, params, onData, table_rules, localParams) {
|
|
|
46
48
|
selectParams: { ...selectParams },
|
|
47
49
|
subscribeOptions: (0, getValidatedSubscribeOptions_1.getValidatedSubscribeOptions)({ actions, skipFirst, throttle, throttleOpts, skipChangedColumnsCheck }, table_rules?.subscribe),
|
|
48
50
|
lastPushed: 0,
|
|
49
|
-
tracked_columns,
|
|
51
|
+
tracked_columns: !firstField ? undefined : [firstField, ...otherFields],
|
|
50
52
|
pushRequestedVersion: 0,
|
|
51
53
|
};
|
|
52
54
|
const pubSubManager = await this.dboBuilder.getPubSubManager();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subscribe.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/subscribe.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"subscribe.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/subscribe.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,6 @@ export declare const getViewRelatedTableJoinCondition: ({ dboBuilder, viewDefini
|
|
|
18
18
|
tableName: string;
|
|
19
19
|
tableNameEscaped: string;
|
|
20
20
|
condition: string;
|
|
21
|
-
|
|
21
|
+
tracked_columns: undefined;
|
|
22
22
|
}[]>;
|
|
23
23
|
//# sourceMappingURL=getViewRelatedTableJoinCondition.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getViewRelatedTableJoinCondition.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewRelatedTables/getViewRelatedTableJoinCondition.ts"],"names":[],"mappings":";;;AAAA,qDAA4C;AAC5C,+EAA6D;AAKtD,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;mBACzC,SAAS;;qBAEP,SAAS;;;;;;gBAMd,cAAc;;WAEnB,CAAC,CAAC;gBAEH,MAAM,aAAa,GAAG;;;qBAGX,eAAe;sBACd,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,SAAS,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,eAAe,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;oBAC3I,QAAQ,CAAC,SAAS,CAAC,SAAS,IAAI,MAAM;cAC5C,CAAC;gBAEL,IAAI,KAAK,CAAC,QAAQ,EAAE,KAAK,GAAG,EAAE,CAAC;oBAC7B,SAAS,GAAG,aAAa,CAAC;gBAC5B,CAAC;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAA,wBAAG,EACD,2CAA2C,eAAe,YAAY,SAAS,6BAA6B,EAC5G,CAAC,CACF,CAAC;YACJ,CAAC;QACH,CAAC;QAED,OAAO;YACL,QAAQ,EAAE,OAAO;YACjB,SAAS,EAAE,SAAS;YACpB,gBAAgB,EAAE,SAAS;YAC3B,SAAS;YACT,
|
|
1
|
+
{"version":3,"file":"getViewRelatedTableJoinCondition.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewRelatedTables/getViewRelatedTableJoinCondition.ts"],"names":[],"mappings":";;;AAAA,qDAA4C;AAC5C,+EAA6D;AAKtD,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;mBACzC,SAAS;;qBAEP,SAAS;;;;;;gBAMd,cAAc;;WAEnB,CAAC,CAAC;gBAEH,MAAM,aAAa,GAAG;;;qBAGX,eAAe;sBACd,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,SAAS,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,eAAe,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;oBAC3I,QAAQ,CAAC,SAAS,CAAC,SAAS,IAAI,MAAM;cAC5C,CAAC;gBAEL,IAAI,KAAK,CAAC,QAAQ,EAAE,KAAK,GAAG,EAAE,CAAC;oBAC7B,SAAS,GAAG,aAAa,CAAC;gBAC5B,CAAC;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAA,wBAAG,EACD,2CAA2C,eAAe,YAAY,SAAS,6BAA6B,EAC5G,CAAC,CACF,CAAC;YACJ,CAAC;QACH,CAAC;QAED,OAAO;YACL,QAAQ,EAAE,OAAO;YACjB,SAAS,EAAE,SAAS;YACpB,gBAAgB,EAAE,SAAS;YAC3B,SAAS;YACT,eAAe,EAAE,SAAS;SACuD,CAAC;IACtF,CAAC,CAAC,CACH,CAAC;IAEF,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AA7FW,QAAA,gCAAgC,oCA6F3C"}
|
|
@@ -6,11 +6,9 @@ export declare const getViewRelatedTables: (viewHandler: ViewHandler, localParam
|
|
|
6
6
|
viewName: string;
|
|
7
7
|
definition: string;
|
|
8
8
|
} & {
|
|
9
|
-
relatedTables: {
|
|
9
|
+
relatedTables: (Pick<import("../../PubSubManager/addTrigger").AddTriggerParams, "condition" | "tracked_columns"> & {
|
|
10
10
|
tableName: string;
|
|
11
11
|
tableNameEscaped: string;
|
|
12
|
-
|
|
13
|
-
trackedColumns: string[] | undefined;
|
|
14
|
-
}[];
|
|
12
|
+
})[];
|
|
15
13
|
}>;
|
|
16
14
|
//# sourceMappingURL=getViewRelatedTables.d.ts.map
|
|
@@ -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,GAC/B,aAAa,WAAW,EACxB,aAAa,WAAW,GAAG,SAAS,EACpC,UAAU,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,GAC/B,aAAa,WAAW,EACxB,aAAa,WAAW,GAAG,SAAS,EACpC,UAAU,QAAQ;;;;;;;;;EAkFnB,CAAC"}
|
|
@@ -57,7 +57,7 @@ const getViewRelatedTables = async (viewHandler, localParams, newQuery) => {
|
|
|
57
57
|
tableName: rt.table_name,
|
|
58
58
|
tableNameEscaped: [rt.table_schema, rt.table_name].map((v) => JSON.stringify(v)).join("."),
|
|
59
59
|
condition: "TRUE",
|
|
60
|
-
|
|
60
|
+
tracked_columns: undefined,
|
|
61
61
|
});
|
|
62
62
|
}
|
|
63
63
|
});
|
|
@@ -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,UAAU,EAAE,GAAG,WAAW,CAAC;IAEnD,uDAAuD;IACvD,MAAM,EAAE,eAAe,GAAG,EAAE,EAAE,GAAG,WAAW,CAAC,eAAe,CAAC;IAE7D,IAAI,UAAU,GAAG,eAAe,EAAE,IAAI,EAAE,CAAC;IACzC,IAAI,UAAU,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC9B,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACvC,CAAC;IACD,IAAI,CAAC,UAAU,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;QAClD,MAAM,IAAA,qDAAmC,EAAC,2BAA2B,EAAE;YACrE,IAAI,EAAE,aAAa;YACnB,WAAW;YACX,IAAI,EAAE,IAAI;SACX,CAAC,CAAC;IACL,CAAC;IACD,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,UAAU,CAAC,MAAM,CACxC,sBAAsB,UAAU,mDAAmD,EACnF,EAAE,EACF,EAAE,UAAU,EAAE,uBAAuB,EAAE,CACxC,CAAC;IAEF,MAAM,UAAU,GAMZ,IAAI,GAAG,EAAE,CAAC;IAEd,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,EAAE;QACzD,MAAM,KAAK,GAAG,UAAU,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,IAAI,GAAG,CAAC,GAAG,KAAK,OAAO,CAAC,CAAC;QACtF,IAAI,IAAI,IAAI,OAAO,IAAI,QAAQ,IAAI,UAAU,IAAI,KAAK,EAAE,CAAC;YACvD,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;YACpE,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC;gBACrB,cAAc,EAAE,IAAI;gBACpB,cAAc,EAAE,QAAQ;gBACxB,eAAe,EAAE,UAAU;aAC5B,CAAC,CAAC;YACH,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QACrC,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,2CAA2C;IAC3C,MAAM,mBAAmB,GAAG,MAAM,IAAA,mEAAgC,EAAC;QACjE,UAAU;QACV,cAAc,EAAE,UAAU;QAC1B,UAAU;QACV,eAAe,EAAE,QAAQ;QACzB,QAAQ;KACT,CAAC,CAAC;IAEH,MAAM,WAAW,GAA4B;QAC3C,IAAI,EAAE,MAAM;QACZ,QAAQ;QACR,UAAU;QACV,aAAa,EAAE,CAAC,GAAG,mBAAmB,CAAC;KACxC,CAAC;IAEF,iIAAiI;IACjI,MAAM,aAAa,GAAG,MAAM,IAAA,iDAAuB,EAAC,UAAU,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;IAE7E,+EAA+E;IAC/E,aAAa,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;QAC3B,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,KAAK,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC;YACpE,WAAW,CAAC,aAAa,CAAC,IAAI,CAAC;gBAC7B,SAAS,EAAE,EAAE,CAAC,UAAU;gBACxB,gBAAgB,EAAE,CAAC,EAAE,CAAC,YAAY,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;gBAC1F,SAAS,EAAE,MAAM;gBACjB,
|
|
1
|
+
{"version":3,"file":"getViewRelatedTables.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewRelatedTables/getViewRelatedTables.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,11 +48,11 @@ async function getSubscribeRelatedTables({ filter, localParams, newQuery }) {
|
|
|
48
48
|
});
|
|
49
49
|
const relatedTableJoinPathItem = joinPath.at(-1);
|
|
50
50
|
const joinColumns = relatedTableJoinPathItem?.on.map((columnPair) => Object.values(columnPair)).flat() ?? [];
|
|
51
|
-
const
|
|
51
|
+
const [firstField, ...otherFields] = Array.from(new Set([...(selectedColumnNames ?? []), ...joinColumns, ...joinConditionInfo.columnsUsed]));
|
|
52
52
|
viewOptions.relatedTables.push({
|
|
53
53
|
tableName: relatedTableName,
|
|
54
54
|
tableNameEscaped: (0, prostgles_types_1.asName)(relatedTableName),
|
|
55
|
-
|
|
55
|
+
tracked_columns: !firstField ? undefined : [firstField, ...otherFields],
|
|
56
56
|
condition: joinConditionInfo.where,
|
|
57
57
|
});
|
|
58
58
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getSubscribeRelatedTables.js","sourceRoot":"","sources":["../../lib/DboBuilder/getSubscribeRelatedTables.ts"],"names":[],"mappings":";;AAsBA,8DAoGC;AAzHD,qDAAgF;AAOhF,mFAAgF;AAUhF;;;GAGG;AACI,KAAK,UAAU,yBAAyB,CAE7C,EAAE,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAQ;IAEvC,IAAI,WAAW,GAAwC,SAAS,CAAC;IACjE,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;QACjB,WAAW,GAAG,MAAM,IAAA,2CAAoB,EAAC,IAAI,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;QACtE,oGAAoG;IACtG,CAAC;SAAM,CAAC;QACN,WAAW,GAAG;YACZ,IAAI,EAAE,OAAO;YACb,aAAa,EAAE,EAAE;SAClB,CAAC;QAEF,MAAM,eAAe,GAAG,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;QACvE,MAAM,gBAAgB,GAAG,KAAK,EAC5B,gBAAwB,EACxB,QAA0B,EAC1B,mBAAyC,EACzC,iBAAyB,EACzB,EAAE;YACF,MAAM,yBAAyB,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;YAC/E,IAAI,CAAC,yBAAyB,EAAE,CAAC;gBAC/B,MAAM,SAAS,gBAAgB,YAAY,CAAC;YAC9C,CAAC;YAED,MAAM,aAAa,GAAG,WAAW,EAAE,aAAa,CAAC,IAAI,CACnD,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,SAAS,KAAK,gBAAgB,CAC1C,CAAC;YACF,IAAI,aAAa,IAAI,yBAAyB,CAAC,OAAO,EAAE,CAAC;gBACvD,OAAO;YACT,CAAC;YAED,WAAW,KAAK;gBACd,IAAI,EAAE,OAAO;gBACb,aAAa,EAAE,EAAE;aAClB,CAAC;YAEF,MAAM,kBAAkB,GAAG;gBACzB,aAAa,EAAE;oBACb,IAAI,EAAE,IAAA,mCAAiB,EAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC;oBAC5C,MAAM,EAAE,eAAe;iBACxB;aACF,CAAC;YACF,MAAM,MAAM,GACV,IAAA,yBAAO,EAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAChD,EAAE,IAAI,EAAE,CAAC,iBAAiB,EAAE,kBAAkB,CAAC,EAAE,CAClD,CAAC;YACJ,MAAM,iBAAiB,GAAG,MAAM,yBAAyB,CAAC,YAAY,CAAC;gBACrE,MAAM,EAAE,SAAS;gBACjB,MAAM;gBACN,QAAQ,EAAE,KAAK;gBACf,WAAW,EAAE,SAAS;gBACtB,SAAS,EAAE,SAAS;aACrB,CAAC,CAAC;YAEH,MAAM,wBAAwB,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YACjD,MAAM,WAAW,GACf,wBAAwB,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC;YAE3F,MAAM,
|
|
1
|
+
{"version":3,"file":"getSubscribeRelatedTables.js","sourceRoot":"","sources":["../../lib/DboBuilder/getSubscribeRelatedTables.ts"],"names":[],"mappings":"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"}
|
|
@@ -51,12 +51,10 @@ export type ViewSubscriptionOptions = ({
|
|
|
51
51
|
viewName?: undefined;
|
|
52
52
|
definition?: undefined;
|
|
53
53
|
}) & {
|
|
54
|
-
relatedTables: {
|
|
54
|
+
relatedTables: (Pick<AddTriggerParams, "condition" | "tracked_columns"> & {
|
|
55
55
|
tableName: string;
|
|
56
56
|
tableNameEscaped: string;
|
|
57
|
-
|
|
58
|
-
trackedColumns: string[] | undefined;
|
|
59
|
-
}[];
|
|
57
|
+
})[];
|
|
60
58
|
};
|
|
61
59
|
export type SubscriptionParams = {
|
|
62
60
|
socket_id?: string;
|
|
@@ -84,7 +82,7 @@ export type SubscriptionParams = {
|
|
|
84
82
|
is_ready?: boolean;
|
|
85
83
|
};
|
|
86
84
|
export type Subscription = Pick<SubscriptionParams, "selectParams" | "subscribeOptions" | "is_throttling" | "lastPushed" | "pushRequestedVersion" | "isPushing" | "reRun" | "channel_name" | "is_ready" | "onData" | "socket" | "socket_id" | "table_info" | "filter" | "table_rules"> & {
|
|
87
|
-
triggers: AddTriggerParams[];
|
|
85
|
+
triggers: [AddTriggerParams, ...AddTriggerParams[]];
|
|
88
86
|
};
|
|
89
87
|
export type TableTriggerInfo = {
|
|
90
88
|
table_condition_id: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PubSubManager.d.ts","sourceRoot":"","sources":["../../lib/PubSubManager/PubSubManager.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,eAAe,EACf,UAAU,EACV,YAAY,EACZ,SAAS,EACT,eAAe,EAChB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAC;AAChF,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAEvC,OAAO,EAAc,KAAK,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAMjE,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACjF,OAAO,EAAkC,KAAK,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAGxF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qCAAqC,CAAC;AAElE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAOtE,MAAM,MAAM,aAAa,GAAG,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;AAE3D,MAAM,MAAM,UAAU,GAAG;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,eAAe,CAAC;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE;QACN,MAAM,EAAE,WAAW,CAAC;KACrB,CAAC;IACF,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,EAAE,CAAC,EAAE,SAAS,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,YAAY,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,WAAW,EAAE,eAAe,CAAC;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE;QACN,MAAM,EAAE,WAAW,CAAC;KACrB,CAAC;IACF,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG,CAClC;IACE,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB,GACD;IACE,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,UAAU,CAAC,EAAE,SAAS,CAAC;CACxB,CACJ,GAAG;IACF,aAAa,EAAE
|
|
1
|
+
{"version":3,"file":"PubSubManager.d.ts","sourceRoot":"","sources":["../../lib/PubSubManager/PubSubManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PubSubManager.js","sourceRoot":"","sources":["../../lib/PubSubManager/PubSubManager.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAWhG,uCAAoC;AACpC,6CAAiE;AACjE,qEAAkE;AAClE,gEAA6D;AAC7D,uEAAoE;AACpE,uDAAoD;AAGpD,qDAAwF;AAExF,qDAAiD;AAEjD,mEAAwE;AAGxE,wDAA8C;AAC9C,qCAAkC;AAClC,mDAAgD;AAChD,6DAA2C;AAC3C,+CAA4C;
|
|
1
|
+
{"version":3,"file":"PubSubManager.js","sourceRoot":"","sources":["../../lib/PubSubManager/PubSubManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,8 @@
|
|
|
1
1
|
import type { SubscriptionChannels } from "prostgles-types";
|
|
2
2
|
import type { VoidFunction } from "../SchemaWatch/SchemaWatch";
|
|
3
3
|
import type { PubSubManager, SubscriptionParams } from "./PubSubManager";
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
tracked_columns: string[] | undefined;
|
|
7
|
-
};
|
|
4
|
+
import type { AddTriggerParams } from "./addTrigger";
|
|
5
|
+
export type AddSubscriptionParams = SubscriptionParams & Pick<AddTriggerParams, "condition" | "tracked_columns">;
|
|
8
6
|
type AddSubResult = SubscriptionChannels & {
|
|
9
7
|
sendFirstData: VoidFunction | undefined;
|
|
10
8
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addSub.d.ts","sourceRoot":"","sources":["../../lib/PubSubManager/addSub.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE/D,OAAO,KAAK,EAEV,aAAa,EAEb,kBAAkB,EACnB,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"addSub.d.ts","sourceRoot":"","sources":["../../lib/PubSubManager/addSub.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE/D,OAAO,KAAK,EAEV,aAAa,EAEb,kBAAkB,EACnB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAErD,MAAM,MAAM,qBAAqB,GAAG,kBAAkB,GACpD,IAAI,CAAC,gBAAgB,EAAE,WAAW,GAAG,iBAAiB,CAAC,CAAC;AAE1D,KAAK,YAAY,GAAG,oBAAoB,GAAG;IACzC,aAAa,EAAE,YAAY,GAAG,SAAS,CAAC;CACzC,CAAC;AAIF,wBAAsB,MAAM,CAC1B,IAAI,EAAE,aAAa,EACnB,kBAAkB,EAAE,IAAI,CAAC,qBAAqB,EAAE,cAAc,GAAG,iBAAiB,CAAC,GAClF,OAAO,CAAC,YAAY,CAAC,CAoIvB"}
|
|
@@ -53,7 +53,7 @@ async function addSub(subscriptionParams) {
|
|
|
53
53
|
const relatedTrigger = {
|
|
54
54
|
table_name: relatedTable.tableName,
|
|
55
55
|
condition: (0, PubSubManagerUtils_1.parseCondition)(relatedTable.condition),
|
|
56
|
-
tracked_columns: relatedTable.
|
|
56
|
+
tracked_columns: relatedTable.tracked_columns,
|
|
57
57
|
};
|
|
58
58
|
newSub.triggers.push(relatedTrigger);
|
|
59
59
|
await this.addTrigger(relatedTrigger, viewOptions, socket);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addSub.js","sourceRoot":"","sources":["../../lib/PubSubManager/addSub.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"addSub.js","sourceRoot":"","sources":["../../lib/PubSubManager/addSub.ts"],"names":[],"mappings":";;AAqBA,wBAuIC;AA1JD,gEAAgD;AAOhD,6DAAsD;AAUtD,sCAAsC;AACtC,oGAAoG;AAC7F,KAAK,UAAU,MAAM,CAE1B,kBAAmF;IAEnF,MAAM,EACJ,MAAM,EACN,MAAM,EACN,WAAW,EACX,MAAM,GAAG,EAAE,EACX,YAAY,GAAG,EAAE,EACjB,SAAS,GAAG,EAAE,EACd,WAAW,EACX,UAAU,EACV,gBAAgB,EAChB,eAAe,GAChB,GAAG,kBAAkB,CAAC;IACvB,MAAM,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC;IAEnC,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;QACvB,MAAM,yBAAyB,CAAC;IAClC,CAAC;IACD,IAAI,MAAM,IAAI,MAAM,EAAE,CAAC;QACrB,MAAM,qCAAqC,CAAC;IAC9C,CAAC;IAED,MAAM,YAAY,GAAG,GAAG,IAAI,CAAC,oBAAoB,IAAI,UAAU,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,QAAQ,CAAC;IAClI,MAAM,WAAW,GAAG;QAClB,UAAU,EAAE,UAAU;QACtB,SAAS,EAAE,IAAA,mCAAc,EAAC,SAAS,CAAC;QACpC,eAAe;KACW,CAAC;IAE7B,MAAM,MAAM,GAAiB;QAC3B,oBAAoB,EAAE,CAAC;QACvB,YAAY;QACZ,MAAM;QACN,MAAM;QACN,YAAY,EAAE,YAAY;QAC1B,UAAU,EAAE,CAAC;QACb,MAAM;QACN,gBAAgB;QAChB,UAAU;QACV,QAAQ,EAAE,IAAI;QACd,aAAa,EAAE,KAAK;QACpB,SAAS,EAAE,MAAM,EAAE,EAAE;QACrB,WAAW;QACX,QAAQ,EAAE,CAAC,WAAW,CAAC;KACxB,CAAC;IAEF,MAAM,MAAM,GAAiB;QAC3B,WAAW,EAAE,YAAY;QACzB,gBAAgB,EAAE,YAAY,GAAG,QAAQ;QACzC,sBAAsB,EAAE,YAAY,GAAG,cAAc;QACrD,aAAa,EAAE,SAAS;KACzB,CAAC;IAEF,MAAM,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IACjD,IAAI,WAAW,EAAE,CAAC;QAChB,OAAO,CAAC,KAAK,CACX,6BAA6B,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,aAAa,YAAY,EAAE,CACpF,CAAC;QACF,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IAE1B,IAAI,WAAW,EAAE,CAAC;QAChB,KAAK,MAAM,YAAY,IAAI,WAAW,CAAC,aAAa,EAAE,CAAC;YACrD,MAAM,cAAc,GAAG;gBACrB,UAAU,EAAE,YAAY,CAAC,SAAS;gBAClC,SAAS,EAAE,IAAA,mCAAc,EAAC,YAAY,CAAC,SAAS,CAAC;gBACjD,eAAe,EAAE,YAAY,CAAC,eAAe;aACnB,CAAC;YAE7B,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAErC,MAAM,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;QAC7D,CAAC;IACH,CAAC;IAED,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,gBAAgB,CAAC;IAC/D,MAAM,aAAa,GAAG,KAAK,IAAI,EAAE;QAC/B,IAAI,SAAS;YAAE,OAAO;QACtB,IAAI,YAAY,EAAE,SAAS,IAAI,QAAQ,EAAE,CAAC;YACxC,MAAM,IAAA,wBAAI,EAAC,QAAQ,CAAC,CAAC;QACvB,CAAC;QACD,KAAK,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAChC,CAAC,CAAC;IAEF,IAAI,MAAM,EAAE,CAAC;QACX;;;WAGG;QACH,MAAM,CAAC,aAAa,GAAG,aAAa,CAAC;IACvC,CAAC;SAAM,IAAI,MAAM,EAAE,CAAC;QAClB,MAAM,eAAe,GAAG,GAAG,EAAE;YAC3B,MAAM,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;YACxC,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;YACnD,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;QAC3D,CAAC,CAAC;QACF,eAAe,EAAE,CAAC;QAElB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,aAAa,CAAC,CAAC;QACpD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,sBAAsB,EAAE,CAAC,KAAU,EAAE,EAAiB,EAAE,EAAE;YAC3E,MAAM,GAAG,GAAG,IAAI,CAAC;YACjB,IAAI,CAAC,kBAAkB,CAAC,YAAY,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;YAC9D,KAAK,IAAI,CAAC,IAAI,CAAC;gBACb,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE,aAAa;gBACtB,YAAY;gBACZ,QAAQ,EAAE,MAAM,CAAC,EAAE;gBACnB,QAAQ,EAAE,CAAC;gBACX,QAAQ,EAAE,IAAI,CAAC,SAAS;gBACxB,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;gBAC3C,GAAG,EAAE,MAAM,CAAC,EAAE;gBACd,SAAS,EAAE,UAAU;aACtB,CAAC,CAAC;YACH,eAAe,EAAE,CAAC;YAClB,EAAE,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;QACpB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAEvB,+EAA+E;IAC/E,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC;QACvB,IAAI,CAAC,WAAW,EAAE,aAAa,CAAC,MAAM,EAAE,CAAC;YACvC,MAAM,2CAA2C,CAAC;QACpD,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;IACxD,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -4,7 +4,7 @@ import type { PRGLIOSocket } from "../DboBuilder/DboBuilderTypes";
|
|
|
4
4
|
export type AddTriggerParams = {
|
|
5
5
|
table_name: string;
|
|
6
6
|
condition: string;
|
|
7
|
-
tracked_columns: string[] | undefined;
|
|
7
|
+
tracked_columns: [string, ...string[]] | undefined;
|
|
8
8
|
};
|
|
9
9
|
export declare function addTrigger(this: PubSubManager, params: AddTriggerParams, viewOptions: ViewSubscriptionOptions | undefined, socket: PRGLIOSocket | undefined): Promise<import("prostgles-types").TryCatchResult<{
|
|
10
10
|
tbl: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addTrigger.d.ts","sourceRoot":"","sources":["../../lib/PubSubManager/addTrigger.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAErD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAKlE,MAAM,MAAM,gBAAgB,GAAG;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"addTrigger.d.ts","sourceRoot":"","sources":["../../lib/PubSubManager/addTrigger.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAErD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAKlE,MAAM,MAAM,gBAAgB,GAAG;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,GAAG,SAAS,CAAC;CACpD,CAAC;AACF,wBAAsB,UAAU,CAC9B,IAAI,EAAE,aAAa,EACnB,MAAM,EAAE,gBAAgB,EACxB,WAAW,EAAE,uBAAuB,GAAG,SAAS,EAChD,MAAM,EAAE,YAAY,GAAG,SAAS;;;;IAoGjC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getDataWatchFunctionQuery.d.ts","sourceRoot":"","sources":["../../../lib/PubSubManager/init/getDataWatchFunctionQuery.ts"],"names":[],"mappings":"AAIA;;;GAGG;AACH,eAAO,MAAM,iCAAiC,UAAkB,CAAC;AACjE,eAAO,MAAM,yBAAyB,GAAI,WAAW,OAAO,GAAG,SAAS,WAoGvE,CAAC;
|
|
1
|
+
{"version":3,"file":"getDataWatchFunctionQuery.d.ts","sourceRoot":"","sources":["../../../lib/PubSubManager/init/getDataWatchFunctionQuery.ts"],"names":[],"mappings":"AAIA;;;GAGG;AACH,eAAO,MAAM,iCAAiC,UAAkB,CAAC;AACjE,eAAO,MAAM,yBAAyB,GAAI,WAAW,OAAO,GAAG,SAAS,WAoGvE,CAAC;AA6OF;;;;;;;;;;;;;;;;;;;;;;;;GAwBG"}
|
|
@@ -39,7 +39,7 @@ const getDataWatchFunctionQuery = (debugMode) => {
|
|
|
39
39
|
escaped_table := concat_ws('.', CASE WHEN TG_TABLE_SCHEMA <> CURRENT_SCHEMA THEN format('%I', TG_TABLE_SCHEMA) END, format('%I', TG_TABLE_NAME));
|
|
40
40
|
|
|
41
41
|
${CHANGED_COLUMNS_FOR_EACH_TRIGGER_CHECK}
|
|
42
|
-
|
|
42
|
+
|
|
43
43
|
${EACH_TRIGGER_CHECK_ALL_COLUMNS}
|
|
44
44
|
|
|
45
45
|
IF (c_ids IS NOT NULL OR has_errors) THEN
|
|
@@ -108,79 +108,64 @@ exports.getDataWatchFunctionQuery = getDataWatchFunctionQuery;
|
|
|
108
108
|
const CHANGED_COLUMNS_FOR_EACH_TRIGGER_CHECK = `
|
|
109
109
|
-- Determine changed columns for UPDATE operations
|
|
110
110
|
IF TG_OP = 'UPDATE' THEN
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
SELECT
|
|
114
|
-
FROM prostgles.v_triggers
|
|
111
|
+
|
|
112
|
+
FOR v_trigger IN
|
|
113
|
+
SELECT *
|
|
114
|
+
FROM prostgles.v_triggers
|
|
115
115
|
WHERE table_name = escaped_table
|
|
116
|
-
|
|
117
|
-
AND columns_info IS NULL
|
|
118
|
-
|
|
116
|
+
--AND table_condition_id = ANY(c_ids)
|
|
117
|
+
AND columns_info IS NOT NULL
|
|
118
|
+
/* These require the views to be added before as CTEs to ensure the condition works */
|
|
119
|
+
AND related_view_name IS NULL
|
|
120
|
+
AND related_view_def IS NULL
|
|
121
|
+
LOOP
|
|
119
122
|
|
|
120
123
|
changed_columns_by_trigger_id := COALESCE(changed_columns_by_trigger_id, '{}');
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
$c$
|
|
134
|
-
WITH changed AS (
|
|
135
|
-
SELECT column_name
|
|
136
|
-
FROM jsonb_object_keys(%1$L) as column_name
|
|
137
|
-
WHERE EXISTS (
|
|
138
|
-
SELECT 1
|
|
139
|
-
FROM (SELECT * FROM old_table as %5$I WHERE %4$s ) o
|
|
140
|
-
FULL OUTER JOIN (SELECT * FROM new_table as %5$I WHERE %4$s ) n
|
|
141
|
-
ON %2$s
|
|
142
|
-
WHERE %3$s
|
|
143
|
-
)
|
|
124
|
+
|
|
125
|
+
query := format(
|
|
126
|
+
$c$
|
|
127
|
+
WITH changed AS (
|
|
128
|
+
SELECT column_name
|
|
129
|
+
FROM jsonb_object_keys(%1$L) as column_name
|
|
130
|
+
WHERE EXISTS (
|
|
131
|
+
SELECT 1
|
|
132
|
+
FROM (SELECT * FROM old_table as %5$I WHERE %4$s ) o
|
|
133
|
+
FULL OUTER JOIN (SELECT * FROM new_table as %5$I WHERE %4$s ) n
|
|
134
|
+
ON %2$s
|
|
135
|
+
WHERE %3$s
|
|
144
136
|
)
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
GET STACKED DIAGNOSTICS
|
|
162
|
-
err_text = MESSAGE_TEXT,
|
|
163
|
-
err_detail = PG_EXCEPTION_DETAIL,
|
|
164
|
-
err_hint = PG_EXCEPTION_HINT;
|
|
165
|
-
END;
|
|
166
|
-
|
|
167
|
-
/* It is possible to get no changes */
|
|
168
|
-
IF changed_columns IS NOT NULL THEN
|
|
169
|
-
|
|
170
|
-
changed_columns := COALESCE(changed_columns, '{}');
|
|
171
|
-
changed_columns_by_trigger_id := jsonb_set(
|
|
172
|
-
changed_columns_by_trigger_id,
|
|
173
|
-
ARRAY[v_trigger.table_condition_id::TEXT],
|
|
174
|
-
to_jsonb(changed_columns)
|
|
175
|
-
);
|
|
176
|
-
END IF;
|
|
177
|
-
|
|
178
|
-
--PERFORM pg_notify('debug', changed_columns::TEXT || v_trigger.table_condition_id::TEXT || changed_columns_by_trigger_id::TEXT );
|
|
179
|
-
|
|
180
|
-
END LOOP;
|
|
181
|
-
|
|
137
|
+
)
|
|
138
|
+
SELECT array_agg(column_name)
|
|
139
|
+
FROM changed;
|
|
140
|
+
$c$,
|
|
141
|
+
v_trigger.columns_info->'tracked_columns',
|
|
142
|
+
v_trigger.columns_info->>'join_condition',
|
|
143
|
+
v_trigger.columns_info->>'where_statement',
|
|
144
|
+
v_trigger.condition,
|
|
145
|
+
TG_TABLE_NAME
|
|
146
|
+
);
|
|
147
|
+
|
|
148
|
+
BEGIN
|
|
149
|
+
EXECUTE query INTO changed_columns;
|
|
150
|
+
EXCEPTION WHEN OTHERS THEN
|
|
151
|
+
|
|
152
|
+
has_errors := TRUE;
|
|
182
153
|
|
|
183
|
-
|
|
154
|
+
GET STACKED DIAGNOSTICS
|
|
155
|
+
err_text = MESSAGE_TEXT,
|
|
156
|
+
err_detail = PG_EXCEPTION_DETAIL,
|
|
157
|
+
err_hint = PG_EXCEPTION_HINT;
|
|
158
|
+
END;
|
|
159
|
+
|
|
160
|
+
changed_columns := COALESCE(changed_columns, '{}');
|
|
161
|
+
changed_columns_by_trigger_id := jsonb_set(
|
|
162
|
+
changed_columns_by_trigger_id,
|
|
163
|
+
ARRAY[v_trigger.table_condition_id::TEXT],
|
|
164
|
+
to_jsonb(changed_columns)
|
|
165
|
+
);
|
|
166
|
+
|
|
167
|
+
END LOOP;
|
|
168
|
+
|
|
184
169
|
END IF;
|
|
185
170
|
|
|
186
171
|
`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getDataWatchFunctionQuery.js","sourceRoot":"","sources":["../../../lib/PubSubManager/init/getDataWatchFunctionQuery.ts"],"names":[],"mappings":";;;AAAA,2EAA2D;AAC3D,8DAAyD;AACzD,8DAAsF;AAEtF;;;GAGG;AACU,QAAA,iCAAiC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AAC1D,MAAM,yBAAyB,GAAG,CAAC,SAA8B,EAAE,EAAE;IAC1E,MAAM,sBAAsB,GAAG;;qCAEI,wCAAY,CAAC,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;kBA0B/C,sCAAsC;;kBAEtC,8BAA8B;;;;;;;;;;;;;0BAatB,IAAA,4BAAO,EAAC,kCAAa,CAAC,OAAO,CAAC;;4BAE5B,IAAA,4BAAO,EAAC,8BAAS,CAAC;;4BAElB,IAAA,4BAAO,EAAC,+BAAU,CAAC,IAAI,CAAC;;;;;;;;4BAQxB,SAAS,CAAC,CAAC,CAAC,6DAA6D,CAAC,CAAC,CAAC,EAAE;;;;;;;;;;;;;;;kBAexF,IAAA,qCAAgB,GAAE;;;;;;;8BAON,wCAAY,CAAC,eAAe;;GAEvD,CAAC;IAEF,2GAA2G;IAC3G,MAAM,UAAU,GAAG,sBAAsB;SACtC,KAAK,CAAC,IAAI,CAAC;SACX,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;SACpB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;IACpB,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE;QACrC,MAAM,QAAQ,GAAG,UAAU,CAAC,SAAS,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QACjD,IACE,IAAI,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC;YACxC,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAC/C,CAAC;YACD,MAAM,IAAI,KAAK,CACb,yJAAyJ,IAAI,EAAE,CAChK,CAAC;QACJ,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,sBAAsB,CAAC;AAChC,CAAC,CAAC;AApGW,QAAA,yBAAyB,6BAoGpC;AAEF,MAAM,sCAAsC,GAAG
|
|
1
|
+
{"version":3,"file":"getDataWatchFunctionQuery.js","sourceRoot":"","sources":["../../../lib/PubSubManager/init/getDataWatchFunctionQuery.ts"],"names":[],"mappings":";;;AAAA,2EAA2D;AAC3D,8DAAyD;AACzD,8DAAsF;AAEtF;;;GAGG;AACU,QAAA,iCAAiC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AAC1D,MAAM,yBAAyB,GAAG,CAAC,SAA8B,EAAE,EAAE;IAC1E,MAAM,sBAAsB,GAAG;;qCAEI,wCAAY,CAAC,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;kBA0B/C,sCAAsC;;kBAEtC,8BAA8B;;;;;;;;;;;;;0BAatB,IAAA,4BAAO,EAAC,kCAAa,CAAC,OAAO,CAAC;;4BAE5B,IAAA,4BAAO,EAAC,8BAAS,CAAC;;4BAElB,IAAA,4BAAO,EAAC,+BAAU,CAAC,IAAI,CAAC;;;;;;;;4BAQxB,SAAS,CAAC,CAAC,CAAC,6DAA6D,CAAC,CAAC,CAAC,EAAE;;;;;;;;;;;;;;;kBAexF,IAAA,qCAAgB,GAAE;;;;;;;8BAON,wCAAY,CAAC,eAAe;;GAEvD,CAAC;IAEF,2GAA2G;IAC3G,MAAM,UAAU,GAAG,sBAAsB;SACtC,KAAK,CAAC,IAAI,CAAC;SACX,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;SACpB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;IACpB,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE;QACrC,MAAM,QAAQ,GAAG,UAAU,CAAC,SAAS,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QACjD,IACE,IAAI,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC;YACxC,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAC/C,CAAC;YACD,MAAM,IAAI,KAAK,CACb,yJAAyJ,IAAI,EAAE,CAChK,CAAC;QACJ,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,sBAAsB,CAAC;AAChC,CAAC,CAAC;AApGW,QAAA,yBAAyB,6BAoGpC;AAEF,MAAM,sCAAsC,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+D9C,CAAC;AAEF,MAAM,8BAA8B,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6EtC,CAAC;AAEF;;;;;;;;;;GAUG;AACH,MAAM,wBAAwB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8EhC,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;GAwBG"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notifListener.d.ts","sourceRoot":"","sources":["../../lib/PubSubManager/notifListener.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,
|
|
1
|
+
{"version":3,"file":"notifListener.d.ts","sourceRoot":"","sources":["../../lib/PubSubManager/notifListener.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAgB,MAAM,iBAAiB,CAAC;AAInE,wBAAsB,aAAa,CAAC,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,iBAqMjF"}
|
|
@@ -93,50 +93,64 @@ async function notifListener(data) {
|
|
|
93
93
|
if (orphanedTableConditions.length) {
|
|
94
94
|
void this.deleteOrphanedTriggers(new Set(table_name));
|
|
95
95
|
}
|
|
96
|
-
|
|
97
|
-
|
|
96
|
+
const triggeredSubs = new Set();
|
|
97
|
+
firedTableConditions.map(({ table_condition_id, condition, subs, syncs }) => {
|
|
98
|
+
/**
|
|
99
|
+
* Each trigger with column_info AND no related view gets checked.
|
|
100
|
+
* If table_condition_id not present we assume all columns are changed.
|
|
101
|
+
*/
|
|
102
|
+
const changedColumns = !changedColumnsByTriggerId ? "*" : (changedColumnsByTriggerId[table_condition_id] ?? "*");
|
|
98
103
|
(0, PubSubManagerUtils_1.log)("notifListener", subs.map((s) => s.channel_name), syncs.map((s) => s.channel_name));
|
|
99
104
|
syncs.map((s) => {
|
|
100
105
|
void this.syncData(s, undefined, "trigger");
|
|
101
106
|
});
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
sub.is_ready &&
|
|
105
|
-
((sub.socket_id && this.sockets[sub.socket_id]) || sub.onData)));
|
|
106
|
-
activeAndReadySubs.forEach((sub) => {
|
|
107
|
-
const operation = (op_name?.toLowerCase() || "insert");
|
|
107
|
+
const operation = (op_name?.toLowerCase() || "insert");
|
|
108
|
+
subs.forEach((sub) => {
|
|
108
109
|
const { triggers, subscribeOptions } = sub;
|
|
109
|
-
const
|
|
110
|
-
const
|
|
111
|
-
const
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
110
|
+
const { actions, skipChangedColumnsCheck } = subscribeOptions;
|
|
111
|
+
const tableHandler = this.dboBuilder.dboMap.get(table_name);
|
|
112
|
+
const subIsActive = tableHandler &&
|
|
113
|
+
sub.is_ready &&
|
|
114
|
+
((sub.socket_id && this.sockets[sub.socket_id]) || sub.onData);
|
|
115
|
+
if (!subIsActive)
|
|
116
|
+
return;
|
|
117
|
+
const didTrigger = triggers.find((subTrigger) => {
|
|
118
|
+
const matchesTableCondition = subTrigger.table_name === table_name && subTrigger.condition === condition;
|
|
119
|
+
if (!matchesTableCondition)
|
|
120
|
+
return false;
|
|
121
|
+
const matchesAction = !actions ||
|
|
122
|
+
(0, prostgles_types_1.includes)((0, parseFieldFilter_1.parseFieldFilter)(actions, false, ["insert", "update", "delete"]), operation);
|
|
123
|
+
if (!matchesAction)
|
|
124
|
+
return false;
|
|
125
|
+
const subTrackedColumns = subTrigger.tracked_columns;
|
|
126
|
+
const matchesChangedColumns = skipChangedColumnsCheck ||
|
|
127
|
+
operation !== "update" ||
|
|
128
|
+
changedColumns === "*" ||
|
|
129
|
+
!subTrackedColumns ||
|
|
130
|
+
changedColumns.some((changedColumn) => subTrackedColumns.includes(changedColumn));
|
|
131
|
+
return matchesChangedColumns;
|
|
132
|
+
});
|
|
133
|
+
if (!didTrigger) {
|
|
123
134
|
return;
|
|
124
135
|
}
|
|
125
|
-
|
|
126
|
-
/* It is assumed the policy was checked before this point */
|
|
127
|
-
void this.pushSubData(sub);
|
|
128
|
-
}
|
|
129
|
-
else if (!sub.is_throttling) {
|
|
130
|
-
(0, PubSubManagerUtils_1.log)("throttling sub for", throttle, "ms");
|
|
131
|
-
sub.is_throttling = setTimeout(() => {
|
|
132
|
-
(0, PubSubManagerUtils_1.log)("throttling finished. pushSubData...");
|
|
133
|
-
sub.is_throttling = null;
|
|
134
|
-
void this.pushSubData(sub);
|
|
135
|
-
}, throttle);
|
|
136
|
-
}
|
|
136
|
+
triggeredSubs.add(sub);
|
|
137
137
|
});
|
|
138
138
|
});
|
|
139
|
-
|
|
139
|
+
triggeredSubs.forEach((sub) => {
|
|
140
|
+
const { subscribeOptions: { throttle = 0, throttleOpts }, } = sub;
|
|
141
|
+
if (!throttleOpts?.skipFirst && sub.lastPushed <= Date.now() - throttle) {
|
|
142
|
+
/* It is assumed the policy was checked before this point */
|
|
143
|
+
void this.pushSubData(sub);
|
|
144
|
+
}
|
|
145
|
+
else if (!sub.is_throttling) {
|
|
146
|
+
(0, PubSubManagerUtils_1.log)("throttling sub for", throttle, "ms");
|
|
147
|
+
sub.is_throttling = setTimeout(() => {
|
|
148
|
+
(0, PubSubManagerUtils_1.log)("throttling finished. pushSubData...");
|
|
149
|
+
sub.is_throttling = null;
|
|
150
|
+
void this.pushSubData(sub);
|
|
151
|
+
}, throttle);
|
|
152
|
+
}
|
|
153
|
+
});
|
|
140
154
|
}
|
|
141
155
|
else {
|
|
142
156
|
state = "invalid_condition_ids";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notifListener.js","sourceRoot":"","sources":["../../lib/PubSubManager/notifListener.ts"],"names":[],"mappings":";;AAMA,
|
|
1
|
+
{"version":3,"file":"notifListener.js","sourceRoot":"","sources":["../../lib/PubSubManager/notifListener.ts"],"names":[],"mappings":"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"}
|
|
@@ -77,7 +77,10 @@ async function subscribe(
|
|
|
77
77
|
newQuery,
|
|
78
78
|
});
|
|
79
79
|
|
|
80
|
-
const
|
|
80
|
+
const [firstField, ...otherFields] = newQuery.select
|
|
81
|
+
.filter((s) => s.selected)
|
|
82
|
+
.flatMap((c) => c.fields);
|
|
83
|
+
|
|
81
84
|
const commonSubOpts = {
|
|
82
85
|
table_info: this.tableOrViewInfo,
|
|
83
86
|
viewOptions,
|
|
@@ -90,7 +93,7 @@ async function subscribe(
|
|
|
90
93
|
table_rules?.subscribe,
|
|
91
94
|
),
|
|
92
95
|
lastPushed: 0,
|
|
93
|
-
tracked_columns,
|
|
96
|
+
tracked_columns: !firstField ? undefined : [firstField, ...otherFields],
|
|
94
97
|
pushRequestedVersion: 0,
|
|
95
98
|
} as const satisfies Partial<AddSubscriptionParams>;
|
|
96
99
|
|
|
@@ -91,7 +91,7 @@ export const getViewRelatedTableJoinCondition = async ({
|
|
|
91
91
|
tableName: tableName,
|
|
92
92
|
tableNameEscaped: tableName,
|
|
93
93
|
condition,
|
|
94
|
-
|
|
94
|
+
tracked_columns: undefined,
|
|
95
95
|
} satisfies ViewSubscriptionOptions["relatedTables"][number] & { tableOID: number };
|
|
96
96
|
}),
|
|
97
97
|
);
|
|
@@ -81,7 +81,7 @@ export const getViewRelatedTables = async (
|
|
|
81
81
|
tableName: rt.table_name,
|
|
82
82
|
tableNameEscaped: [rt.table_schema, rt.table_name].map((v) => JSON.stringify(v)).join("."),
|
|
83
83
|
condition: "TRUE",
|
|
84
|
-
|
|
84
|
+
tracked_columns: undefined,
|
|
85
85
|
});
|
|
86
86
|
}
|
|
87
87
|
});
|
|
@@ -80,14 +80,14 @@ export async function getSubscribeRelatedTables(
|
|
|
80
80
|
const joinColumns =
|
|
81
81
|
relatedTableJoinPathItem?.on.map((columnPair) => Object.values(columnPair)).flat() ?? [];
|
|
82
82
|
|
|
83
|
-
const
|
|
83
|
+
const [firstField, ...otherFields] = Array.from(
|
|
84
84
|
new Set([...(selectedColumnNames ?? []), ...joinColumns, ...joinConditionInfo.columnsUsed]),
|
|
85
85
|
);
|
|
86
86
|
|
|
87
87
|
viewOptions.relatedTables.push({
|
|
88
88
|
tableName: relatedTableName,
|
|
89
89
|
tableNameEscaped: asName(relatedTableName),
|
|
90
|
-
|
|
90
|
+
tracked_columns: !firstField ? undefined : [firstField, ...otherFields],
|
|
91
91
|
condition: joinConditionInfo.where,
|
|
92
92
|
});
|
|
93
93
|
};
|
|
@@ -83,12 +83,10 @@ export type ViewSubscriptionOptions = (
|
|
|
83
83
|
definition?: undefined;
|
|
84
84
|
}
|
|
85
85
|
) & {
|
|
86
|
-
relatedTables: {
|
|
86
|
+
relatedTables: (Pick<AddTriggerParams, "condition" | "tracked_columns"> & {
|
|
87
87
|
tableName: string;
|
|
88
88
|
tableNameEscaped: string;
|
|
89
|
-
|
|
90
|
-
trackedColumns: string[] | undefined;
|
|
91
|
-
}[];
|
|
89
|
+
})[];
|
|
92
90
|
};
|
|
93
91
|
|
|
94
92
|
export type SubscriptionParams = {
|
|
@@ -141,7 +139,7 @@ export type Subscription = Pick<
|
|
|
141
139
|
| "filter"
|
|
142
140
|
| "table_rules"
|
|
143
141
|
> & {
|
|
144
|
-
triggers: AddTriggerParams[];
|
|
142
|
+
triggers: [AddTriggerParams, ...AddTriggerParams[]];
|
|
145
143
|
};
|
|
146
144
|
|
|
147
145
|
export type TableTriggerInfo = {
|
|
@@ -10,10 +10,8 @@ import type {
|
|
|
10
10
|
import { parseCondition } from "./PubSubManagerUtils";
|
|
11
11
|
import type { AddTriggerParams } from "./addTrigger";
|
|
12
12
|
|
|
13
|
-
export type AddSubscriptionParams = SubscriptionParams &
|
|
14
|
-
condition
|
|
15
|
-
tracked_columns: string[] | undefined;
|
|
16
|
-
};
|
|
13
|
+
export type AddSubscriptionParams = SubscriptionParams &
|
|
14
|
+
Pick<AddTriggerParams, "condition" | "tracked_columns">;
|
|
17
15
|
|
|
18
16
|
type AddSubResult = SubscriptionChannels & {
|
|
19
17
|
sendFirstData: VoidFunction | undefined;
|
|
@@ -92,7 +90,7 @@ export async function addSub(
|
|
|
92
90
|
const relatedTrigger = {
|
|
93
91
|
table_name: relatedTable.tableName,
|
|
94
92
|
condition: parseCondition(relatedTable.condition),
|
|
95
|
-
tracked_columns: relatedTable.
|
|
93
|
+
tracked_columns: relatedTable.tracked_columns,
|
|
96
94
|
} satisfies AddTriggerParams;
|
|
97
95
|
|
|
98
96
|
newSub.triggers.push(relatedTrigger);
|
|
@@ -10,7 +10,7 @@ import type { TableHandler } from "../DboBuilder/TableHandler/TableHandler";
|
|
|
10
10
|
export type AddTriggerParams = {
|
|
11
11
|
table_name: string;
|
|
12
12
|
condition: string;
|
|
13
|
-
tracked_columns: string[] | undefined;
|
|
13
|
+
tracked_columns: [string, ...string[]] | undefined;
|
|
14
14
|
};
|
|
15
15
|
export async function addTrigger(
|
|
16
16
|
this: PubSubManager,
|
|
@@ -37,7 +37,7 @@ export const getDataWatchFunctionQuery = (debugMode: boolean | undefined) => {
|
|
|
37
37
|
escaped_table := concat_ws('.', CASE WHEN TG_TABLE_SCHEMA <> CURRENT_SCHEMA THEN format('%I', TG_TABLE_SCHEMA) END, format('%I', TG_TABLE_NAME));
|
|
38
38
|
|
|
39
39
|
${CHANGED_COLUMNS_FOR_EACH_TRIGGER_CHECK}
|
|
40
|
-
|
|
40
|
+
|
|
41
41
|
${EACH_TRIGGER_CHECK_ALL_COLUMNS}
|
|
42
42
|
|
|
43
43
|
IF (c_ids IS NOT NULL OR has_errors) THEN
|
|
@@ -112,79 +112,64 @@ export const getDataWatchFunctionQuery = (debugMode: boolean | undefined) => {
|
|
|
112
112
|
const CHANGED_COLUMNS_FOR_EACH_TRIGGER_CHECK = `
|
|
113
113
|
-- Determine changed columns for UPDATE operations
|
|
114
114
|
IF TG_OP = 'UPDATE' THEN
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
SELECT
|
|
118
|
-
FROM prostgles.v_triggers
|
|
115
|
+
|
|
116
|
+
FOR v_trigger IN
|
|
117
|
+
SELECT *
|
|
118
|
+
FROM prostgles.v_triggers
|
|
119
119
|
WHERE table_name = escaped_table
|
|
120
|
-
|
|
121
|
-
AND columns_info IS NULL
|
|
122
|
-
|
|
120
|
+
--AND table_condition_id = ANY(c_ids)
|
|
121
|
+
AND columns_info IS NOT NULL
|
|
122
|
+
/* These require the views to be added before as CTEs to ensure the condition works */
|
|
123
|
+
AND related_view_name IS NULL
|
|
124
|
+
AND related_view_def IS NULL
|
|
125
|
+
LOOP
|
|
123
126
|
|
|
124
127
|
changed_columns_by_trigger_id := COALESCE(changed_columns_by_trigger_id, '{}');
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
$c$
|
|
138
|
-
WITH changed AS (
|
|
139
|
-
SELECT column_name
|
|
140
|
-
FROM jsonb_object_keys(%1$L) as column_name
|
|
141
|
-
WHERE EXISTS (
|
|
142
|
-
SELECT 1
|
|
143
|
-
FROM (SELECT * FROM old_table as %5$I WHERE %4$s ) o
|
|
144
|
-
FULL OUTER JOIN (SELECT * FROM new_table as %5$I WHERE %4$s ) n
|
|
145
|
-
ON %2$s
|
|
146
|
-
WHERE %3$s
|
|
147
|
-
)
|
|
128
|
+
|
|
129
|
+
query := format(
|
|
130
|
+
$c$
|
|
131
|
+
WITH changed AS (
|
|
132
|
+
SELECT column_name
|
|
133
|
+
FROM jsonb_object_keys(%1$L) as column_name
|
|
134
|
+
WHERE EXISTS (
|
|
135
|
+
SELECT 1
|
|
136
|
+
FROM (SELECT * FROM old_table as %5$I WHERE %4$s ) o
|
|
137
|
+
FULL OUTER JOIN (SELECT * FROM new_table as %5$I WHERE %4$s ) n
|
|
138
|
+
ON %2$s
|
|
139
|
+
WHERE %3$s
|
|
148
140
|
)
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
141
|
+
)
|
|
142
|
+
SELECT array_agg(column_name)
|
|
143
|
+
FROM changed;
|
|
144
|
+
$c$,
|
|
145
|
+
v_trigger.columns_info->'tracked_columns',
|
|
146
|
+
v_trigger.columns_info->>'join_condition',
|
|
147
|
+
v_trigger.columns_info->>'where_statement',
|
|
148
|
+
v_trigger.condition,
|
|
149
|
+
TG_TABLE_NAME
|
|
150
|
+
);
|
|
151
|
+
|
|
152
|
+
BEGIN
|
|
153
|
+
EXECUTE query INTO changed_columns;
|
|
154
|
+
EXCEPTION WHEN OTHERS THEN
|
|
155
|
+
|
|
156
|
+
has_errors := TRUE;
|
|
158
157
|
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
GET STACKED DIAGNOSTICS
|
|
166
|
-
err_text = MESSAGE_TEXT,
|
|
167
|
-
err_detail = PG_EXCEPTION_DETAIL,
|
|
168
|
-
err_hint = PG_EXCEPTION_HINT;
|
|
169
|
-
END;
|
|
158
|
+
GET STACKED DIAGNOSTICS
|
|
159
|
+
err_text = MESSAGE_TEXT,
|
|
160
|
+
err_detail = PG_EXCEPTION_DETAIL,
|
|
161
|
+
err_hint = PG_EXCEPTION_HINT;
|
|
162
|
+
END;
|
|
170
163
|
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
END IF;
|
|
181
|
-
|
|
182
|
-
--PERFORM pg_notify('debug', changed_columns::TEXT || v_trigger.table_condition_id::TEXT || changed_columns_by_trigger_id::TEXT );
|
|
183
|
-
|
|
184
|
-
END LOOP;
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
END IF;
|
|
164
|
+
changed_columns := COALESCE(changed_columns, '{}');
|
|
165
|
+
changed_columns_by_trigger_id := jsonb_set(
|
|
166
|
+
changed_columns_by_trigger_id,
|
|
167
|
+
ARRAY[v_trigger.table_condition_id::TEXT],
|
|
168
|
+
to_jsonb(changed_columns)
|
|
169
|
+
);
|
|
170
|
+
|
|
171
|
+
END LOOP;
|
|
172
|
+
|
|
188
173
|
END IF;
|
|
189
174
|
|
|
190
175
|
`;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { includes, pickKeys } from "prostgles-types";
|
|
2
2
|
import { parseFieldFilter } from "../DboBuilder/ViewHandler/parseFieldFilter";
|
|
3
|
-
import type { PubSubManager } from "./PubSubManager";
|
|
3
|
+
import type { PubSubManager, Subscription } from "./PubSubManager";
|
|
4
4
|
import { DELIMITER, log, NOTIF_TYPE, type NotifTypeName } from "./PubSubManagerUtils";
|
|
5
5
|
|
|
6
6
|
/* Relay relevant data to relevant subscriptions */
|
|
@@ -111,9 +111,14 @@ export async function notifListener(this: PubSubManager, data: { payload: string
|
|
|
111
111
|
void this.deleteOrphanedTriggers(new Set(table_name));
|
|
112
112
|
}
|
|
113
113
|
|
|
114
|
-
|
|
114
|
+
const triggeredSubs = new Set<Subscription>();
|
|
115
|
+
firedTableConditions.map(({ table_condition_id, condition, subs, syncs }) => {
|
|
116
|
+
/**
|
|
117
|
+
* Each trigger with column_info AND no related view gets checked.
|
|
118
|
+
* If table_condition_id not present we assume all columns are changed.
|
|
119
|
+
*/
|
|
115
120
|
const changedColumns =
|
|
116
|
-
changedColumnsByTriggerId
|
|
121
|
+
!changedColumnsByTriggerId ? "*" : (changedColumnsByTriggerId[table_condition_id] ?? "*");
|
|
117
122
|
log(
|
|
118
123
|
"notifListener",
|
|
119
124
|
subs.map((s) => s.channel_name),
|
|
@@ -124,56 +129,59 @@ export async function notifListener(this: PubSubManager, data: { payload: string
|
|
|
124
129
|
void this.syncData(s, undefined, "trigger");
|
|
125
130
|
});
|
|
126
131
|
|
|
127
|
-
|
|
128
|
-
const activeAndReadySubs = subs.filter((sub) =>
|
|
129
|
-
sub.triggers.some(
|
|
130
|
-
(trg) =>
|
|
131
|
-
this.dbo[trg.table_name] &&
|
|
132
|
-
sub.is_ready &&
|
|
133
|
-
((sub.socket_id && this.sockets[sub.socket_id]) || sub.onData),
|
|
134
|
-
),
|
|
135
|
-
);
|
|
132
|
+
const operation = (op_name?.toLowerCase() || "insert") as "insert" | "delete" | "update";
|
|
136
133
|
|
|
137
|
-
|
|
138
|
-
const operation = (op_name?.toLowerCase() || "insert") as keyof NonNullable<typeof actions>;
|
|
134
|
+
subs.forEach((sub) => {
|
|
139
135
|
const { triggers, subscribeOptions } = sub;
|
|
140
|
-
const
|
|
141
|
-
const
|
|
142
|
-
const
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
) {
|
|
149
|
-
const
|
|
150
|
-
|
|
151
|
-
);
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
136
|
+
const { actions, skipChangedColumnsCheck } = subscribeOptions;
|
|
137
|
+
const tableHandler = this.dboBuilder.dboMap.get(table_name);
|
|
138
|
+
const subIsActive =
|
|
139
|
+
tableHandler &&
|
|
140
|
+
sub.is_ready &&
|
|
141
|
+
((sub.socket_id && this.sockets[sub.socket_id]) || sub.onData);
|
|
142
|
+
if (!subIsActive) return;
|
|
143
|
+
|
|
144
|
+
const didTrigger = triggers.find((subTrigger) => {
|
|
145
|
+
const matchesTableCondition =
|
|
146
|
+
subTrigger.table_name === table_name && subTrigger.condition === condition;
|
|
147
|
+
if (!matchesTableCondition) return false;
|
|
148
|
+
const matchesAction =
|
|
149
|
+
!actions ||
|
|
150
|
+
includes(parseFieldFilter(actions, false, ["insert", "update", "delete"]), operation);
|
|
151
|
+
if (!matchesAction) return false;
|
|
152
|
+
|
|
153
|
+
const subTrackedColumns = subTrigger.tracked_columns;
|
|
154
|
+
const matchesChangedColumns =
|
|
155
|
+
skipChangedColumnsCheck ||
|
|
156
|
+
operation !== "update" ||
|
|
157
|
+
changedColumns === "*" ||
|
|
158
|
+
!subTrackedColumns ||
|
|
159
|
+
changedColumns.some((changedColumn) => subTrackedColumns.includes(changedColumn));
|
|
160
|
+
return matchesChangedColumns;
|
|
161
|
+
});
|
|
162
|
+
if (!didTrigger) {
|
|
159
163
|
return;
|
|
160
164
|
}
|
|
161
|
-
|
|
162
|
-
if (!throttleOpts?.skipFirst && sub.lastPushed <= Date.now() - throttle) {
|
|
163
|
-
/* It is assumed the policy was checked before this point */
|
|
164
|
-
void this.pushSubData(sub);
|
|
165
|
-
} else if (!sub.is_throttling) {
|
|
166
|
-
log("throttling sub for", throttle, "ms");
|
|
167
|
-
sub.is_throttling = setTimeout(() => {
|
|
168
|
-
log("throttling finished. pushSubData...");
|
|
169
|
-
sub.is_throttling = null;
|
|
170
|
-
void this.pushSubData(sub);
|
|
171
|
-
}, throttle);
|
|
172
|
-
}
|
|
165
|
+
triggeredSubs.add(sub);
|
|
173
166
|
});
|
|
174
167
|
});
|
|
175
168
|
|
|
176
|
-
|
|
169
|
+
triggeredSubs.forEach((sub) => {
|
|
170
|
+
const {
|
|
171
|
+
subscribeOptions: { throttle = 0, throttleOpts },
|
|
172
|
+
} = sub;
|
|
173
|
+
if (!throttleOpts?.skipFirst && sub.lastPushed <= Date.now() - throttle) {
|
|
174
|
+
/* It is assumed the policy was checked before this point */
|
|
175
|
+
void this.pushSubData(sub);
|
|
176
|
+
} else if (!sub.is_throttling) {
|
|
177
|
+
log("throttling sub for", throttle, "ms");
|
|
178
|
+
sub.is_throttling = setTimeout(() => {
|
|
179
|
+
log("throttling finished. pushSubData...");
|
|
180
|
+
sub.is_throttling = null;
|
|
181
|
+
void this.pushSubData(sub);
|
|
182
|
+
}, throttle);
|
|
183
|
+
}
|
|
184
|
+
});
|
|
177
185
|
} else {
|
|
178
186
|
state = "invalid_condition_ids";
|
|
179
187
|
}
|