prostgles-server 4.2.296 → 4.2.297

package/dist/TableConfig/runSQLFile.d.ts

@@ -1,4 +1,7 @@
 import { type Prostgles } from "../Prostgles";
 export declare const runSQLFile: (prostgles: Prostgles) => Promise<number | undefined>;
+/**
+ * Given an sql error, return the lines of the query that caused the error.
+ */
 export declare const getQueryErrorPositionInfo: (err: any, _fileContent?: string) => string | undefined;
 //# sourceMappingURL=runSQLFile.d.ts.map

package/dist/TableConfig/runSQLFile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runSQLFile.d.ts","sourceRoot":"","sources":["../../lib/TableConfig/runSQLFile.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAE3D,eAAO,MAAM,UAAU,cAAqB,SAAS,gCAyBpD,CAAC;AAEF,eAAO,MAAM,yBAAyB,QAAS,GAAG,iBAAiB,MAAM,uBAcxE,CAAC"}
+{"version":3,"file":"runSQLFile.d.ts","sourceRoot":"","sources":["../../lib/TableConfig/runSQLFile.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAE3D,eAAO,MAAM,UAAU,cAAqB,SAAS,gCAyBpD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,yBAAyB,QAAS,GAAG,iBAAiB,MAAM,KAAG,MAAM,GAAG,SA4BpF,CAAC"}

package/dist/TableConfig/runSQLFile.js

@@ -28,8 +28,11 @@ const runSQLFile = async (prostgles) => {
     return res.data?.success;
 };
 exports.runSQLFile = runSQLFile;
+/**
+ * Given an sql error, return the lines of the query that caused the error.
+ */
 const getQueryErrorPositionInfo = (err, _fileContent) => {
-    const { position, length, query } = err, fileContent = _fileContent || query, lines = fileContent.split("\n");
+    const { position, length, query, internalPosition, internalQuery } = err, fileContent = _fileContent || query, lines = fileContent.split("\n");
     if (position && length && fileContent) {
         const startLine = Math.max(0, fileContent.substring(0, position).split("\n").length - 2), endLine = startLine + 3;
         return lines
@@ -37,6 +40,13 @@ const getQueryErrorPositionInfo = (err, _fileContent) => {
             .map((txt, i) => `${startLine + i + 1} ${i === 1 ? "->" : "  "} ${txt}`)
             .join("\n");
     }
+    if (internalPosition && internalQuery) {
+        return (0, exports.getQueryErrorPositionInfo)({
+            query: internalQuery,
+            position: parseInt(internalPosition),
+            length: internalQuery.length,
+        });
+    }
 };
 exports.getQueryErrorPositionInfo = getQueryErrorPositionInfo;
 //# sourceMappingURL=runSQLFile.js.map

package/dist/TableConfig/runSQLFile.js.map

@@ -1 +1 @@
-{"version":3,"file":"runSQLFile.js","sourceRoot":"","sources":["../../lib/TableConfig/runSQLFile.ts"],"names":[],"mappings":";;;AAAA,qDAA6C;AAC7C,4CAA2D;AAEpD,MAAM,UAAU,GAAG,KAAK,EAAE,SAAoB,EAAE,EAAE;IACvD,MAAM,EACJ,EAAE,EACF,IAAI,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,GAC7B,GAAG,SAAS,CAAC;IACd,IAAI,CAAC,WAAW;QAAE,OAAO;IACzB,IAAI,CAAC,EAAE;QAAE,MAAM,YAAY,CAAC;IAC5B,MAAM,GAAG,GAAG,MAAM,IAAA,4BAAU,EAAC,KAAK,IAAI,EAAE;QACtC,MAAM,WAAW,GAAG,MAAM,IAAA,uBAAW,EAAC,WAAW,CAAC,CAAC;QAEnD,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACvD,MAAM,OAAO,GAAG,IAAA,iCAAyB,EAAC,GAAG,EAAE,WAAW,CAAC,CAAC;YAC5D,OAAO,CAAC,KAAK,CAAC,oCAAoC,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;YAC1E,OAAO,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;QACH,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,MAAM,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,GAAG,EAAE,CAAC,CAAC;IAChE,IAAI,GAAG,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QAC5B,MAAM,GAAG,CAAC,KAAK,CAAC;IAClB,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,2CAA2C,EAAE,WAAW,CAAC,CAAC;IACxE,CAAC;IACD,OAAO,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC;AAC3B,CAAC,CAAC;AAzBW,QAAA,UAAU,cAyBrB;AAEK,MAAM,yBAAyB,GAAG,CAAC,GAAQ,EAAE,YAAqB,EAAE,EAAE;IAC3E,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAA0D,EAC5F,WAAW,GAAG,YAAY,IAAI,KAAK,EACnC,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAElC,IAAI,QAAQ,IAAI,MAAM,IAAI,WAAW,EAAE,CAAC;QACtC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,EACtF,OAAO,GAAG,SAAS,GAAG,CAAC,CAAC;QAE1B,OAAO,KAAK;aACT,KAAK,CAAC,SAAS,EAAE,OAAO,CAAC;aACzB,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,SAAS,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,GAAG,EAAE,CAAC;aACvE,IAAI,CAAC,IAAI,CAAC,CAAC;IAChB,CAAC;AACH,CAAC,CAAC;AAdW,QAAA,yBAAyB,6BAcpC"}
+{"version":3,"file":"runSQLFile.js","sourceRoot":"","sources":["../../lib/TableConfig/runSQLFile.ts"],"names":[],"mappings":";;;AAAA,qDAA6C;AAC7C,4CAA2D;AAEpD,MAAM,UAAU,GAAG,KAAK,EAAE,SAAoB,EAAE,EAAE;IACvD,MAAM,EACJ,EAAE,EACF,IAAI,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,GAC7B,GAAG,SAAS,CAAC;IACd,IAAI,CAAC,WAAW;QAAE,OAAO;IACzB,IAAI,CAAC,EAAE;QAAE,MAAM,YAAY,CAAC;IAC5B,MAAM,GAAG,GAAG,MAAM,IAAA,4BAAU,EAAC,KAAK,IAAI,EAAE;QACtC,MAAM,WAAW,GAAG,MAAM,IAAA,uBAAW,EAAC,WAAW,CAAC,CAAC;QAEnD,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACvD,MAAM,OAAO,GAAG,IAAA,iCAAyB,EAAC,GAAG,EAAE,WAAW,CAAC,CAAC;YAC5D,OAAO,CAAC,KAAK,CAAC,oCAAoC,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;YAC1E,OAAO,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;QACH,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,MAAM,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,GAAG,EAAE,CAAC,CAAC;IAChE,IAAI,GAAG,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QAC5B,MAAM,GAAG,CAAC,KAAK,CAAC;IAClB,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,2CAA2C,EAAE,WAAW,CAAC,CAAC;IACxE,CAAC;IACD,OAAO,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC;AAC3B,CAAC,CAAC;AAzBW,QAAA,UAAU,cAyBrB;AAEF;;GAEG;AACI,MAAM,yBAAyB,GAAG,CAAC,GAAQ,EAAE,YAAqB,EAAsB,EAAE;IAC/F,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,GAAG,GAMlE,EACD,WAAW,GAAG,YAAY,IAAI,KAAK,EACnC,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAElC,IAAI,QAAQ,IAAI,MAAM,IAAI,WAAW,EAAE,CAAC;QACtC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,EACtF,OAAO,GAAG,SAAS,GAAG,CAAC,CAAC;QAE1B,OAAO,KAAK;aACT,KAAK,CAAC,SAAS,EAAE,OAAO,CAAC;aACzB,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,SAAS,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,GAAG,EAAE,CAAC;aACvE,IAAI,CAAC,IAAI,CAAC,CAAC;IAChB,CAAC;IAED,IAAI,gBAAgB,IAAI,aAAa,EAAE,CAAC;QACtC,OAAO,IAAA,iCAAyB,EAAC;YAC/B,KAAK,EAAE,aAAa;YACpB,QAAQ,EAAE,QAAQ,CAAC,gBAAgB,CAAC;YACpC,MAAM,EAAE,aAAa,CAAC,MAAM;SAC7B,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC;AA5BW,QAAA,yBAAyB,6BA4BpC"}

package/lib/DboBuilder/DboBuilder.ts

@@ -7,8 +7,12 @@ import {
   PG_COLUMN_UDT_DATA_TYPE,
   SQLOptions,
   getJoinHandlers,
+  getSerialisableError,
   isDefined,
+  omitKeys,
   tryCatch,
+  tryCatchV2,
+  type AnyObject,
 } from "prostgles-types";
 import { getDBSchema } from "../DBSchemaBuilder";
 import { DB, Prostgles } from "../Prostgles";
@@ -40,6 +44,7 @@ import {
 import { getTablesForSchemaPostgresSQL } from "./getTablesForSchemaPostgresSQL";
 import { prepareShortestJoinPaths } from "./prepareShortestJoinPaths";
 import { cacheDBTypes, runSQL } from "./runSQL";
+import { getQueryErrorPositionInfo } from "../TableConfig/runSQLFile";
 
 export * from "./DboBuilderTypes";
 export * from "./dboBuilderUtils";
@@ -109,9 +114,13 @@ export class DboBuilder {
       if (!canExecute)
         throw "PubSubManager based subscriptions not possible: Cannot run EXECUTE statements on this connection";
 
-      const { pubSubManager, error, hasError } = await tryCatch(async () => {
+      const {
+        data: pubSubManager,
+        error,
+        hasError,
+      } = await tryCatchV2(async () => {
         const pubSubManager = await PubSubManager.create(this);
-        return { pubSubManager };
+        return pubSubManager;
       });
       this._pubSubManager = pubSubManager;
       if (hasError || !this._pubSubManager) {
@@ -119,8 +128,9 @@ export class DboBuilder {
           type: "debug",
           command: "PubSubManager.create",
           duration: 0,
-          error: getErrorAsObject(error),
+          error: getSerialisableError(error),
         });
+        console.error("Could not create PubSubManager", getQueryErrorPositionInfo(error));
         throw "Could not create this._pubSubManager check logs";
       }
     }

package/lib/DboBuilder/TableHandler/update.ts

@@ -6,10 +6,9 @@ import {
   getErrorAsObject,
   getSerializedClientErrorFromPGError,
   withUserRLS,
-  type TableHandlers,
 } from "../DboBuilder";
-import { getInsertTableRules, getReferenceColumnInserts } from "./insert/insertNestedRecords";
 import { prepareNewData } from "./DataValidator";
+import { getInsertTableRules, getReferenceColumnInserts } from "./insert/insertNestedRecords";
 import { runInsertUpdateQuery } from "./runInsertUpdateQuery";
 import { TableHandler } from "./TableHandler";
 import { updateFile } from "./updateFile";
@@ -82,7 +81,7 @@ export async function update(
         );
     }
 
-    const { data, allowedCols } = await prepareNewData({
+    const { data, allowedCols } = prepareNewData({
       row: newData,
       forcedData,
       allowedFields: fields,

package/lib/DboBuilder/ViewHandler/getValidatedSubscribeOptions.ts

@@ -16,6 +16,7 @@ export const getValidatedSubscribeOptions = (
         optional: true,
       },
       skipFirst: { type: "boolean", optional: true },
+      skipChangedColumnsCheck: { type: "boolean", optional: true },
       actions: {
         oneOf: [
           {
@@ -48,7 +49,13 @@ export const getValidatedSubscribeOptions = (
   }
 
   const publishedThrottle = subscribeRule?.throttle || 0;
-  const { actions, throttleOpts, skipFirst, throttle = publishedThrottle } = data;
+  const {
+    actions,
+    throttleOpts,
+    skipFirst,
+    throttle = publishedThrottle,
+    skipChangedColumnsCheck,
+  } = data;
   if (actions && isEmpty(actions)) {
     throw `addSub: actions cannot be empty`;
   }
@@ -68,5 +75,6 @@ export const getValidatedSubscribeOptions = (
     skipFirst,
     throttle,
     throttleOpts,
+    skipChangedColumnsCheck,
   };
 };

package/lib/DboBuilder/ViewHandler/subscribe.ts

@@ -81,7 +81,8 @@ async function subscribe(
       throw " Cannot have localFunc AND socket ";
     }
 
-    const { throttle, throttleOpts, skipFirst, actions, ...selectParams } = params;
+    const { throttle, throttleOpts, skipFirst, actions, skipChangedColumnsCheck, ...selectParams } =
+      params;
 
     /** Ensure request is valid */
     await this.find(filter, { ...selectParams, limit: 0 }, undefined, table_rules, localParams);
@@ -101,6 +102,7 @@ async function subscribe(
       newQuery,
     });
 
+    const tracked_columns = newQuery.select.filter((s) => s.selected).flatMap((c) => c.fields);
     const commonSubOpts = {
       table_info: this.tableOrViewInfo,
       viewOptions,
@@ -110,11 +112,11 @@ async function subscribe(
       filter: { ...filter },
       selectParams: { ...selectParams },
       subscribeOptions: getValidatedSubscribeOptions(
-        { actions, skipFirst, throttle, throttleOpts },
+        { actions, skipFirst, throttle, throttleOpts, skipChangedColumnsCheck },
         table_rules?.subscribe
       ),
       lastPushed: 0,
-      newQuery,
+      tracked_columns,
     } as const;
 
     const pubSubManager = await this.dboBuilder.getPubSubManager();

package/lib/DboBuilder/getSubscribeRelatedTables.ts

@@ -34,12 +34,14 @@ export async function getSubscribeRelatedTables(
     /** TODO: this needs to be memoized on schema fetch */
     const viewName = this.name;
     const viewNameEscaped = this.escapedName;
-    const { current_schema } = await this.db.oneOrNone("SELECT current_schema");
+    const { current_schema } = await this.db.one<{ current_schema: string }>(
+      "SELECT current_schema"
+    );
 
     /** Get list of used columns and their parent tables */
-    let { def } = (await this.db.oneOrNone("SELECT pg_get_viewdef(${viewName}) as def", {
+    let { def } = await this.db.one<{ def: string }>("SELECT pg_get_viewdef(${viewName}) as def", {
       viewName,
-    })) as { def: string };
+    });
     def = def.trim();
     if (def.endsWith(";")) {
       def = def.slice(0, -1);
@@ -53,7 +55,8 @@ export async function getSubscribeRelatedTables(
     }
     const { fields } = await this.dboBuilder.dbo.sql!(
       `SELECT * FROM ( \n ${def} \n ) prostgles_subscribe_view_definition LIMIT 0`,
-      {}
+      {},
+      { returnType: "default-with-rollback" }
     );
     const tableColumns = fields.filter((f) => f.tableName && f.columnName);
 
@@ -96,7 +99,7 @@ export async function getSubscribeRelatedTables(
             )`;
 
           try {
-            const { count } = await this.db.oneOrNone(`
+            const { count } = await this.db.one<{ count: number }>(`
             WITH ${asName(tableName)} AS (
               SELECT * 
               FROM ${asName(tableName)}

package/lib/PubSubManager/PubSubManager.ts

@@ -13,10 +13,10 @@ import {
 import { PostgresNotifListenManager } from "../PostgresNotifListenManager";
 import { DB } from "../Prostgles";
 import { addSync } from "./addSync";
-import { addTrigger } from "./addTrigger";
+import { addTrigger, type AddTriggerParams } from "./addTrigger";
 import { deleteOrphanedTriggers } from "./deleteOrphanedTriggers";
+import { initPubSubManager } from "./init/initPubSubManager";
 import { initialiseEventTriggers } from "./initialiseEventTriggers";
-import { initPubSubManager } from "./initPubSubManager";
 import { refreshTriggers } from "./refreshTriggers";
 
 import {
@@ -35,9 +35,8 @@ import { ParsedTableRule } from "../PublishParser/PublishParser";
 import { syncData } from "../SyncReplication";
 import { addSub } from "./addSub";
 import { notifListener } from "./notifListener";
-import { pushSubData } from "./pushSubData";
 import { log } from "./PubSubManagerUtils";
-import type { NewQuery } from "../DboBuilder/QueryBuilder/QueryBuilder";
+import { pushSubData } from "./pushSubData";
 
 export type BasicCallback = (err?: any, res?: any) => void;
 
@@ -101,7 +100,7 @@ export type SubscriptionParams = {
   channel_name: string;
 
   /**
-   * If this is a view then an array with all related tables will be
+   * If this is a view then all related tables will be added triggers
    * */
   viewOptions?: ViewSubscriptionOptions;
   parentSubParams: Omit<SubscriptionParams, "parentSubParams"> | undefined;
@@ -113,7 +112,7 @@ export type SubscriptionParams = {
   filter: object;
   selectParams: SelectParams;
   subscribeOptions: SubscribeOptions;
-  newQuery: NewQuery;
+  tracked_columns: string[] | undefined;
 
   localFuncs?: LocalFuncs;
   socket: PRGLIOSocket | undefined;
@@ -137,13 +136,9 @@ export type Subscription = Pick<
   | "table_info"
   | "filter"
   | "table_rules"
-  | "newQuery"
+  | "tracked_columns"
 > & {
-  triggers: {
-    table_name: string;
-    condition: string;
-    is_related: boolean;
-  }[];
+  triggers: AddTriggerParams[];
 };
 
 export type PubSubManagerTriggers = Record<string, { condition: string; hash: string }[]>;

package/lib/PubSubManager/addSub.ts

@@ -1,8 +1,9 @@
 import { SubscriptionChannels } from "prostgles-types";
 import { VoidFunction } from "../SchemaWatch/SchemaWatch";
-import { tout } from "./initPubSubManager";
+import { tout } from "./init/initPubSubManager";
 import { BasicCallback, PubSubManager, Subscription, SubscriptionParams } from "./PubSubManager";
 import { parseCondition } from "./PubSubManagerUtils";
+import type { AddTriggerParams } from "./addTrigger";
 
 type AddSubscriptionParams = SubscriptionParams & {
   condition: string;
@@ -28,7 +29,7 @@ export async function addSub(
     viewOptions,
     table_info,
     subscribeOptions,
-    newQuery,
+    tracked_columns,
   } = subscriptionParams;
   const table_name = table_info.name;
 
@@ -39,12 +40,12 @@ export async function addSub(
     throw "addSub: cannot have socket AND func";
   }
 
-  const channel_name = `${this.socketChannelPreffix}.${table_name}.${JSON.stringify(filter)}.${JSON.stringify(selectParams)}.${"m"}.sub`;
+  const channel_name = `${this.socketChannelPreffix}.${table_name}.${JSON.stringify(filter)}.${JSON.stringify(selectParams)}.m.sub`;
   const mainTrigger = {
     table_name: table_name,
     condition: parseCondition(condition),
-    is_related: false,
-  } as const;
+    tracked_columns,
+  } satisfies AddTriggerParams;
 
   const newSub: Subscription = {
     channel_name,
@@ -59,7 +60,7 @@ export async function addSub(
     is_throttling: false,
     socket_id: socket?.id,
     table_rules,
-    newQuery,
+    tracked_columns,
     triggers: [mainTrigger],
   };
 
@@ -85,8 +86,8 @@ export async function addSub(
       const relatedSub = {
         table_name: relatedTable.tableName,
         condition: parseCondition(relatedTable.condition),
-        is_related: true,
-      } as const;
+        tracked_columns: undefined,
+      } satisfies AddTriggerParams;
 
       newSub.triggers.push(relatedSub);
 
@@ -142,7 +143,7 @@ export async function addSub(
 
   this.subs.push(newSub);
 
-  /** A view does not have triggers. Only related triggers */
+  /** A view will not have triggers. Related tables are added triggers instead */
   if (table_info.is_view) {
     if (!viewOptions?.relatedTables.length) {
       throw "PubSubManager: view parent_tables missing";

package/lib/PubSubManager/addSync.ts

@@ -122,7 +122,11 @@ export async function addSync(
 
     upsertSync();
 
-    await this.addTrigger({ table_name, condition: conditionParsed }, undefined, socket);
+    await this.addTrigger(
+      { table_name, condition: conditionParsed, tracked_columns: undefined },
+      undefined,
+      socket
+    );
 
     return { channelName };
   });

package/lib/PubSubManager/addTrigger.ts

@@ -1,12 +1,19 @@
-import { tryCatchV2 } from "prostgles-types";
+import { asName, pickKeys, tryCatchV2 } from "prostgles-types";
 import { type PubSubManager, ViewSubscriptionOptions } from "./PubSubManager";
 import * as crypto from "crypto";
 import { PRGLIOSocket } from "../DboBuilder/DboBuilderTypes";
 import { asValue, EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID } from "./PubSubManagerUtils";
+import { udtNamesWithoutEqualityComparison } from "./init/getDataWatchFunctionQuery";
+import type { TableHandler } from "../DboBuilder/TableHandler/TableHandler";
 
+export type AddTriggerParams = {
+  table_name: string;
+  condition: string;
+  tracked_columns: string[] | undefined;
+};
 export async function addTrigger(
   this: PubSubManager,
-  params: { table_name: string; condition: string },
+  params: AddTriggerParams,
   viewOptions: ViewSubscriptionOptions | undefined,
   socket: PRGLIOSocket | undefined
 ) {
@@ -14,7 +21,6 @@ export async function addTrigger(
     const { table_name } = { ...params };
     let { condition } = { ...params };
     if (!table_name) throw "MISSING table_name";
-
     if (!condition || !condition.trim().length) {
       condition = "TRUE";
     }
@@ -29,6 +35,11 @@ export async function addTrigger(
       condHash: asValue(crypto.createHash("md5").update(condition).digest("hex")),
     };
 
+    const tableHandler = this.dbo[table_name];
+    if (!tableHandler) {
+      throw `Cannot add trigger. Tablehandler for ${table_name} not found`;
+    }
+
     await this.db.tx((t) =>
       t.any(`
       BEGIN WORK;
@@ -52,7 +63,8 @@ export async function addTrigger(
         condition_hash, 
         app_id, 
         related_view_name, 
-        related_view_def
+        related_view_def,
+        columns_info
       ) 
       VALUES (
         ${trgVals.tbl}, 
@@ -60,9 +72,20 @@ export async function addTrigger(
         ${trgVals.condHash},
         ${asValue(this.appId)}, 
         ${asValue(viewOptions?.viewName ?? null)}, 
-        ${asValue(viewOptions?.definition ?? null)}
+        ${asValue(viewOptions?.definition ?? null)},
+        ${asValue(getColumnsInfo(params, tableHandler))}
       )
-      ON CONFLICT DO NOTHING;
+      ON CONFLICT (app_id, table_name, condition_hash)
+      DO UPDATE  /* upsert tracked_columns where necessary */
+        SET columns_info = CASE WHEN EXCLUDED.columns_info IS NOT NULL THEN 
+          jsonb_set(
+            prostgles.app_triggers.columns_info, 
+            '{tracked_columns}', 
+            prostgles.app_triggers.columns_info->'tracked_columns' || EXCLUDED.columns_info->'tracked_columns'
+          ) 
+        END 
+      WHERE prostgles.app_triggers.columns_info IS NOT NULL
+      ;
 
       COMMIT WORK;
     `)
@@ -93,3 +116,51 @@ export async function addTrigger(
 
   return addedTrigger;
 }
+
+const getColumnsInfo = (
+  { tracked_columns, table_name }: AddTriggerParams,
+  tableHandler: Partial<TableHandler>
+) => {
+  if (tracked_columns && !tracked_columns.length) {
+    throw "tracked_columns cannot be defined and empty";
+  }
+
+  let hasPkey = false as boolean;
+  const cols = tableHandler.columns?.map((c) => {
+    hasPkey = hasPkey || c.is_pkey;
+    return {
+      ...pickKeys(c, ["name", "is_pkey"]),
+      cast_to: udtNamesWithoutEqualityComparison.includes(c.udt_name) ? "::TEXT" : "",
+    };
+  });
+  tracked_columns?.forEach((colName) => {
+    if (!cols?.some((c) => c.name === colName)) {
+      throw `tracked_columns ${colName} not found in table ${table_name}`;
+    }
+  });
+  const columns_info =
+    !hasPkey || !cols || !tracked_columns?.length || tracked_columns.length === cols.length ?
+      null
+    : {
+        join_condition: cols
+          .filter((c) => c.is_pkey)
+          .map((c) => `n.${asName(c.name)} = o.${asName(c.name)}`)
+          .join(" AND "),
+        tracked_columns: tracked_columns.reduce(
+          (acc, colName) => ({
+            ...acc,
+            [colName]: 1,
+          }),
+          {} as Record<string, number>
+        ),
+        where_statement: cols
+          .filter((c) => !c.is_pkey && tracked_columns.includes(c.name))
+          .map(
+            (c) =>
+              `column_name = ${asValue(c.name)} AND n.${asName(c.name)}${c.cast_to} IS DISTINCT FROM o.${asName(c.name)}${c.cast_to}`
+          )
+          .join(" OR \n"),
+      };
+
+  return columns_info;
+};

package/lib/PubSubManager/getCreatePubSubManagerError.ts

@@ -1,5 +1,5 @@
 import { tryCatch, tryCatchV2 } from "prostgles-types";
-import { getPubSubManagerInitQuery } from "./getPubSubManagerInitQuery";
+import { getPubSubManagerInitQuery } from "./init/getPubSubManagerInitQuery";
 import { getCanExecute } from "../DboBuilder/dboBuilderUtils";
 import { DboBuilder } from "../DboBuilder/DboBuilder";