prostgles-server 4.2.607 → 4.2.609

package/lib/TableConfig/getTableTriggerQueries.ts

@@ -1,18 +1,14 @@
 import { as } from "pg-promise";
-import type { DB } from "../initProstgles";
 import { asName } from "prostgles-types";
-import type { TableConfig } from "./TableConfigTypes";
-import {
-  AUDIT_HISTORY_PROTECTION_PREFIX,
-  getManagedTriggerName,
-  isManagedTriggerName,
-} from "./managedTriggerNames";
+import type { DB } from "../initProstgles";
+import type { BaseTableDefinition } from "./TableConfigTypes";
+import { getManagedTriggerName, isManagedTriggerName } from "./managedTriggerNames";
 
 /** Compare actual definitions so unchanged triggers do not cause schema refreshes. */
 export const getTableTriggerQueries = async (
   db: DB,
   tableIdent: string,
-  tableConfig: TableConfig[string],
+  triggers: BaseTableDefinition["triggers"],
 ): Promise<string[]> => {
   const existing = await db.any<{
     name: string;
@@ -40,9 +36,7 @@ export const getTableTriggerQueries = async (
   const queries: string[] = [];
   const desired = new Set<string>();
   const actionBits = { insert: 4, delete: 8, update: 16, truncate: 32 };
-  for (const [functionName, trigger] of Object.entries(
-    tableConfig.triggers ?? {},
-  )) {
+  for (const [functionName, trigger] of Object.entries(triggers ?? {})) {
     const functionIdent = asName(functionName);
     let functionAdded = false;
     for (const action of trigger.actions) {
@@ -52,23 +46,18 @@ export const getTableTriggerQueries = async (
       const legacyName = `${functionName}_${action}`;
       if (
         legacyName !== name &&
-        existing.some(
-          (t) => t.name === legacyName && t.function_name === functionName,
-        )
+        existing.some((t) => t.name === legacyName && t.function_name === functionName)
       ) {
         queries.push(`DROP TRIGGER ${asName(legacyName)} ON ${tableIdent};`);
       }
       const triggerIdent = asName(name);
       const hasTransitionTables =
-        trigger.forEach === "statement" &&
-        trigger.type === "after" &&
-        action !== "truncate";
-      const oldTable =
-        hasTransitionTables && action !== "insert" ? "old_table" : null;
-      const newTable =
-        hasTransitionTables && action !== "delete" ? "new_table" : null;
-      const transitionTables = hasTransitionTables
-        ? [
+        trigger.forEach === "statement" && trigger.type === "after" && action !== "truncate";
+      const oldTable = hasTransitionTables && action !== "insert" ? "old_table" : null;
+      const newTable = hasTransitionTables && action !== "delete" ? "new_table" : null;
+      const transitionTables =
+        hasTransitionTables ?
+          [
             "REFERENCING",
             newTable ? "NEW TABLE AS new_table" : "",
             oldTable ? "OLD TABLE AS old_table" : "",
@@ -77,11 +66,9 @@ export const getTableTriggerQueries = async (
       const type =
         actionBits[action] |
         (trigger.forEach === "row" ? 1 : 0) |
-        (trigger.type === "before"
-          ? 2
-          : trigger.type === "instead of"
-            ? 64
-            : 0);
+        (trigger.type === "before" ? 2
+        : trigger.type === "instead of" ? 64
+        : 0);
       const previous = existing.find((entry) => entry.name === name);
       if (
         previous?.type === type &&
@@ -108,9 +95,7 @@ export const getTableTriggerQueries = async (
   }
   for (const trigger of existing) {
     const managed = isManagedTriggerName(trigger.name);
-    // History remains append-only even after audit is disabled or moved.
-    const protectsHistory = trigger.name.startsWith(AUDIT_HISTORY_PROTECTION_PREFIX);
-    if (managed && !protectsHistory && !desired.has(trigger.name)) {
+    if (managed && !desired.has(trigger.name)) {
       queries.push(`DROP TRIGGER ${asName(trigger.name)} ON ${tableIdent};`);
     }
   }

package/lib/TableConfig/initTableConfig.ts

@@ -12,7 +12,6 @@ import { getTableColumnQueries } from "./getTableColumnQueries";
 import { getIndexesQueries } from "./indexes/getIndexesQueries";
 import { runMigrations } from "./runMigrations";
 import type { TableConfigurator } from "./TableConfigurator";
-import { syncTableTriggers } from "./syncTableTriggers";
 
 export const initTableConfig = async function (this: TableConfigurator) {
   this.initialising = true;
@@ -282,6 +281,4 @@ export const initTableConfig = async function (this: TableConfigurator) {
   }
 
   await this.prostgles.rebuildDBO();
-  await syncTableTriggers(this.prostgles);
-  if (this.prostgles.opts.audit) await this.prostgles.rebuildDBO();
 };

package/lib/TableConfig/managedTriggerNames.ts

@@ -4,7 +4,6 @@ import { md5 } from "prostgles-types/dist/md5";
 // Keep generated names within PostgreSQL's 63-byte identifier limit.
 export const TABLE_CONFIG_TRIGGER_PREFIX = "prostgles_table_config_";
 export const AUDIT_TRIGGER_PREFIX = "prostgles_audit_";
-// History protection survives removing or changing the audit configuration.
 export const AUDIT_HISTORY_PROTECTION_PREFIX = AUDIT_TRIGGER_PREFIX + "guard_";
 export const AUDIT_TRUNCATE_PROTECTION_PREFIX = AUDIT_TRIGGER_PREFIX + "block_";
 export const AUDIT_WRITER_PREFIX = AUDIT_TRIGGER_PREFIX + "write_";

package/lib/TableConfig/syncTableTriggers.ts

@@ -1,42 +1,28 @@
-import { parseAuditConfig } from "../Audit/parseAuditConfig";
 import type { Prostgles } from "../Prostgles";
 import { EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID } from "../PubSubManager/PubSubManagerUtils";
 import { getTableTriggerQueries } from "./getTableTriggerQueries";
 
 /** Applies application and generated audit triggers together, after all tables exist. */
 export async function syncTableTriggers(prgl: Prostgles) {
-  const previousAudit = prgl.parsedAuditConfig;
-  const nextAudit =
-    prgl.opts.audit || previousAudit ? await parseAuditConfig(prgl) : undefined;
-  prgl.parsedAuditConfig = nextAudit;
-  try {
-    const config = prgl.mergedTableConfig.tableConfig ?? {};
-    const queries: string[] = [];
-    for (const name of Object.keys(config)) {
-      if (!prgl.dboBuilder.tables.some((t) => t.name === name)) {
-        throw new Error(
-          `Table config name must exactly match a schema table name: ${name}`,
-        );
-      }
+  const config = prgl.mergedTableConfig.tableConfig ?? {};
+  const queries: string[] = [];
+  for (const name of Object.keys(config)) {
+    if (!prgl.dboBuilder.tables.some((t) => t.name === name)) {
+      throw new Error(`Table config name must exactly match a schema table name: ${name}`);
     }
-    for (const table of prgl.dboBuilder.tables) {
-      queries.push(
-        ...(await getTableTriggerQueries(
-          prgl.dbForSchema!,
-          table.escaped_identifier,
-          { triggers: config[table.name]?.triggers },
-        )),
-      );
-    }
-    if (queries.length) {
-      await prgl.dbForSchema!.tx((tx) =>
-        tx.none(
-          `/* ${EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID} */\n${queries.join("\n")}`,
-        ),
-      );
-    }
-  } catch (error) {
-    prgl.parsedAuditConfig = previousAudit;
-    throw error;
+  }
+  for (const table of prgl.dboBuilder.tables) {
+    queries.push(
+      ...(await getTableTriggerQueries(
+        prgl.dbForSchema!,
+        table.escaped_identifier,
+        config[table.name]?.triggers,
+      )),
+    );
+  }
+  if (queries.length) {
+    await prgl.dbForSchema!.tx((tx) =>
+      tx.none(`/* ${EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID} */\n${queries.join("\n")}`),
+    );
   }
 }

package/lib/WebsocketAPI/getClientSchema.ts

@@ -45,11 +45,17 @@ export async function getClientSchema(
     const { tables: rawTables = [] } = fullSchema ?? {};
     const { tableSchemaErrors = {} } = fullSchema ?? {};
     const { modifyClientSchema } = this.opts;
+    const resolvedAuditConfig = modifyClientSchema ? this.resolvedAuditConfig : undefined;
     const tables =
       modifyClientSchema ?
         await Promise.all(
           rawTables.map(async (t) =>
-            modifyClientSchema(t, this.dboBuilder.dboMap.get(t.name)?.config, userData),
+            modifyClientSchema(
+              t,
+              this.dboBuilder.dboMap.get(t.name)?.config,
+              userData,
+              resolvedAuditConfig,
+            ),
           ),
         )
       : rawTables;

package/lib/initProstgles.ts

@@ -236,6 +236,8 @@ export const initProstgles = async function (
       } finally {
         this.preparingTableConfig = false;
       }
+      await syncTableTriggers(this);
+      if (this.opts.audit) await this.rebuildDBO();
     });
     await this.tableConfigurator?.setTableOnMounts();
     // onMount may create additional targets; validate joins against the completed schema.

package/package.json

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