prostgles-server 3.0.49 → 3.0.51

package/lib/DboBuilder/TableHandler.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TableHandler = void 0;
 const prostgles_types_1 = require("prostgles-types");
 const DboBuilder_1 = require("../DboBuilder");
-const PubSubManager_1 = require("../PubSubManager");
 const delete_1 = require("./delete");
 const insert_1 = require("./insert");
 const insertDataParse_1 = require("./insertDataParse");
@@ -59,79 +58,6 @@ class TableHandler extends ViewHandler_1.ViewHandler {
             return true;
         }
     }
-    async subscribe(filter, params = {}, localFunc, table_rules, localParams) {
-        try {
-            if (this.is_view)
-                throw "Cannot subscribe to a view";
-            if (this.t)
-                throw "subscribe not allowed within transactions";
-            if (!localParams && !localFunc)
-                throw " missing data. provide -> localFunc | localParams { socket } ";
-            if (localParams && localParams.socket && localFunc) {
-                console.error({ localParams, localFunc });
-                throw " Cannot have localFunc AND socket ";
-            }
-            const { filterFields, forcedFilter } = table_rules?.select || {}, filterOpts = await this.prepareWhere({ filter, forcedFilter, addKeywords: false, filterFields, tableAlias: undefined, localParams, tableRule: table_rules }), condition = filterOpts.where, throttle = params?.throttle || 0, selectParams = (0, PubSubManager_1.omitKeys)(params || {}, ["throttle"]);
-            /** app_triggers condition field has an index which limits it's value */
-            const filterSize = JSON.stringify(filter || {}).length;
-            if (filterSize * 4 > 2704) {
-                throw "filter too big. Might exceed the btree version 4 maximum 2704. Use a primary key or a $rowhash filter instead";
-            }
-            if (!localFunc) {
-                if (!this.dboBuilder.prostgles.isSuperUser)
-                    throw "Subscribe not possible. Must be superuser to add triggers 1856";
-                return await this.find(filter, { ...selectParams, limit: 0 }, undefined, table_rules, localParams)
-                    .then(async (isValid) => {
-                    const { socket } = localParams ?? {};
-                    const pubSubManager = await this.dboBuilder.getPubSubManager();
-                    return pubSubManager.addSub({
-                        table_info: this.tableOrViewInfo,
-                        socket,
-                        table_rules,
-                        condition: condition,
-                        func: undefined,
-                        filter: { ...filter },
-                        params: { ...selectParams },
-                        socket_id: socket?.id,
-                        table_name: this.name,
-                        throttle,
-                        last_throttled: 0,
-                    }).then(channelName => ({ channelName }));
-                });
-            }
-            else {
-                const pubSubManager = await this.dboBuilder.getPubSubManager();
-                pubSubManager.addSub({
-                    table_info: this.tableOrViewInfo,
-                    socket: undefined,
-                    table_rules,
-                    condition,
-                    func: localFunc,
-                    filter: { ...filter },
-                    params: { ...selectParams },
-                    socket_id: undefined,
-                    table_name: this.name,
-                    throttle,
-                    last_throttled: 0,
-                }).then(channelName => ({ channelName }));
-                const unsubscribe = async () => {
-                    const pubSubManager = await this.dboBuilder.getPubSubManager();
-                    pubSubManager.removeLocalSub(this.name, condition, localFunc);
-                };
-                let res = Object.freeze({ unsubscribe });
-                return res;
-            }
-        }
-        catch (e) {
-            if (localParams && localParams.testRule)
-                throw e;
-            throw (0, DboBuilder_1.parseError)(e, `dbo.${this.name}.subscribe()`);
-        }
-    }
-    subscribeOne(filter, params = {}, localFunc, table_rules, localParams) {
-        let func = localParams ? undefined : (rows) => localFunc(rows[0]);
-        return this.subscribe(filter, { ...params, limit: 2 }, func, table_rules, localParams);
-    }
     async updateBatch(data, params, tableRules, localParams) {
         try {
             const queries = await Promise.all(data.map(async ([filter, data]) => await this.update(filter, data, { ...(params || {}), returning: undefined }, tableRules, { ...(localParams || {}), returnQuery: true })));

package/lib/DboBuilder/TableHandler.ts

@@ -1,9 +1,8 @@
 import pgPromise from "pg-promise";
-import { AnyObject, asName, DeleteParams, FieldFilter, getKeys, InsertParams, isDefined, isObject, Select, SelectParams, SubscribeParams, UpdateParams } from "prostgles-types";
+import { AnyObject, asName, DeleteParams, FieldFilter, getKeys, InsertParams, isObject, Select, SelectParams, UpdateParams } from "prostgles-types";
 import { DboBuilder, Filter, LocalParams, makeErr, parseError, TableHandlers, TableSchema } from "../DboBuilder";
 import { DB } from "../Prostgles";
-import { SyncRule, TableRule, UpdateRule, ValidateRow, ValidateUpdateRow } from "../PublishParser";
-import { omitKeys } from "../PubSubManager";
+import { SyncRule, TableRule } from "../PublishParser"; 
 import { _delete } from "./delete";
 import { insert } from "./insert";
 import { insertDataParse } from "./insertDataParse";
@@ -61,89 +60,6 @@ export class TableHandler extends ViewHandler {
     }
   }
 
-  async subscribe(filter: Filter, params: SubscribeParams, localFunc: (items: AnyObject[]) => any): Promise<{ unsubscribe: () => any }>
-  async subscribe(filter: Filter, params: SubscribeParams, localFunc?: (items: AnyObject[]) => any, table_rules?: TableRule, localParams?: LocalParams): Promise<string>
-  async subscribe(filter: Filter, params: SubscribeParams = {}, localFunc?: (items: AnyObject[]) => any, table_rules?: TableRule, localParams?: LocalParams):
-    Promise<string | { unsubscribe: () => any }> {
-    try {
-      if (this.is_view) throw "Cannot subscribe to a view";
-      if (this.t) throw "subscribe not allowed within transactions";
-      if (!localParams && !localFunc) throw " missing data. provide -> localFunc | localParams { socket } ";
-      if (localParams && localParams.socket && localFunc) {
-        console.error({ localParams, localFunc })
-        throw " Cannot have localFunc AND socket ";
-      }
-
-      const { filterFields, forcedFilter } = table_rules?.select || {},
-        filterOpts = await this.prepareWhere({ filter, forcedFilter, addKeywords: false, filterFields, tableAlias: undefined, localParams, tableRule: table_rules }),
-        condition = filterOpts.where,
-        throttle = params?.throttle || 0,
-        selectParams = omitKeys(params || {}, ["throttle"]);
- 
-      /** app_triggers condition field has an index which limits it's value */
-      const filterSize = JSON.stringify(filter || {}).length;
-      if (filterSize * 4 > 2704) {
-        throw "filter too big. Might exceed the btree version 4 maximum 2704. Use a primary key or a $rowhash filter instead"
-      }
-
-      if (!localFunc) {
-        if (!this.dboBuilder.prostgles.isSuperUser) throw "Subscribe not possible. Must be superuser to add triggers 1856";
-        return await this.find(filter, { ...selectParams, limit: 0 }, undefined, table_rules, localParams)
-          .then(async isValid => {
-
-            const { socket } = localParams ?? {};
-            const pubSubManager = await this.dboBuilder.getPubSubManager();
-            return pubSubManager.addSub({
-              table_info: this.tableOrViewInfo,
-              socket,
-              table_rules,
-              condition: condition,
-              func: undefined,
-              filter: { ...filter },
-              params: { ...selectParams },
-              socket_id: socket?.id,
-              table_name: this.name,
-              throttle,
-              last_throttled: 0, 
-            }).then(channelName => ({ channelName }));
-          }) as string;
-      } else {
-        const pubSubManager = await this.dboBuilder.getPubSubManager();
-        pubSubManager.addSub({
-          table_info: this.tableOrViewInfo,
-          socket: undefined,
-          table_rules,
-          condition,
-          func: localFunc,
-          filter: { ...filter },
-          params: { ...selectParams },
-          socket_id: undefined,
-          table_name: this.name,
-          throttle,
-          last_throttled: 0, 
-        }).then(channelName => ({ channelName }));
-        const unsubscribe = async () => {
-          const pubSubManager = await this.dboBuilder.getPubSubManager();
-          pubSubManager.removeLocalSub(this.name, condition, localFunc)
-        };
-        let res: { unsubscribe: () => any } = Object.freeze({ unsubscribe })
-        return res;
-      }
-    } catch (e) {
-      if (localParams && localParams.testRule) throw e;
-      throw parseError(e, `dbo.${this.name}.subscribe()`);
-    }
-  }
-
-  /* This should only be called from server */
-  subscribeOne(filter: Filter, params: SubscribeParams, localFunc: (item: AnyObject) => any): Promise<{ unsubscribe: () => any }>
-  subscribeOne(filter: Filter, params: SubscribeParams, localFunc: (item: AnyObject) => any, table_rules?: TableRule, localParams?: LocalParams): Promise<string>
-  subscribeOne(filter: Filter, params: SubscribeParams = {}, localFunc: (item: AnyObject) => any, table_rules?: TableRule, localParams?: LocalParams):
-    Promise<string | { unsubscribe: () => any }> {
-    let func = localParams ? undefined : (rows: AnyObject[]) => localFunc(rows[0]);
-    return this.subscribe(filter, { ...params, limit: 2 }, func, table_rules, localParams);
-  }
-
 
   async updateBatch(data: [Filter, AnyObject][], params?: UpdateParams, tableRules?: TableRule, localParams?: LocalParams): Promise<any> {
     try {

package/lib/DboBuilder/ViewHandler.d.ts

@@ -1,5 +1,5 @@
 import * as pgPromise from 'pg-promise';
-import { ColumnInfo, FieldFilter, SelectParams, OrderBy, TableInfo as TInfo, AnyObject } from "prostgles-types";
+import { ColumnInfo, FieldFilter, SelectParams, OrderBy, TableInfo as TInfo, AnyObject, SubscribeParams } from "prostgles-types";
 import { DB, DBHandlerServer, Join } from "../Prostgles";
 import { DboBuilder, ExistsFilterConfig, Filter, JoinInfo, LocalParams, SortItem, TableHandlers, TableSchema, ValidatedTableRules } from "../DboBuilder";
 import { Graph } from "../shortestPath";
@@ -61,6 +61,14 @@ export declare class ViewHandler {
     getValidatedRules(tableRules?: TableRule, localParams?: LocalParams): ValidatedTableRules;
     find(filter?: Filter, selectParams?: SelectParams, param3_unused?: undefined, tableRules?: TableRule, localParams?: LocalParams): Promise<any[]>;
     findOne(filter?: Filter, selectParams?: SelectParams, param3_unused?: undefined, table_rules?: TableRule, localParams?: LocalParams): Promise<any>;
+    subscribe(filter: Filter, params: SubscribeParams, localFunc: (items: AnyObject[]) => any): Promise<{
+        unsubscribe: () => any;
+    }>;
+    subscribe(filter: Filter, params: SubscribeParams, localFunc?: (items: AnyObject[]) => any, table_rules?: TableRule, localParams?: LocalParams): Promise<string>;
+    subscribeOne(filter: Filter, params: SubscribeParams, localFunc: (item: AnyObject) => any): Promise<{
+        unsubscribe: () => any;
+    }>;
+    subscribeOne(filter: Filter, params: SubscribeParams, localFunc: (item: AnyObject) => any, table_rules?: TableRule, localParams?: LocalParams): Promise<string>;
     count(filter?: Filter, param2_unused?: undefined, param3_unused?: undefined, table_rules?: TableRule, localParams?: LocalParams): Promise<number>;
     size(filter?: Filter, selectParams?: SelectParams, param3_unused?: undefined, table_rules?: TableRule, localParams?: LocalParams): Promise<string>;
     getAllowedSelectFields(selectParams: FieldFilter, allowed_cols: FieldFilter, allow_empty?: boolean): string[];

package/lib/DboBuilder/ViewHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ViewHandler.d.ts","sourceRoot":"","sources":["ViewHandler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ViewHandler.d.ts","sourceRoot":"","sources":["ViewHandler.ts"],"names":[],"mappings":"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"}

package/lib/DboBuilder/ViewHandler.js

@@ -599,6 +599,133 @@ class ViewHandler {
             throw (0, DboBuilder_1.parseError)(e, `Issue with dbo.${this.name}.findOne()`);
         }
     }
+    async subscribe(filter, params = {}, localFunc, table_rules, localParams) {
+        try {
+            if (this.is_view)
+                throw "Cannot subscribe to a view";
+            if (this.t)
+                throw "subscribe not allowed within transactions";
+            if (!localParams && !localFunc)
+                throw " missing data. provide -> localFunc | localParams { socket } ";
+            if (localParams && localParams.socket && localFunc) {
+                console.error({ localParams, localFunc });
+                throw " Cannot have localFunc AND socket ";
+            }
+            const { filterFields, forcedFilter } = table_rules?.select || {}, filterOpts = await this.prepareWhere({ filter, forcedFilter, addKeywords: false, filterFields, tableAlias: undefined, localParams, tableRule: table_rules }), condition = filterOpts.where, throttle = params?.throttle || 0, selectParams = (0, PubSubManager_1.omitKeys)(params || {}, ["throttle"]);
+            /** app_triggers condition field has an index which limits it's value */
+            const filterSize = JSON.stringify(filter || {}).length;
+            if (filterSize * 4 > 2704) {
+                throw "filter too big. Might exceed the btree version 4 maximum 2704. Use a primary key or a $rowhash filter instead";
+            }
+            if (!localFunc) {
+                if (!this.dboBuilder.prostgles.isSuperUser)
+                    throw "Subscribe not possible. Must be superuser to add triggers 1856";
+                return await this.find(filter, { ...selectParams, limit: 0 }, undefined, table_rules, localParams)
+                    .then(async (isValid) => {
+                    let relatedTableSubscriptions = undefined;
+                    if (this.is_view) {
+                        const viewName = this.name;
+                        const viewNameEscaped = this.escapedName;
+                        /** Get list of used columns and their parent tables */
+                        const { def } = await this.db.oneOrNone("SELECT pg_get_viewdef(${viewName}) as def", { viewName });
+                        if (!def || typeof def !== "string")
+                            (0, DboBuilder_1.makeErr)("Could get view definition");
+                        const { fields } = await this.dboBuilder.dbo.sql(`SELECT * FROM ( \n ${def} \n ) prostgles_subscribe_view_definition LIMIT 0`, {});
+                        const tableColumns = fields.filter(f => f.tableName && f.columnName);
+                        /** Create exists filters for each table */
+                        const tableIds = Array.from(new Set(tableColumns.map(tc => tc.tableID.toString())));
+                        let relatedTableSubscriptions = tableIds.map(tableID => {
+                            const table = this.dboBuilder.USER_TABLES?.find(t => t.relid === tableID);
+                            let tableCols = tableColumns.filter(tc => tc.tableID.toString() === tableID);
+                            /** If table has primary keys and they are all in this view then use only primary keys */
+                            if (table?.pkey_columns?.every(pkey => tableCols.some(c => c.columnName === pkey))) {
+                                tableCols = tableCols.filter(c => table?.pkey_columns?.includes(c.columnName));
+                            }
+                            else {
+                                /** Exclude non comparable data types */
+                                tableCols = tableCols.filter(c => ["json", "xml"].includes(c.udt_name));
+                            }
+                            const { tableName, tableSchema } = tableCols[0];
+                            const tableNameEscaped = [tableSchema, tableName].map(v => (0, prostgles_types_1.asName)(v)).join(".");
+                            const relatedTableSubscription = {
+                                tableName,
+                                tableNameEscaped,
+                                condition: `EXISTS (
+                    SELECT 1
+                    FROM ${viewNameEscaped}
+                    WHERE ${tableCols.map(c => `${tableNameEscaped}.${JSON.stringify(c.columnName)} = ${viewNameEscaped}.${JSON.stringify(c.name)}`).join(" AND \n")}
+                    AND ${condition || "TRUE"}
+                  )`
+                            };
+                            return relatedTableSubscription;
+                        });
+                        /** Get list of remaining used inner tables */
+                        const allUsedTables = await this.db.any("SELECT distinct table_name, table_schema FROM information_schema.view_column_usage WHERE view_name = ${viewName}", { viewName });
+                        /** Remaining tables will have listeners on all records (condition = "TRUE") */
+                        const remainingInnerTables = allUsedTables.filter(at => !tableColumns.some(dc => dc.tableName === at.table_name && dc.tableSchema === at.table_schema));
+                        relatedTableSubscriptions = [
+                            ...relatedTableSubscriptions,
+                            ...remainingInnerTables.map(t => ({
+                                tableName: t.table_name,
+                                tableNameEscaped: [t.table_name, t.table_schema].map(v => JSON.stringify(v)).join("."),
+                                condition: ""
+                            }))
+                        ];
+                        if (!relatedTableSubscriptions.length) {
+                            throw "Could not subscribe to this view: no related tables found";
+                        }
+                    }
+                    const { socket } = localParams ?? {};
+                    const pubSubManager = await this.dboBuilder.getPubSubManager();
+                    return pubSubManager.addSub({
+                        table_info: this.tableOrViewInfo,
+                        socket,
+                        table_rules,
+                        table_name: this.name,
+                        condition: condition,
+                        relatedTableSubscriptions,
+                        func: undefined,
+                        filter: { ...filter },
+                        params: { ...selectParams },
+                        socket_id: socket?.id,
+                        throttle,
+                        last_throttled: 0,
+                    }).then(channelName => ({ channelName }));
+                });
+            }
+            else {
+                const pubSubManager = await this.dboBuilder.getPubSubManager();
+                pubSubManager.addSub({
+                    table_info: this.tableOrViewInfo,
+                    socket: undefined,
+                    table_rules,
+                    condition,
+                    func: localFunc,
+                    filter: { ...filter },
+                    params: { ...selectParams },
+                    socket_id: undefined,
+                    table_name: this.name,
+                    throttle,
+                    last_throttled: 0,
+                }).then(channelName => ({ channelName }));
+                const unsubscribe = async () => {
+                    const pubSubManager = await this.dboBuilder.getPubSubManager();
+                    pubSubManager.removeLocalSub(this.name, condition, localFunc);
+                };
+                let res = Object.freeze({ unsubscribe });
+                return res;
+            }
+        }
+        catch (e) {
+            if (localParams && localParams.testRule)
+                throw e;
+            throw (0, DboBuilder_1.parseError)(e, `dbo.${this.name}.subscribe()`);
+        }
+    }
+    subscribeOne(filter, params = {}, localFunc, table_rules, localParams) {
+        let func = localParams ? undefined : (rows) => localFunc(rows[0]);
+        return this.subscribe(filter, { ...params, limit: 2 }, func, table_rules, localParams);
+    }
     async count(filter, param2_unused, param3_unused, table_rules, localParams) {
         filter = filter || {};
         try {

package/lib/DboBuilder/ViewHandler.ts

@@ -10,7 +10,7 @@ import {
   TableInfo as TInfo,
   AnyObject,
   isObject, isDefined, getKeys,
-  _PG_geometric, pickKeys
+  _PG_geometric, pickKeys, SubscribeParams
 } from "prostgles-types";
 import { DB, DBHandlerServer, Join } from "../Prostgles";
 import {
@@ -20,7 +20,7 @@ import {
 } from "../DboBuilder";
 import { Graph } from "../shortestPath";
 import { TableRule, UpdateRule, ValidateRow } from "../PublishParser";
-import { asValue } from "../PubSubManager";
+import { asValue, omitKeys } from "../PubSubManager";
 import { TableHandler } from "./TableHandler";
 import { asNameAlias,  getNewQuery, parseFunctionObject, SelectItem, SelectItemValidated } from "./QueryBuilder/QueryBuilder";
 import { COMPUTED_FIELDS, FieldSpec, FUNCTIONS, parseFunction,  } from "./QueryBuilder/Functions";
@@ -718,6 +718,161 @@ export class ViewHandler {
     }
   }
 
+
+
+  async subscribe(filter: Filter, params: SubscribeParams, localFunc: (items: AnyObject[]) => any): Promise<{ unsubscribe: () => any }>
+  async subscribe(filter: Filter, params: SubscribeParams, localFunc?: (items: AnyObject[]) => any, table_rules?: TableRule, localParams?: LocalParams): Promise<string>
+  async subscribe(filter: Filter, params: SubscribeParams = {}, localFunc?: (items: AnyObject[]) => any, table_rules?: TableRule, localParams?: LocalParams):
+    Promise<string | { unsubscribe: () => any }> {
+    try {
+      if (this.is_view) throw "Cannot subscribe to a view";
+      if (this.t) throw "subscribe not allowed within transactions";
+      if (!localParams && !localFunc) throw " missing data. provide -> localFunc | localParams { socket } ";
+      if (localParams && localParams.socket && localFunc) {
+        console.error({ localParams, localFunc })
+        throw " Cannot have localFunc AND socket ";
+      }
+
+      const { filterFields, forcedFilter } = table_rules?.select || {},
+        filterOpts = await this.prepareWhere({ filter, forcedFilter, addKeywords: false, filterFields, tableAlias: undefined, localParams, tableRule: table_rules }),
+        condition = filterOpts.where,
+        throttle = params?.throttle || 0,
+        selectParams = omitKeys(params || {}, ["throttle"]);
+ 
+      /** app_triggers condition field has an index which limits it's value */
+      const filterSize = JSON.stringify(filter || {}).length;
+      if (filterSize * 4 > 2704) {
+        throw "filter too big. Might exceed the btree version 4 maximum 2704. Use a primary key or a $rowhash filter instead"
+      }
+
+      if (!localFunc) {
+        if (!this.dboBuilder.prostgles.isSuperUser) throw "Subscribe not possible. Must be superuser to add triggers 1856";
+        return await this.find(filter, { ...selectParams, limit: 0 }, undefined, table_rules, localParams)
+          .then(async isValid => {
+
+            let relatedTableSubscriptions: {
+              tableName: string;
+              tableNameEscaped: string;
+              condition: string;
+            }[] | undefined = undefined;
+
+            if(this.is_view){
+              const viewName = this.name;
+              const viewNameEscaped = this.escapedName;
+              
+              /** Get list of used columns and their parent tables */
+              const { def } = await this.db.oneOrNone("SELECT pg_get_viewdef(${viewName}) as def", { viewName });
+              if(!def || typeof def !== "string") makeErr("Could get view definition");
+              const { fields } = await this.dboBuilder.dbo.sql!(`SELECT * FROM ( \n ${def} \n ) prostgles_subscribe_view_definition LIMIT 0`, {});
+              const tableColumns = fields.filter(f => f.tableName && f.columnName);
+
+              /** Create exists filters for each table */
+              const tableIds = Array.from(new Set(tableColumns.map(tc => tc.tableID!.toString())));
+              let relatedTableSubscriptions = tableIds.map(tableID => {
+                const table = this.dboBuilder.USER_TABLES?.find(t => t.relid === tableID)!;
+                let tableCols = tableColumns.filter(tc => tc.tableID!.toString() === tableID);
+
+                /** If table has primary keys and they are all in this view then use only primary keys */
+                if(table?.pkey_columns?.every(pkey => tableCols.some(c => c.columnName === pkey))){
+                  tableCols = tableCols.filter(c => table?.pkey_columns?.includes(c.columnName!))
+                } else {
+                  /** Exclude non comparable data types */
+                  tableCols = tableCols.filter(c => ["json", "xml"].includes(c.udt_name) )
+                }
+
+                const { tableName, tableSchema } = tableCols[0]!;
+                const tableNameEscaped = [tableSchema!, tableName!].map(v => asName(v)).join(".");
+
+                const relatedTableSubscription = {
+                  tableName,
+                  tableNameEscaped,
+                  condition: `EXISTS (
+                    SELECT 1
+                    FROM ${viewNameEscaped}
+                    WHERE ${tableCols.map(c => `${tableNameEscaped}.${JSON.stringify(c.columnName)} = ${viewNameEscaped}.${JSON.stringify(c.name)}`).join(" AND \n")}
+                    AND ${condition || "TRUE"}
+                  )`
+                }
+
+                return relatedTableSubscription;
+              })
+              
+              /** Get list of remaining used inner tables */
+              const allUsedTables: { table_name: string; table_schema: string; }[] = await this.db.any(
+                "SELECT distinct table_name, table_schema FROM information_schema.view_column_usage WHERE view_name = ${viewName}", 
+                { viewName }
+              );
+
+              /** Remaining tables will have listeners on all records (condition = "TRUE") */
+              const remainingInnerTables = allUsedTables.filter(at => !tableColumns.some(dc => dc.tableName === at.table_name && dc.tableSchema === at.table_schema));
+              relatedTableSubscriptions = [
+                ...relatedTableSubscriptions,
+                ...remainingInnerTables.map(t => ({
+                  tableName: t.table_name,
+                  tableNameEscaped: [t.table_name, t.table_schema].map(v => JSON.stringify(v)).join("."),
+                  condition: ""
+                }))
+              ];
+
+              if(!relatedTableSubscriptions.length){
+                throw "Could not subscribe to this view: no related tables found";
+              } 
+            }
+
+            const { socket } = localParams ?? {};
+            const pubSubManager = await this.dboBuilder.getPubSubManager();
+            return pubSubManager.addSub({
+              table_info: this.tableOrViewInfo,
+              socket,
+              table_rules,
+              table_name: this.name,
+              condition: condition,
+              relatedTableSubscriptions,
+              func: undefined,
+              filter: { ...filter },
+              params: { ...selectParams },
+              socket_id: socket?.id,
+              throttle,
+              last_throttled: 0, 
+            }).then(channelName => ({ channelName }));
+          }) as string;
+      } else {
+        const pubSubManager = await this.dboBuilder.getPubSubManager();
+        pubSubManager.addSub({
+          table_info: this.tableOrViewInfo,
+          socket: undefined,
+          table_rules,
+          condition,
+          func: localFunc,
+          filter: { ...filter },
+          params: { ...selectParams },
+          socket_id: undefined,
+          table_name: this.name,
+          throttle,
+          last_throttled: 0, 
+        }).then(channelName => ({ channelName }));
+        const unsubscribe = async () => {
+          const pubSubManager = await this.dboBuilder.getPubSubManager();
+          pubSubManager.removeLocalSub(this.name, condition, localFunc)
+        };
+        let res: { unsubscribe: () => any } = Object.freeze({ unsubscribe })
+        return res;
+      }
+    } catch (e) {
+      if (localParams && localParams.testRule) throw e;
+      throw parseError(e, `dbo.${this.name}.subscribe()`);
+    }
+  }
+
+  /* This should only be called from server */
+  subscribeOne(filter: Filter, params: SubscribeParams, localFunc: (item: AnyObject) => any): Promise<{ unsubscribe: () => any }>
+  subscribeOne(filter: Filter, params: SubscribeParams, localFunc: (item: AnyObject) => any, table_rules?: TableRule, localParams?: LocalParams): Promise<string>
+  subscribeOne(filter: Filter, params: SubscribeParams = {}, localFunc: (item: AnyObject) => any, table_rules?: TableRule, localParams?: LocalParams):
+    Promise<string | { unsubscribe: () => any }> {
+    let func = localParams ? undefined : (rows: AnyObject[]) => localFunc(rows[0]);
+    return this.subscribe(filter, { ...params, limit: 2 }, func, table_rules, localParams);
+  }
+
   async count(filter?: Filter, param2_unused?: undefined, param3_unused?: undefined, table_rules?: TableRule, localParams?: LocalParams): Promise<number> {
     filter = filter || {};
     try {

package/lib/DboBuilder/runSQL.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runSQL.d.ts","sourceRoot":"","sources":["runSQL.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuC,UAAU,EAAa,MAAM,iBAAiB,CAAC;AAC7F,OAAO,EAAE,UAAU,EAAE,WAAW,EAAyB,MAAM,eAAe,CAAC;AAC/E,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAK7C,wBAAsB,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,UAAU,GAAG,SAAS,EAAE,WAAW,CAAC,EAAE,WAAW,gBAkGpI;AAED,eAAO,MAAM,SAAS,cAAqB,SAAS,gBAAgB,WAAW,KAAG,QAAQ,OAAO,CAOhG,CAAA;AAED,eAAO,MAAM,eAAe,cAAmB,QAAQ,OAAO,CAE7D,CAAA"}
+{"version":3,"file":"runSQL.d.ts","sourceRoot":"","sources":["runSQL.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuC,UAAU,EAAa,MAAM,iBAAiB,CAAC;AAC7F,OAAO,EAAE,UAAU,EAAE,WAAW,EAAyB,MAAM,eAAe,CAAC;AAC/E,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAK7C,wBAAsB,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,UAAU,GAAG,SAAS,EAAE,WAAW,CAAC,EAAE,WAAW,gBAuHpI;AAED,eAAO,MAAM,SAAS,cAAqB,SAAS,gBAAgB,WAAW,KAAG,QAAQ,OAAO,CAOhG,CAAA;AAED,eAAO,MAAM,eAAe,cAAmB,QAAQ,OAAO,CAE7D,CAAA"}

package/lib/DboBuilder/runSQL.js

@@ -14,7 +14,25 @@ async function runSQL(query, params, options, localParams) {
     }
     /** Cache types */
     this.DATA_TYPES ?? (this.DATA_TYPES = await this.db.any("SELECT oid, typname FROM pg_type") ?? []);
-    this.USER_TABLES ?? (this.USER_TABLES = await this.db.any("SELECT relid, relname FROM pg_catalog.pg_statio_user_tables") ?? []);
+    this.USER_TABLES ?? (this.USER_TABLES = await this.db.any(`
+    SELECT relid, relname, schemaname, array_to_json(array_agg(c.column_name)  FILTER (WHERE c.column_name IS NOT NULL))
+    FROM pg_catalog.pg_statio_user_tables t
+    LEFT JOIN (
+      SELECT a.attname as column_name, i.indrelid as table_oid
+      FROM   pg_index i
+      JOIN   pg_attribute a ON a.attrelid = i.indrelid
+        AND a.attnum = ANY(i.indkey)
+      WHERE i.indisprimary
+    ) c
+    ON t.relid = c.table_oid
+    GROUP BY relid, relname, schemaname
+  `) ?? []);
+    this.USER_TABLE_COLUMNS ?? (this.USER_TABLE_COLUMNS = await this.db.any(`
+    SELECT t.relid, t.schemaname,t.relname, c.column_name, c.udt_name
+    FROM information_schema.columns c
+    INNER JOIN pg_catalog.pg_statio_user_tables t
+    ON  c.table_schema = t.schemaname AND c.table_name = t.relname 
+  `));
     if (!(await (0, exports.canRunSQL)(this.prostgles, localParams)))
         throw "Not allowed to run SQL";
     const { returnType, allowListen, hasParams = true } = options || {};
@@ -80,13 +98,15 @@ async function runSQL(query, params, options, localParams) {
                 duration: 0,
                 ..._qres,
                 fields: fields?.map(f => {
-                    const dataType = this.DATA_TYPES.find(dt => +dt.oid === +f.dataTypeID)?.typname ?? "text", tableName = this.USER_TABLES.find(t => +t.relid === +f.tableID), tsDataType = (0, DboBuilder_1.postgresToTsType)(dataType);
+                    const dataType = this.DATA_TYPES.find(dt => +dt.oid === +f.dataTypeID)?.typname ?? "text", table = this.USER_TABLES.find(t => +t.relid === +f.tableID), column = this.USER_TABLE_COLUMNS.find(c => +c.relid === +f.tableID && c.ordinal_position === f.columnID), tsDataType = (0, DboBuilder_1.postgresToTsType)(dataType);
                     return {
                         ...f,
                         tsDataType,
                         dataType,
                         udt_name: dataType,
-                        tableName: tableName?.relname
+                        tableName: table?.relname,
+                        tableSchema: table?.schemaname,
+                        columnName: column?.column_name
                     };
                 }) ?? []
             };

package/lib/DboBuilder/runSQL.ts

@@ -17,7 +17,25 @@ export async function runSQL(this: DboBuilder, query: string, params: any, optio
 
   /** Cache types */
   this.DATA_TYPES ??= await this.db.any("SELECT oid, typname FROM pg_type") ?? [];
-  this.USER_TABLES ??= await this.db.any("SELECT relid, relname FROM pg_catalog.pg_statio_user_tables") ?? [];
+  this.USER_TABLES ??= await this.db.any(`
+    SELECT relid, relname, schemaname, array_to_json(array_agg(c.column_name)  FILTER (WHERE c.column_name IS NOT NULL))
+    FROM pg_catalog.pg_statio_user_tables t
+    LEFT JOIN (
+      SELECT a.attname as column_name, i.indrelid as table_oid
+      FROM   pg_index i
+      JOIN   pg_attribute a ON a.attrelid = i.indrelid
+        AND a.attnum = ANY(i.indkey)
+      WHERE i.indisprimary
+    ) c
+    ON t.relid = c.table_oid
+    GROUP BY relid, relname, schemaname
+  `) ?? [];
+  this.USER_TABLE_COLUMNS ??= await this.db.any(`
+    SELECT t.relid, t.schemaname,t.relname, c.column_name, c.udt_name
+    FROM information_schema.columns c
+    INNER JOIN pg_catalog.pg_statio_user_tables t
+    ON  c.table_schema = t.schemaname AND c.table_name = t.relname 
+  `);
 
   if (!(await canRunSQL(this.prostgles, localParams))) throw "Not allowed to run SQL";
 
@@ -87,7 +105,8 @@ export async function runSQL(this: DboBuilder, query: string, params: any, optio
         ..._qres,
         fields: fields?.map(f => {
           const dataType = this.DATA_TYPES!.find(dt => +dt.oid === +f.dataTypeID)?.typname ?? "text",
-            tableName = this.USER_TABLES!.find(t => +t.relid === +f.tableID),
+            table = this.USER_TABLES!.find(t => +t.relid === +f.tableID),
+            column = this.USER_TABLE_COLUMNS!.find(c => +c.relid === +f.tableID && c.ordinal_position === f.columnID),
             tsDataType = postgresToTsType(dataType);
 
           return {
@@ -95,7 +114,9 @@ export async function runSQL(this: DboBuilder, query: string, params: any, optio
             tsDataType,
             dataType,
             udt_name: dataType,
-            tableName: tableName?.relname
+            tableName: table?.relname,
+            tableSchema: table?.schemaname,
+            columnName: column?.column_name
           }
         }) ?? []
       };