prostgles-server 4.2.346 → 4.2.348

package/dist/runClientRequest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runClientRequest.d.ts","sourceRoot":"","sources":["../lib/runClientRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EAED,MAAM,iBAAiB,CAAC;AACnC,OAAO,EAGL,KAAK,SAAS,EACf,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAK1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,sCAAsC,CAAC;AA0B5E,KAAK,IAAI,GAAG;IACV,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,GAAG,CAAC;IACZ,MAAM,EAAE,GAAG,CAAC;IACZ,MAAM,EAAE,GAAG,CAAC;CACb,CAAC;AAUF,eAAO,MAAM,gBAAgB,SACrB,SAAS,QACT,IAAI,aACC,iBAAiB,SACrB,eAAe,GAAG,SAAS,mCA2EnC,CAAC;AAEF,eAAO,MAAM,sBAAsB,SAC3B,SAAS,aACJ,iBAAiB;;;;;;;;EAgB7B,CAAC;AAEF,eAAO,MAAM,mBAAmB,SACxB,SAAS,WACN,UAAU,aACR,iBAAiB,mOAS7B,CAAC;AAEF,KAAK,UAAU,GAAG;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC;CAChB,CAAC;AACF,eAAO,MAAM,eAAe,SACpB,SAAS,WACN,UAAU,aACR,iBAAiB,iBAmB7B,CAAC"}
+{"version":3,"file":"runClientRequest.d.ts","sourceRoot":"","sources":["../lib/runClientRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAA0B,MAAM,iBAAiB,CAAC;AAC1E,OAAO,EAIL,KAAK,SAAS,EACf,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAK1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,sCAAsC,CAAC;AA0B5E,KAAK,IAAI,GAAG;IACV,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AAUF,eAAO,MAAM,gBAAgB,SACrB,SAAS,oBACG,IAAI,aACX,iBAAiB,SACrB,eAAe,GAAG,SAAS,mCA0FnC,CAAC;AAEF,eAAO,MAAM,sBAAsB,SAC3B,SAAS,aACJ,iBAAiB;;;;;;;;EAgB7B,CAAC;AAEF,eAAO,MAAM,mBAAmB,SACxB,SAAS,mBACE,UAAU,aAChB,iBAAiB,iBAsB7B,CAAC;AAEF,KAAK,UAAU,GAAG;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC;CAChB,CAAC;AACF,eAAO,MAAM,eAAe,SACpB,SAAS,mBACE,UAAU,aAChB,iBAAiB,iBA+B7B,CAAC"}

package/dist/runClientRequest.js

@@ -26,20 +26,29 @@ const SOCKET_ONLY_COMMANDS = [
     "subscribeOne",
     "sync",
 ];
-const runClientRequest = async function (args, clientReq, scope) {
+const runClientRequest = async function (nonValidatedArgs, clientReq, scope) {
     /* Channel name will only include client-sent params so we ignore table_rules enforced params */
     if (!this.publishParser || !this.dbo) {
         throw "socket/httpReq or authhandler missing";
     }
-    const { tableName, command: nonValidatedCommand, param1, param2, param3 } = args;
-    if (!TABLE_METHODS_KEYS.some((v) => v === nonValidatedCommand)) {
-        throw `Invalid command: ${nonValidatedCommand}. Expecting one of: ${TABLE_METHODS_KEYS.join(", ")};`;
+    const validation = (0, prostgles_types_1.getJSONBObjectSchemaValidationError)({
+        tableName: { type: "string" },
+        command: { enum: TABLE_METHODS_KEYS },
+        param1: { type: "any", optional: true },
+        param2: { type: "any", optional: true },
+        param3: { type: "any", optional: true },
+    }, nonValidatedArgs, "tableName");
+    if (validation.error !== undefined) {
+        throw validation.error;
     }
-    const command = nonValidatedCommand;
+    const { tableName, command, param1, param2, param3 } = validation.data;
     if (!clientReq.socket && SOCKET_ONLY_COMMANDS.some((v) => v === command)) {
         throw ("The following commands cannot be completed over a non-websocket connection: " +
             SOCKET_ONLY_COMMANDS.join(", "));
     }
+    if (!this.dboBuilder.dboMap.has(tableName)) {
+        throw `tableName ${tableName} is invalid or not allowed`;
+    }
     const clientInfo = await this.authHandler?.getSidAndUserFromRequest(clientReq);
     if (clientInfo === "new-session-redirect") {
         throw clientInfo;
@@ -98,21 +107,38 @@ const clientCanRunSqlRequest = async function (clientReq) {
     return { allowed, reqInfo: clientReq };
 };
 exports.clientCanRunSqlRequest = clientCanRunSqlRequest;
-const runClientSqlRequest = async function (reqData, clientReq) {
+const runClientSqlRequest = async function (unvalidatedArgs, clientReq) {
     const { allowed } = await exports.clientCanRunSqlRequest.bind(this)(clientReq);
     if (!allowed) {
         throw "Not allowed to execute sql";
     }
     if (!this.dbo?.sql)
         throw "Internal error: sql handler missing";
+    const validation = (0, prostgles_types_1.getJSONBObjectSchemaValidationError)({
+        query: { type: "string" },
+        params: { type: "any", optional: true },
+        options: { type: "any", optional: true },
+    }, unvalidatedArgs, "query");
+    if (validation.error !== undefined) {
+        throw validation.error;
+    }
+    const reqData = validation.data;
     const { query, params, options } = reqData;
     return this.dbo.sql(query, params, options, { clientReq });
 };
 exports.runClientSqlRequest = runClientSqlRequest;
-const runClientMethod = async function (reqArgs, clientReq) {
+const runClientMethod = async function (unvalidatedArgs, clientReq) {
+    const validation = (0, prostgles_types_1.getJSONBObjectSchemaValidationError)({
+        method: { type: "string" },
+        params: { type: "any[]", optional: true },
+    }, unvalidatedArgs, "method");
+    if (validation.error !== undefined) {
+        throw validation.error;
+    }
+    const reqArgs = validation.data;
     const { method, params = [] } = reqArgs;
     const methods = await this.publishParser?.getAllowedMethods(clientReq, undefined);
-    const methodDef = methods?.[method];
+    const methodDef = methods?.get(method);
     if (!methods || !methodDef) {
         throw "Disallowed/missing method " + JSON.stringify(method);
     }

package/dist/runClientRequest.js.map

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

package/dist/shortestPath.js

@@ -15,7 +15,7 @@ const findShortestPath = (graph, startNode, endNode) => {
     // establish object for recording distances from the start node
     let distances = {};
     distances[endNode] = "Infinity";
-    distances = Object.assign(distances, graph[startNode]);
+    distances = { ...distances, ...graph[startNode] };
     // track paths
     const parents = { endNode: null };
     for (const child in graph[startNode]) {

package/dist/shortestPath.js.map

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

package/lib/Auth/endpoints/setOAuthRequestHandlers.ts

@@ -7,7 +7,7 @@ import { Strategy as MicrosoftStrategy } from "passport-microsoft";
 import { getObjectEntries, isEmpty } from "prostgles-types";
 import { getErrorAsObject } from "../../DboBuilder/dboBuilderUtils";
 import type { DBOFullyTyped } from "../../DBSchemaBuilder/DBSchemaBuilder";
-import type { AuthHandler} from "../AuthHandler";
+import type { AuthHandler } from "../AuthHandler";
 import { AUTH_ROUTES_AND_PARAMS, HTTP_FAIL_CODES } from "../AuthHandler";
 import type { AuthProviderUserData, LoginWithOAuthConfig } from "../AuthTypes";
 import { getClientRequestIPsInfo } from "../utils/getClientRequestIPsInfo";
@@ -89,7 +89,10 @@ export function setOAuthRequestHandlers(
                 type: "OAuth",
                 provider: providerName as "customOAuth",
               }).catch((e: any) => {
-                res.status(HTTP_FAIL_CODES.INTERNAL_SERVER_ERROR).json(getErrorAsObject(e));
+                res.status(HTTP_FAIL_CODES.INTERNAL_SERVER_ERROR).json(
+                  //@ts-ignore
+                  getErrorAsObject(e)
+                );
               });
             }
           }

package/lib/DboBuilder/DboBuilder.ts

@@ -78,6 +78,8 @@ export class DboBuilder {
 
   dbo: DBHandlerServer;
 
+  dboMap: Map<string, TableHandler | ViewHandler> = new Map();
+
   /**
    * Undefined if cannot create table triggers
    */
@@ -151,6 +153,7 @@ export class DboBuilder {
     if (!this.prostgles.db) throw "db missing";
     this.db = this.prostgles.db;
     this.dbo = {} as unknown as DBHandlerServer;
+    this.dboMap = new Map();
     this.queryStreamer = new QueryStreamer(this);
   }
 
@@ -259,13 +262,15 @@ export class DboBuilder {
                 Alternatively you can rename the table column\n`;
       }
 
-      this.dbo[tov.escaped_identifier] = new (tov.is_view ? ViewHandler : TableHandler)(
+      const tableHandler = new (tov.is_view ? ViewHandler : TableHandler)(
         this.db,
         tov,
         this,
         undefined,
         this.shortestJoinPaths
       );
+      this.dbo[tov.escaped_identifier] = tableHandler;
+      this.dboMap.set(tov.name, tableHandler);
 
       if (this.shortestJoinPaths.find((jp) => [jp.t1, jp.t2].includes(tov.name))) {
         const table = tov.name;

package/lib/DboBuilder/QueryStreamer.ts

@@ -1,14 +1,7 @@
 import * as pg from "pg";
 import type CursorType from "pg-cursor";
-import type {
-  SQLOptions,
-  SocketSQLStreamPacket,
-  SocketSQLStreamServer} from "prostgles-types";
-import {
-  CHANNELS,
-  omitKeys,
-  pickKeys,
-} from "prostgles-types";
+import type { SQLOptions, SocketSQLStreamPacket, SocketSQLStreamServer } from "prostgles-types";
+import { CHANNELS, omitKeys, pickKeys } from "prostgles-types";
 import type { BasicCallback } from "../PubSubManager/PubSubManager";
 import type { VoidFunction } from "../SchemaWatch/SchemaWatch";
 import type { DB } from "../initProstgles";
@@ -307,7 +300,7 @@ export class QueryStreamer {
           cb(processID);
         } catch (err) {
           console.error(err);
-          cb(processID, getErrorAsObject(err) ?? "Something went wrong");
+          cb(processID, getErrorAsObject(err));
         }
         runCount++;
       }

package/lib/DboBuilder/dboBuilderUtils.ts

@@ -5,7 +5,7 @@
 
 import type { AnyObject, ProstglesError } from "prostgles-types";
 import { asNameAlias } from "../utils/asNameAlias";
-import { isObject, omitKeys, pickKeys } from "prostgles-types";
+import { getSerialisableError, isObject, omitKeys, pickKeys } from "prostgles-types";
 import type { DB } from "../Prostgles";
 import type { LocalParams, SortItem } from "./DboBuilderTypes";
 import { pgp } from "./DboBuilderTypes";
@@ -16,38 +16,12 @@ import type { ProstglesInitOptions } from "../ProstglesTypes";
 import { sqlErrCodeToMsg } from "./sqlErrCodeToMsg";
 import type { TableHandler } from "./TableHandler/TableHandler";
 
-const safeStringify = (obj: AnyObject) => {
-  const seen = new WeakSet();
-  return JSON.stringify(obj, (key, value: any) => {
-    if (typeof value === "object" && value !== null) {
-      if (seen.has(value)) {
-        return "[Circular]";
-      }
-      seen.add(value);
-    }
-    return value;
-  });
-};
-export const getErrorAsObject = (rawError: any, includeStack = false) => {
-  if (["string", "boolean", "number"].includes(typeof rawError)) {
-    return { message: rawError };
+export const getErrorAsObject = (rawError: any) => {
+  const serializedError = getSerialisableError(rawError);
+  if (isObject(serializedError) && !Array.isArray(serializedError)) {
+    return omitKeys(serializedError, ["stack"]);
   }
-  if (rawError instanceof Error) {
-    const errorObj = Object.getOwnPropertyNames(rawError).reduce(
-      (acc, key) => ({
-        ...acc,
-        [key]: (rawError as AnyObject)[key],
-      }),
-      {} as AnyObject
-    );
-    const result = JSON.parse(safeStringify(errorObj));
-    if (!includeStack) {
-      return omitKeys(result, ["stack"]);
-    }
-    return result;
-  }
-
-  return rawError;
+  return { message: serializedError };
 };
 
 const circularError = new Error("Circular error data");

package/lib/Prostgles.ts

@@ -6,7 +6,7 @@
 import type * as pgPromise from "pg-promise";
 import { AuthHandler } from "./Auth/AuthHandler";
 import { FileManager } from "./FileManager/FileManager";
-import type { OnInitReason} from "./initProstgles";
+import type { OnInitReason } from "./initProstgles";
 import { initProstgles } from "./initProstgles";
 import type { SchemaWatch } from "./SchemaWatch/SchemaWatch";
 import { getClientSchema } from "./WebsocketAPI/getClientSchema";
@@ -148,7 +148,7 @@ export class Prostgles {
       console.error(`Unrecognised ProstglesInitOptions params: ${unknownParams.join()}`);
     }
 
-    Object.assign(this.opts, params);
+    this.opts = { ...this.opts, ...params };
 
     /* set defaults */
     if (this.opts.fileTable) {
@@ -164,7 +164,12 @@ export class Prostgles {
   destroyed = false;
 
   checkDb() {
-    if (!this.db || !(this.db as any).connect) throw "something went wrong getting a db connection";
+    if (
+      !this.db ||
+      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+      !this.db.connect
+    )
+      throw "something went wrong getting a db connection";
   }
 
   getTSFileName() {

package/lib/ProstglesTypes.ts

@@ -6,7 +6,7 @@ import type { DbConnection, OnReadyCallback } from "./initProstgles";
 import type { EventInfo } from "./Logging";
 import type { ExpressApp, RestApiConfig } from "./RestApi";
 import type { OnSchemaChangeCallback } from "./SchemaWatch/SchemaWatch";
-import type { ColConstraint } from "./TableConfig/getConstraintDefinitionQueries";
+import type { PGConstraint } from "./TableConfig/fetchTableConstraints";
 import type { TableConfig } from "./TableConfig/TableConfig";
 import type { Express } from "express";
 
@@ -20,10 +20,9 @@ import type {
   Awaitable,
   Publish,
   PublishMethods,
-  PublishParams} from "./PublishParser/PublishParser";
-import {
-  type PublishMethodsV2,
+  PublishParams,
 } from "./PublishParser/PublishParser";
+import { type PublishMethodsV2 } from "./PublishParser/PublishParser";
 
 /**
  * Allows uploading and downloading files.
@@ -345,6 +344,6 @@ type OnMigrate = (args: {
   getConstraints: (
     table: string,
     column?: string,
-    types?: ColConstraint["type"][]
-  ) => Promise<ColConstraint[]>;
+    types?: PGConstraint["type"][]
+  ) => Promise<PGConstraint[]>;
 }) => void | Promise<void>;

package/lib/PublishParser/PublishParser.ts

@@ -1,4 +1,4 @@
-import type { Method} from "prostgles-types";
+import type { Method } from "prostgles-types";
 import { getObjectEntries, isObject } from "prostgles-types";
 import type { AuthClientRequest, AuthResultWithSID, SessionUser } from "../Auth/AuthTypes";
 import type { DBOFullyTyped } from "../DBSchemaBuilder/DBSchemaBuilder";
@@ -14,7 +14,8 @@ import type {
   DboTableCommand,
   ParsedTableRule,
   PublishMethods,
-  PublishParams} from "./publishTypesAndUtils";
+  PublishParams,
+} from "./publishTypesAndUtils";
 import {
   RULE_TO_METHODS,
   parsePublishTableRule,
@@ -72,18 +73,15 @@ export class PublishParser {
     return getV2Methods(publishMethods);
   }
 
-  async getAllowedMethods(
-    clientReq: AuthClientRequest,
-    userData: AuthResultWithSID | undefined
-  ): Promise<{ [key: string]: Method }> {
-    const methods: { [key: string]: Method } = {};
+  async getAllowedMethods(clientReq: AuthClientRequest, userData: AuthResultWithSID | undefined) {
+    const methods: Map<string, Method> = new Map();
 
     const publishParams = await this.getPublishParams(clientReq, userData);
     const v2Methods = this.publishMethodsV2;
     if (v2Methods) {
       for (const [name, method] of Object.entries(v2Methods)) {
         if (await method.isAllowed(publishParams)) {
-          methods[name] = method;
+          methods.set(name, method);
         }
       }
       return methods;
@@ -92,6 +90,9 @@ export class PublishParser {
     const _methods = await applyParamsIfFunc(this.publishMethods, publishParams);
     if (!_methods) return methods;
     getObjectEntries(_methods).map(([key, method]) => {
+      if (typeof key !== "string") {
+        throw `invalid publishMethods key -> ${String(key)} \n Expecting a string`;
+      }
       const isFuncLike = (maybeFunc: VoidFunction | Promise<void> | Promise<any>) =>
         typeof maybeFunc === "function" || typeof maybeFunc.then === "function";
       if (
@@ -99,7 +100,7 @@ export class PublishParser {
         // @ts-ignore
         (isObject(method) && isFuncLike(method.run))
       ) {
-        methods[key] = _methods[key]!;
+        methods.set(key, method);
       } else {
         throw `invalid publishMethods item -> ${key} \n Expecting a function or promise`;
       }

package/lib/PublishParser/getTableRulesWithoutFileTable.ts

@@ -9,11 +9,9 @@ import type {
   ParsedPublishTable,
   PublishTableRule,
   PublishViewRule,
-  SubscribeRule} from "./publishTypesAndUtils";
-import {
-  type PublishObject,
-  RULE_TO_METHODS
+  SubscribeRule,
 } from "./publishTypesAndUtils";
+import { type PublishObject, RULE_TO_METHODS } from "./publishTypesAndUtils";
 
 export async function getTableRulesWithoutFileTable(
   this: PublishParser,
@@ -21,7 +19,7 @@ export async function getTableRulesWithoutFileTable(
   clientInfo: AuthResultWithSID | undefined,
   overridenPublish?: PublishObject
 ): Promise<ParsedPublishTable | undefined> {
-  if (!tableName) throw new Error("publish OR socket OR dbo OR tableName are missing");
+  if (!tableName) throw new Error("tableName is missing in getTableRules");
 
   const publish =
     overridenPublish ?? (clientReq && (await this.getPublishAsObject(clientReq, clientInfo)));

package/lib/TableConfig/fetchTableConstraints.ts

@@ -0,0 +1,53 @@
+import type pgPromise from "pg-promise";
+import type { DB } from "../Prostgles";
+import { asValue } from "../PubSubManager/PubSubManagerUtils";
+
+export type PGConstraint = {
+  name: string;
+  table: string;
+  type: "c" | "p" | "u" | "f";
+  cols: Array<string>;
+  definition: string;
+  schema: string;
+};
+export const fetchTableConstraints = ({
+  db,
+  column,
+  table,
+  types,
+}: ColConstraintsArgs): Promise<PGConstraint[]> => {
+  return db.manyOrNone(getColConstraintsQuery({ column, table, types }));
+};
+
+type ColConstraintsArgs = {
+  db: DB | pgPromise.ITask<{}>;
+  table?: string;
+  column?: string;
+  types?: PGConstraint["type"][];
+};
+const getColConstraintsQuery = ({ column, table, types }: Omit<ColConstraintsArgs, "db">) => {
+  let query = `
+    SELECT *
+    FROM (             
+      SELECT distinct c.conname as name, c.contype as type,
+        pg_get_constraintdef(c.oid) as definition, 
+        nsp.nspname as schema,
+      (SELECT r.relname from pg_class r where r.oid = c.conrelid) as "table", 
+      (SELECT array_agg(attname::text) from pg_attribute 
+      where attrelid = c.conrelid and ARRAY[attnum] <@ c.conkey) as cols
+      -- (SELECT array_agg(attname::text) from pg_attribute 
+      -- where attrelid = c.confrelid and ARRAY[attnum] <@ c.confkey) as fcols, 
+      -- (SELECT r.relname from pg_class r where r.oid = c.confrelid) as ftable
+      FROM pg_catalog.pg_constraint c
+      INNER JOIN pg_catalog.pg_class rel
+      ON rel.oid = c.conrelid
+      INNER JOIN pg_catalog.pg_namespace nsp
+      ON nsp.oid = connamespace
+    ) t   
+    WHERE TRUE 
+  `;
+  if (table) query += `\nAND "table" = ${asValue(table)}`;
+  if (column) query += `\nAND cols @> ARRAY[${asValue(column)}]`;
+  if (types?.length) query += `\nAND type IN (${types.map((v) => asValue(v)).join(", ")})`;
+  return query;
+};

package/lib/TableConfig/getConstraintDefinitionQueries.ts

@@ -1,7 +1,4 @@
-import type pgPromise from "pg-promise";
 import { asName } from "prostgles-types";
-import type { DB } from "../Prostgles";
-import { asValue } from "../PubSubManager/PubSubManagerUtils";
 import type { TableConfig } from "./TableConfig";
 
 type Args = {
@@ -50,56 +47,3 @@ export const getConstraintDefinitionQueries = ({
     }
   }
 };
-
-export type ColConstraint = {
-  name: string;
-  table: string;
-  type: "c" | "p" | "u" | "f";
-  cols: Array<string>;
-  definition: string;
-  schema: string;
-};
-type ColConstraintsArgs = {
-  db: DB | pgPromise.ITask<{}>;
-  table?: string;
-  column?: string;
-  types?: ColConstraint["type"][];
-};
-export const getColConstraintsQuery = ({
-  column,
-  table,
-  types,
-}: Omit<ColConstraintsArgs, "db">) => {
-  let query = `
-    SELECT *
-    FROM (             
-      SELECT distinct c.conname as name, c.contype as type,
-        pg_get_constraintdef(c.oid) as definition, 
-        nsp.nspname as schema,
-      (SELECT r.relname from pg_class r where r.oid = c.conrelid) as "table", 
-      (SELECT array_agg(attname::text) from pg_attribute 
-      where attrelid = c.conrelid and ARRAY[attnum] <@ c.conkey) as cols
-      -- (SELECT array_agg(attname::text) from pg_attribute 
-      -- where attrelid = c.confrelid and ARRAY[attnum] <@ c.confkey) as fcols, 
-      -- (SELECT r.relname from pg_class r where r.oid = c.confrelid) as ftable
-      FROM pg_catalog.pg_constraint c
-      INNER JOIN pg_catalog.pg_class rel
-      ON rel.oid = c.conrelid
-      INNER JOIN pg_catalog.pg_namespace nsp
-      ON nsp.oid = connamespace
-    ) t   
-    WHERE TRUE 
-  `;
-  if (table) query += `\nAND "table" = ${asValue(table)}`;
-  if (column) query += `\nAND cols @> ARRAY[${asValue(column)}]`;
-  if (types?.length) query += `\nAND type IN (${types.map((v) => asValue(v)).join(", ")})`;
-  return query;
-};
-export const getColConstraints = ({
-  db,
-  column,
-  table,
-  types,
-}: ColConstraintsArgs): Promise<ColConstraint[]> => {
-  return db.manyOrNone(getColConstraintsQuery({ column, table, types }));
-};

package/lib/TableConfig/getCreateSchemaQueries.ts

@@ -2,7 +2,7 @@ import type pgPromise from "pg-promise";
 import { asName } from "prostgles-types";
 import type { DB } from "../initProstgles";
 import type { ProstglesInitOptions, TableConfigMigrations } from "../ProstglesTypes";
-import { getColConstraints } from "./getConstraintDefinitionQueries";
+import { fetchTableConstraints } from "./fetchTableConstraints";
 import type { TableConfig } from "./TableConfig";
 export type RequiredUndefined<T> = {
   [K in keyof Required<T>]: T[K];
@@ -115,7 +115,7 @@ const getMigration = async (
           db: t,
           oldVersion: latestVersion,
           getConstraints: (table, col, types) =>
-            getColConstraints({ db: t, table, column: col, types }),
+            fetchTableConstraints({ db: t, table, column: col, types }),
         });
 
         return {

package/lib/TableConfig/getFutureTableSchema.ts

@@ -3,8 +3,8 @@ import { pgp } from "../DboBuilder/DboBuilder";
 import type { DB } from "../Prostgles";
 import type { ColumnMinimalInfo } from "./getColumnSQLDefinitionQuery";
 import { getTableColumns } from "./getColumnSQLDefinitionQuery";
-import type { ColConstraint, ConstraintDef } from "./getConstraintDefinitionQueries";
-import { getColConstraints } from "./getConstraintDefinitionQueries";
+import type { ConstraintDef } from "./getConstraintDefinitionQueries";
+import { type PGConstraint, fetchTableConstraints } from "./fetchTableConstraints";
 
 type Args = {
   db: DB;
@@ -23,12 +23,12 @@ export const getFutureTableSchema = async ({
   constraintDefs = [],
   db,
 }: Args): Promise<{
-  constraints: ColConstraint[];
+  constraints: PGConstraint[];
   cols: ColumnMinimalInfo[];
 }> => {
   const { TransactionMode, isolationLevel } = pgp.txMode;
 
-  let constraints: ColConstraint[] = [];
+  let constraints: PGConstraint[] = [];
   let cols: ColumnMinimalInfo[] = [];
   const txMode = new TransactionMode({
     tiLevel: isolationLevel.serializable,
@@ -56,7 +56,7 @@ export const getFutureTableSchema = async ({
 
     await t.any(query);
 
-    constraints = await getColConstraints({ db: t, table: tableName });
+    constraints = await fetchTableConstraints({ db: t, table: tableName });
     cols = await getTableColumns({ db: t, table: tableName });
 
     return t.any("ROLLBACK");

package/lib/TableConfig/initTableConfig.ts

@@ -6,10 +6,8 @@ import {
 } from "../PubSubManager/PubSubManagerUtils";
 import type { OnReadyCallbackBasic } from "../initProstgles";
 import type TableConfigurator from "./TableConfig";
-import {
-  getColConstraints,
-  getConstraintDefinitionQueries,
-} from "./getConstraintDefinitionQueries";
+import { getConstraintDefinitionQueries } from "./getConstraintDefinitionQueries";
+import { fetchTableConstraints } from "./fetchTableConstraints";
 import { getFutureTableSchema } from "./getFutureTableSchema";
 import { getPGIndexes } from "./getPGIndexes";
 import { getTableColumnQueries } from "./getTableColumnQueries";
@@ -83,13 +81,14 @@ export const initTableConfig = async function (this: TableConfigurator) {
     throw "pgp missing";
   }
 
-  const MAX_IDENTIFIER_LENGTH = +(await this.db.one("SHOW max_identifier_length;"))
-    .max_identifier_length;
+  const MAX_IDENTIFIER_LENGTH = +(
+    await this.db.one<{ max_identifier_length: number }>("SHOW max_identifier_length;")
+  ).max_identifier_length;
   if (!Number.isFinite(MAX_IDENTIFIER_LENGTH))
     throw `Could not obtain a valid max_identifier_length`;
   const asName = (v: string) => {
-    if (v.length > MAX_IDENTIFIER_LENGTH - 1) {
-      throw `The identifier name provided (${v}) is longer than the allowed limit (max_identifier_length - 1 = ${MAX_IDENTIFIER_LENGTH - 1} characters )\n Longest allowed: ${_asName(v.slice(0, MAX_IDENTIFIER_LENGTH - 1))} `;
+    if (v.length > MAX_IDENTIFIER_LENGTH) {
+      throw `The identifier name provided (${v}) is longer than the allowed limit (max_identifier_length = ${MAX_IDENTIFIER_LENGTH} characters )\n Longest allowed: ${_asName(v.slice(0, MAX_IDENTIFIER_LENGTH))} `;
     }
 
     return _asName(v);
@@ -198,7 +197,7 @@ export const initTableConfig = async function (this: TableConfigurator) {
 
       /** Run this first to ensure any dropped cols drop their constraints as well */
       await runQueries(queries);
-      const currCons = await getColConstraints({
+      const currCons = await fetchTableConstraints({
         db: this.db,
         table: tableName,
       });

package/lib/TableConfig/runMigrations.ts

@@ -1,7 +1,7 @@
 import type pgPromise from "pg-promise";
 import type { ProstglesInitOptions } from "../ProstglesTypes";
 import { EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID } from "../PubSubManager/PubSubManagerUtils";
-import { getColConstraints } from "./getConstraintDefinitionQueries";
+import { fetchTableConstraints } from "./fetchTableConstraints";
 
 export async function runMigrations(
   t: pgPromise.ITask<{}>,
@@ -43,7 +43,7 @@ export async function runMigrations(
       db: t,
       oldVersion: latestVersion,
       getConstraints: (table, col, types) =>
-        getColConstraints({ db: t, table, column: col, types }),
+        fetchTableConstraints({ db: t, table, column: col, types }),
     });
   }