prostgles-server 4.2.490 → 4.2.492

package/lib/PubSubManager/init/getDataWatchFunctionQuery.ts

@@ -43,9 +43,9 @@ export const getDataWatchFunctionQuery = (debugMode: boolean | undefined) => {
                 IF (c_ids IS NOT NULL OR has_errors) THEN
 
                   FOR v_trigger IN
-                      SELECT app_id, string_agg(DISTINCT c_id::text, ',') as cids
+                      SELECT app_id, string_agg(DISTINCT table_condition_id::text, ',') as cids
                       FROM prostgles.v_triggers
-                      WHERE c_id = ANY(c_ids) 
+                      WHERE table_condition_id = ANY(c_ids) 
                       OR has_errors
                       GROUP BY app_id
                   LOOP
@@ -112,79 +112,69 @@ export const getDataWatchFunctionQuery = (debugMode: boolean | undefined) => {
 const CHANGED_COLUMNS_FOR_EACH_TRIGGER_CHECK = `
 -- Determine changed columns for UPDATE operations
 IF TG_OP = 'UPDATE' THEN
- 
-  IF NOT EXISTS (
-    SELECT 1
-    FROM prostgles.v_triggers  
+
+  FOR v_trigger IN
+    SELECT * 
+    FROM prostgles.v_triggers
     WHERE table_name = escaped_table
-    /* If any value is null it means some condition is tracking all columns so we need to check them all */
-    AND columns_info IS NULL
-  ) THEN
+    AND columns_info IS NOT NULL
+    /* These require the views to be added before as CTEs to ensure the condition works */
+    AND related_view_name IS NULL
+    AND related_view_def  IS NULL
+  LOOP
 
     changed_columns_by_trigger_id := COALESCE(changed_columns_by_trigger_id, '{}');
- 
-    FOR v_trigger IN
-      SELECT * 
-      FROM prostgles.v_triggers
-      WHERE table_name = escaped_table
-      AND columns_info IS NOT NULL
-      /* These require the views to be added before as CTEs to ensure the condition works */
-      AND related_view_name IS NULL
-      AND related_view_def  IS NULL
-    LOOP
-
-      query := format(
-        $c$
-          WITH changed AS (
-            SELECT column_name
-            FROM jsonb_object_keys(%1$L) as column_name
-            WHERE EXISTS (
-              SELECT 1 
-              FROM      (SELECT * FROM old_table as %5$I WHERE %4$s ) o 
-              FULL OUTER JOIN (SELECT * FROM new_table as %5$I WHERE %4$s ) n 
-              ON %2$s 
-              WHERE %3$s
-            )
+
+    query := format(
+      $c$
+        WITH changed AS (
+          SELECT column_name
+          FROM jsonb_object_keys(%1$L) as column_name
+          WHERE EXISTS (
+            SELECT 1 
+            FROM      (SELECT * FROM old_table as %5$I WHERE %4$s ) o 
+            FULL OUTER JOIN (SELECT * FROM new_table as %5$I WHERE %4$s ) n 
+            ON %2$s 
+            WHERE %3$s
           )
-          SELECT array_agg(column_name) 
-          FROM changed;
-        $c$,
-        v_trigger.columns_info->'tracked_columns',
-        v_trigger.columns_info->>'join_condition',
-        v_trigger.columns_info->>'where_statement',
-        v_trigger.condition,
-        TG_TABLE_NAME
-      );
+        )
+        SELECT array_agg(column_name) 
+        FROM changed;
+      $c$,
+      v_trigger.columns_info->'tracked_columns',
+      v_trigger.columns_info->>'join_condition',
+      v_trigger.columns_info->>'where_statement',
+      v_trigger.condition,
+      TG_TABLE_NAME
+    );
+
+    BEGIN
+      EXECUTE query INTO changed_columns;
+      EXCEPTION WHEN OTHERS THEN
+        
+        has_errors := TRUE;
 
-      BEGIN
-        EXECUTE query INTO changed_columns;
-        EXCEPTION WHEN OTHERS THEN
-          
-          has_errors := TRUE;
-
-          GET STACKED DIAGNOSTICS 
-            err_text = MESSAGE_TEXT,
-            err_detail = PG_EXCEPTION_DETAIL,
-            err_hint = PG_EXCEPTION_HINT;
-      END;
- 
-      /* It is possible to get no changes */
-      IF changed_columns IS NOT NULL THEN 
-      
-        changed_columns := COALESCE(changed_columns, '{}');
-        changed_columns_by_trigger_id := jsonb_set(
-          changed_columns_by_trigger_id,
-          ARRAY[v_trigger.c_id::TEXT],
-          to_jsonb(changed_columns)
-        );
-      END IF; 
-   
-    --PERFORM pg_notify('debug', changed_columns::TEXT || v_trigger.c_id::TEXT || changed_columns_by_trigger_id::TEXT );
-     
-    END LOOP;
-   
+        GET STACKED DIAGNOSTICS 
+          err_text = MESSAGE_TEXT,
+          err_detail = PG_EXCEPTION_DETAIL,
+          err_hint = PG_EXCEPTION_HINT;
+    END;
 
-  END IF;
+    /* It is possible to get no changes */
+    IF changed_columns IS NOT NULL THEN 
+    
+      changed_columns := COALESCE(changed_columns, '{}');
+      changed_columns_by_trigger_id := jsonb_set(
+        changed_columns_by_trigger_id,
+        ARRAY[v_trigger.table_condition_id::TEXT],
+        to_jsonb(changed_columns)
+      );
+    END IF; 
+  
+  --PERFORM pg_notify('debug', changed_columns::TEXT || v_trigger.table_condition_id::TEXT || changed_columns_by_trigger_id::TEXT );
+    
+  END LOOP;
+  
 END IF;
 
 `;
@@ -198,11 +188,11 @@ const EACH_TRIGGER_CHECK_ALL_COLUMNS = `
           SELECT 1 
           FROM %s 
           WHERE %s 
-        ) THEN %s::text END AS c_id
+        ) THEN %s::text END AS table_condition_id
       $c$, 
       table_name, 
       condition, 
-      c_id 
+      table_condition_id 
     ),
     E' UNION \n ' 
   ) 
@@ -238,7 +228,7 @@ const EACH_TRIGGER_CHECK_ALL_COLUMNS = `
       || 
       format(
         $c$
-            SELECT ARRAY_AGG(DISTINCT t.c_id)
+            SELECT ARRAY_AGG(DISTINCT t.table_condition_id)
             FROM ( 
               %s 
             ) t

package/lib/PubSubManager/init/getPubSubManagerInitQuery.ts

@@ -219,7 +219,7 @@ BEGIN
         CREATE OR REPLACE VIEW prostgles.v_triggers AS
         SELECT *
           , (ROW_NUMBER() OVER( ORDER BY table_name, condition ))::text AS id 
-          , ROW_NUMBER() OVER(PARTITION BY app_id, table_name ORDER BY table_name, condition ) - 1 AS c_id
+          , ROW_NUMBER() OVER(PARTITION BY app_id, table_name ORDER BY table_name, condition ) - 1 AS table_condition_id
         FROM prostgles.app_triggers;
         COMMENT ON VIEW prostgles.v_triggers IS 'Augment trigger table with natural IDs and per app IDs';
 

package/lib/PubSubManager/notifListener.ts

@@ -1,6 +1,6 @@
 import { includes, pickKeys } from "prostgles-types";
 import { parseFieldFilter } from "../DboBuilder/ViewHandler/parseFieldFilter";
-import type { PubSubManager } from "./PubSubManager";
+import type { PubSubManager, Subscription } from "./PubSubManager";
 import { DELIMITER, log, NOTIF_TYPE, type NotifTypeName } from "./PubSubManagerUtils";
 
 /* Relay relevant data to relevant subscriptions */
@@ -100,8 +100,8 @@ export async function notifListener(this: PubSubManager, data: { payload: string
     /* Trigger ok */
   } else if (conditionIds?.every((id) => Number.isInteger(id))) {
     state = "ok";
-    const firedTableConditions = tableTriggerConditions.filter(({ idx }) =>
-      conditionIds.includes(idx),
+    const firedTableConditions = tableTriggerConditions.filter(({ table_condition_id }) =>
+      conditionIds.includes(table_condition_id),
     );
     const orphanedTableConditions = conditionIds.filter((condId) => {
       const tc = tableTriggerConditions.at(condId);
@@ -111,8 +111,10 @@ export async function notifListener(this: PubSubManager, data: { payload: string
       void this.deleteOrphanedTriggers(new Set(table_name));
     }
 
-    firedTableConditions.map(({ idx, subs, syncs }) => {
-      const changedColumns = changedColumnsByTriggerId && (changedColumnsByTriggerId[idx] ?? []);
+    const triggeredSubs = new Set<Subscription>();
+    firedTableConditions.map(({ table_condition_id, condition, subs, syncs }) => {
+      const changedColumns =
+        !changedColumnsByTriggerId ? "*" : (changedColumnsByTriggerId[table_condition_id] ?? []);
       log(
         "notifListener",
         subs.map((s) => s.channel_name),
@@ -123,54 +125,57 @@ export async function notifListener(this: PubSubManager, data: { payload: string
         void this.syncData(s, undefined, "trigger");
       });
 
-      /* Throttle the subscriptions */
-      const activeAndReadySubs = subs.filter((sub) =>
-        sub.triggers.some(
-          (trg) =>
-            this.dbo[trg.table_name] &&
-            sub.is_ready &&
-            ((sub.socket_id && this.sockets[sub.socket_id]) || sub.onData),
-        ),
-      );
-
-      activeAndReadySubs.forEach((sub) => {
-        const operation = (op_name?.toLowerCase() || "insert") as keyof NonNullable<typeof actions>;
-        const { tracked_columns, subscribeOptions } = sub;
-        const { throttle = 0, throttleOpts, actions, skipChangedColumnsCheck } = subscribeOptions;
-        if (
-          !skipChangedColumnsCheck &&
-          changedColumns &&
-          operation === "update" &&
-          tracked_columns
-        ) {
-          const subFieldsHaveChanged = changedColumns.some((changedColumn) =>
-            tracked_columns.includes(changedColumn),
-          );
-          if (!subFieldsHaveChanged) return;
-        }
-
-        const actionIsIgnored =
-          actions &&
-          !includes(parseFieldFilter(actions, false, ["insert", "update", "delete"]), operation);
-        if (actionIsIgnored) {
+      const operation = (op_name?.toLowerCase() || "insert") as "insert" | "delete" | "update";
+
+      subs.forEach((sub) => {
+        const { triggers, subscribeOptions } = sub;
+        const { actions, skipChangedColumnsCheck } = subscribeOptions;
+
+        const subIsActive =
+          sub.is_ready && ((sub.socket_id && this.sockets[sub.socket_id]) || sub.onData);
+        if (!subIsActive) return;
+
+        const didTrigger = triggers.find((subTrigger) => {
+          const matchesTableCondition =
+            subTrigger.table_name === table_name && subTrigger.condition === condition;
+          if (!matchesTableCondition) return false;
+          const matchesAction =
+            !actions ||
+            includes(parseFieldFilter(actions, false, ["insert", "update", "delete"]), operation);
+          if (!matchesAction) return false;
+
+          const subTrackedColumns = subTrigger.tracked_columns;
+          const matchesChangedColumns =
+            skipChangedColumnsCheck ||
+            operation !== "update" ||
+            changedColumns === "*" ||
+            !subTrackedColumns ||
+            changedColumns.some((changedColumn) => subTrackedColumns.includes(changedColumn));
+          return matchesChangedColumns;
+        });
+        if (!didTrigger) {
           return;
         }
-
-        if (!throttleOpts?.skipFirst && sub.lastPushed <= Date.now() - throttle) {
-          /* It is assumed the policy was checked before this point */
-          void this.pushSubData(sub);
-        } else if (!sub.is_throttling) {
-          log("throttling sub for", throttle, "ms");
-          sub.is_throttling = setTimeout(() => {
-            log("throttling finished. pushSubData...");
-            sub.is_throttling = null;
-            void this.pushSubData(sub);
-          }, throttle);
-        }
+        triggeredSubs.add(sub);
       });
     });
 
-    /* Trigger unknown issue */
+    triggeredSubs.forEach((sub) => {
+      const {
+        subscribeOptions: { throttle = 0, throttleOpts },
+      } = sub;
+      if (!throttleOpts?.skipFirst && sub.lastPushed <= Date.now() - throttle) {
+        /* It is assumed the policy was checked before this point */
+        void this.pushSubData(sub);
+      } else if (!sub.is_throttling) {
+        log("throttling sub for", throttle, "ms");
+        sub.is_throttling = setTimeout(() => {
+          log("throttling finished. pushSubData...");
+          sub.is_throttling = null;
+          void this.pushSubData(sub);
+        }, throttle);
+      }
+    });
   } else {
     state = "invalid_condition_ids";
   }

package/lib/PubSubManager/refreshTriggers.ts

@@ -4,6 +4,7 @@ export async function refreshTriggers(this: PubSubManager) {
   const start = Date.now();
   const triggers = await this.db.any<{
     table_name: string;
+    table_condition_id: string;
     condition: string;
     condition_hash: string;
     columns_info: TableTriggerInfo["columnInfo"];
@@ -19,17 +20,19 @@ export async function refreshTriggers(this: PubSubManager) {
 
   const oldTriggers = new Map(this._triggers);
 
-  this._triggers = new Map();
-  triggers.map((t) => {
-    this._triggers.set(t.table_name, this._triggers.get(t.table_name) ?? []);
+  triggers.forEach((t) => {
+    this._triggers.set(
+      t.table_name,
+      this._triggers.get(t.table_name) ?? new Map<number, TableTriggerInfo>(),
+    );
     const tableTriggers = this._triggers.get(t.table_name)!;
-    if (!tableTriggers.map((t) => t.condition).includes(t.condition)) {
-      tableTriggers.push({
-        condition: t.condition,
-        hash: t.condition_hash,
-        columnInfo: t.columns_info,
-      });
-    }
+    const table_condition_id = Number(t.table_condition_id);
+    tableTriggers.set(table_condition_id, {
+      condition: t.condition,
+      hash: t.condition_hash,
+      columnInfo: t.columns_info,
+      table_condition_id,
+    });
   });
 
   await this._log({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "4.2.490",
+  "version": "4.2.492",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",