@supabase/pg-delta 1.0.0-alpha.24 → 1.0.0-alpha.26

package/src/core/objects/table/table.diff.ts

@@ -86,14 +86,6 @@ function createAlterConstraintChange(mainTable: Table, branchTable: Table) {
           constraint: c,
         }),
       );
-      if (!c.validated) {
-        changes.push(
-          new AlterTableValidateConstraint({
-            table: branchTable,
-            constraint: c,
-          }),
-        );
-      }
       // Add comment for newly created constraint
       if (c.comment !== null) {
         changes.push(
@@ -120,7 +112,7 @@ function createAlterConstraintChange(mainTable: Table, branchTable: Table) {
     }
   }
 
-  // Altered constraints -> drop + add
+  // Altered constraints -> drop + add (or VALIDATE-only shortcut)
   for (const [name, mainC] of mainByName) {
     const branchC = branchByName.get(name);
     if (!branchC) continue;
@@ -130,24 +122,68 @@ function createAlterConstraintChange(mainTable: Table, branchTable: Table) {
       continue;
     }
 
+    // Cheap scalar `===` checks first; only fall through to JSON.stringify
+    // on the array fields when every scalar has already matched.
+    const fieldsEqualExceptValidated =
+      mainC.constraint_type === branchC.constraint_type &&
+      mainC.deferrable === branchC.deferrable &&
+      mainC.initially_deferred === branchC.initially_deferred &&
+      mainC.is_local === branchC.is_local &&
+      mainC.no_inherit === branchC.no_inherit &&
+      mainC.is_temporal === branchC.is_temporal &&
+      mainC.foreign_key_table === branchC.foreign_key_table &&
+      mainC.foreign_key_schema === branchC.foreign_key_schema &&
+      mainC.on_update === branchC.on_update &&
+      mainC.on_delete === branchC.on_delete &&
+      mainC.match_type === branchC.match_type &&
+      mainC.check_expression === branchC.check_expression &&
+      JSON.stringify(mainC.key_columns) ===
+        JSON.stringify(branchC.key_columns) &&
+      JSON.stringify(mainC.foreign_key_columns) ===
+        JSON.stringify(branchC.foreign_key_columns);
+
+    // Safe-migration shortcut: when the only difference is `validated`
+    // flipping from false to true, emit a single `ALTER TABLE ... VALIDATE
+    // CONSTRAINT` instead of drop+add. VALIDATE CONSTRAINT only takes
+    // SHARE UPDATE EXCLUSIVE (concurrent reads/writes proceed), whereas
+    // dropping and re-adding takes ACCESS EXCLUSIVE for the entire scan.
+    // Postgres has no reverse command, so `true -> false` must still go
+    // through drop+add below.
+    if (
+      fieldsEqualExceptValidated &&
+      mainC.validated === false &&
+      branchC.validated === true
+    ) {
+      changes.push(
+        new AlterTableValidateConstraint({
+          table: branchTable,
+          constraint: branchC,
+        }),
+      );
+      // VALIDATE preserves the constraint OID, so its comment is preserved
+      // too. Only emit a comment change if it actually differs.
+      if (mainC.comment !== branchC.comment) {
+        if (branchC.comment === null) {
+          changes.push(
+            new DropCommentOnConstraint({
+              table: mainTable,
+              constraint: mainC,
+            }),
+          );
+        } else {
+          changes.push(
+            new CreateCommentOnConstraint({
+              table: branchTable,
+              constraint: branchC,
+            }),
+          );
+        }
+      }
+      continue;
+    }
+
     const changed =
-      mainC.constraint_type !== branchC.constraint_type ||
-      mainC.deferrable !== branchC.deferrable ||
-      mainC.initially_deferred !== branchC.initially_deferred ||
-      mainC.validated !== branchC.validated ||
-      mainC.is_local !== branchC.is_local ||
-      mainC.no_inherit !== branchC.no_inherit ||
-      mainC.is_temporal !== branchC.is_temporal ||
-      JSON.stringify(mainC.key_columns) !==
-        JSON.stringify(branchC.key_columns) ||
-      JSON.stringify(mainC.foreign_key_columns) !==
-        JSON.stringify(branchC.foreign_key_columns) ||
-      mainC.foreign_key_table !== branchC.foreign_key_table ||
-      mainC.foreign_key_schema !== branchC.foreign_key_schema ||
-      mainC.on_update !== branchC.on_update ||
-      mainC.on_delete !== branchC.on_delete ||
-      mainC.match_type !== branchC.match_type ||
-      mainC.check_expression !== branchC.check_expression;
+      mainC.validated !== branchC.validated || !fieldsEqualExceptValidated;
     if (changed) {
       changes.push(
         new AlterTableDropConstraint({
@@ -161,14 +197,6 @@ function createAlterConstraintChange(mainTable: Table, branchTable: Table) {
           constraint: branchC,
         }),
       );
-      if (!branchC.validated) {
-        changes.push(
-          new AlterTableValidateConstraint({
-            table: branchTable,
-            constraint: branchC,
-          }),
-        );
-      }
       // Ensure constraint comment is applied after re-creation
       if (branchC.comment !== null) {
         changes.push(
@@ -265,6 +293,7 @@ export function diffTables(
       ...createAlterConstraintChange(
         // Create a dummy table with no constraints do diff constraints against
         new Table({
+          // oxlint-disable-next-line typescript/no-misused-spread
           ...branchTable,
           constraints: [],
         }),

package/src/core/objects/table/table.model.ts

@@ -341,8 +341,13 @@ select
           'no_inherit', c.connoinherit,
           'is_temporal', coalesce((to_jsonb(c)->>'conperiod')::boolean, false),
 
-          -- NEW: propagated-to-partition tagging (PG15+)
-          'is_partition_clone', (c.conparentid <> 0::oid),
+          -- Inherited from a parent (partition or classical inheritance).
+          -- coninhcount > 0 is the canonical signal across every constraint
+          -- kind. We previously used conparentid <> 0, but PostgreSQL only
+          -- populates conparentid for PK / UNIQUE / FK on partitions; CHECK
+          -- constraints on partitions always have conparentid = 0 and were
+          -- being re-emitted on every child, failing apply with 42710.
+          'is_partition_clone', (c.coninhcount > 0),
           'parent_constraint_schema', case when c.conparentid <> 0::oid then pc.connamespace::regnamespace::text end,
           'parent_constraint_name',   case when c.conparentid <> 0::oid then quote_ident(pc.conname) end,
           'parent_table_schema',      case when c.conparentid <> 0::oid then pc_rel.relnamespace::regnamespace::text end,

package/src/core/objects/trigger/changes/trigger.alter.ts

@@ -28,10 +28,7 @@ export class ReplaceTrigger extends AlterTriggerChange {
   public readonly indexableObject?: TableLikeObject;
   public readonly scope = "object" as const;
 
-  constructor(props: {
-    trigger: Trigger;
-    indexableObject?: TableLikeObject;
-  }) {
+  constructor(props: { trigger: Trigger; indexableObject?: TableLikeObject }) {
     super();
     this.trigger = props.trigger;
     this.indexableObject = props.indexableObject;

package/src/core/objects/trigger/changes/trigger.base.ts

@@ -4,7 +4,7 @@ import type { Trigger } from "../trigger.model.ts";
 abstract class BaseTriggerChange extends BaseChange {
   abstract readonly trigger: Trigger;
   abstract readonly scope: "object" | "comment";
-  readonly objectType: "trigger" = "trigger";
+  readonly objectType = "trigger" as const;
 }
 
 export abstract class CreateTriggerChange extends BaseTriggerChange {

package/src/core/objects/type/composite-type/changes/composite-type.base.ts

@@ -8,7 +8,7 @@ abstract class BaseCompositeTypeChange extends BaseChange {
     | "comment"
     | "privilege"
     | "security_label";
-  readonly objectType: "composite_type" = "composite_type";
+  readonly objectType = "composite_type" as const;
 }
 
 export abstract class CreateCompositeTypeChange extends BaseCompositeTypeChange {

package/src/core/objects/type/enum/changes/enum.base.ts

@@ -8,7 +8,7 @@ abstract class BaseEnumChange extends BaseChange {
     | "comment"
     | "privilege"
     | "security_label";
-  readonly objectType: "enum" = "enum";
+  readonly objectType = "enum" as const;
 }
 
 export abstract class CreateEnumChange extends BaseEnumChange {

package/src/core/objects/type/range/changes/range.base.ts

@@ -8,7 +8,7 @@ abstract class BaseRangeChange extends BaseChange {
     | "comment"
     | "privilege"
     | "security_label";
-  readonly objectType: "range" = "range";
+  readonly objectType = "range" as const;
 }
 
 export abstract class CreateRangeChange extends BaseRangeChange {

package/src/core/objects/view/changes/view.base.ts

@@ -8,7 +8,7 @@ abstract class BaseViewChange extends BaseChange {
     | "comment"
     | "privilege"
     | "security_label";
-  readonly objectType: "view" = "view";
+  readonly objectType = "view" as const;
 }
 
 export abstract class CreateViewChange extends BaseViewChange {

package/src/core/plan/hierarchy.ts

@@ -322,7 +322,7 @@ function addClusterChange(cluster: ClusterGroup, change: Change): void {
       break;
     default: {
       const _exhaustive: never = objectType;
-      throw new Error(`Unhandled object type: ${_exhaustive}`);
+      throw new Error(`Unhandled object type: ${JSON.stringify(_exhaustive)}`);
     }
   }
 }
@@ -366,7 +366,7 @@ function addChildChange(schema: SchemaGroup, change: Change): void {
       break;
     default: {
       const _exhaustive: never = parentType;
-      throw new Error(`Unhandled parent type: ${_exhaustive}`);
+      throw new Error(`Unhandled parent type: ${JSON.stringify(_exhaustive)}`);
     }
   }
 
@@ -416,7 +416,7 @@ function addChildChange(schema: SchemaGroup, change: Change): void {
       break;
     default: {
       const _exhaustive: never = objectType;
-      throw new Error(`Unhandled object type: ${_exhaustive}`);
+      throw new Error(`Unhandled object type: ${JSON.stringify(_exhaustive)}`);
     }
   }
 }
@@ -568,7 +568,7 @@ function addSchemaLevelChange(
       break;
     default: {
       const _exhaustive: never = objectType;
-      throw new Error(`Unhandled object type: ${_exhaustive}`);
+      throw new Error(`Unhandled object type: ${JSON.stringify(_exhaustive)}`);
     }
   }
 }

package/src/core/plan/sql-format/format-off.test.ts

@@ -689,7 +689,7 @@ describe("sql formatting snapshots", () => {
       COMMENT ON SUBSCRIPTION sub_replica IS NULL;
 
       -- fdw.create
-      CREATE FOREIGN DATA WRAPPER postgres_fdw HANDLER postgres_fdw_handler VALIDATOR postgres_fdw_validator OPTIONS (debug 'true');
+      CREATE FOREIGN DATA WRAPPER postgres_fdw HANDLER postgres_fdw_handler VALIDATOR postgres_fdw_validator OPTIONS (debug '__OPTION_DEBUG__');
 
       -- fdw.drop
       DROP FOREIGN DATA WRAPPER postgres_fdw;
@@ -698,7 +698,7 @@ describe("sql formatting snapshots", () => {
       ALTER FOREIGN DATA WRAPPER postgres_fdw OWNER TO new_owner;
 
       -- fdw.alter.set_options
-      ALTER FOREIGN DATA WRAPPER postgres_fdw OPTIONS (SET debug 'false', ADD use_remote_estimate '');
+      ALTER FOREIGN DATA WRAPPER postgres_fdw OPTIONS (SET debug '__OPTION_DEBUG__', ADD use_remote_estimate '');
 
       -- fdw.comment
       COMMENT ON FOREIGN DATA WRAPPER postgres_fdw IS 'PostgreSQL foreign data wrapper';
@@ -794,13 +794,13 @@ describe("sql formatting snapshots", () => {
       REVOKE GRANT OPTION FOR ALL ON SERVER remote_server FROM app_user;
 
       -- user_mapping.create
-      CREATE USER MAPPING FOR app_user SERVER remote_server OPTIONS (user 'remote_app', password 'secret123');
+      CREATE USER MAPPING FOR app_user SERVER remote_server OPTIONS (user 'remote_app', password '__OPTION_PASSWORD__');
 
       -- user_mapping.drop
       DROP USER MAPPING FOR app_user SERVER remote_server;
 
       -- user_mapping.alter.set_options
-      ALTER USER MAPPING FOR app_user SERVER remote_server OPTIONS (SET password 'new_secret');"
+      ALTER USER MAPPING FOR app_user SERVER remote_server OPTIONS (SET password '__OPTION_PASSWORD__');"
     `);
   });
 });

package/src/core/plan/sql-format/format-pretty-lower-leading.test.ts

@@ -912,7 +912,7 @@ describe("sql formatting snapshots", () => {
       create foreign data wrapper postgres_fdw
           handler postgres_fdw_handler
           validator postgres_fdw_validator
-          options (debug 'true');
+          options (debug '__OPTION_DEBUG__');
 
       -- fdw.drop
       drop foreign data wrapper postgres_fdw;
@@ -924,7 +924,7 @@ describe("sql formatting snapshots", () => {
       -- fdw.alter.set_options
       alter foreign data wrapper postgres_fdw
           options (
-                SET debug 'false'
+                SET debug '__OPTION_DEBUG__'
               , ADD use_remote_estimate ''
           );
 
@@ -1049,13 +1049,13 @@ describe("sql formatting snapshots", () => {
 
       -- user_mapping.create
       create user mapping for app_user server remote_server
-          options (user 'remote_app', password 'secret123');
+          options (user 'remote_app', password '__OPTION_PASSWORD__');
 
       -- user_mapping.drop
       drop user mapping for app_user server remote_server;
 
       -- user_mapping.alter.set_options
-      alter user mapping for app_user server remote_server options (SET password 'new_secret');"
+      alter user mapping for app_user server remote_server options (SET password '__OPTION_PASSWORD__');"
     `);
   });
 });

package/src/core/plan/sql-format/format-pretty-narrow.test.ts

@@ -1094,7 +1094,7 @@ describe("sql formatting snapshots", () => {
       CREATE FOREIGN DATA WRAPPER postgres_fdw
         HANDLER postgres_fdw_handler
         VALIDATOR postgres_fdw_validator
-        OPTIONS (debug 'true');
+        OPTIONS (debug '__OPTION_DEBUG__');
 
       -- fdw.drop
       DROP FOREIGN DATA WRAPPER postgres_fdw;
@@ -1106,7 +1106,7 @@ describe("sql formatting snapshots", () => {
       -- fdw.alter.set_options
       ALTER FOREIGN DATA WRAPPER postgres_fdw
         OPTIONS (
-          SET debug 'false',
+          SET debug '__OPTION_DEBUG__',
           ADD use_remote_estimate ''
         );
 
@@ -1264,7 +1264,7 @@ describe("sql formatting snapshots", () => {
         remote_server
         OPTIONS
         (user 'remote_app', password
-        'secret123');
+        '__OPTION_PASSWORD__');
 
       -- user_mapping.drop
       DROP USER MAPPING FOR app_user SERVER
@@ -1273,7 +1273,8 @@ describe("sql formatting snapshots", () => {
       -- user_mapping.alter.set_options
       ALTER USER MAPPING FOR app_user SERVER
         remote_server
-        OPTIONS (SET password 'new_secret');"
+        OPTIONS
+        (SET password '__OPTION_PASSWORD__');"
     `);
   });
 });

package/src/core/plan/sql-format/format-pretty-preserve.test.ts

@@ -908,7 +908,7 @@ describe("sql formatting snapshots", () => {
       CREATE FOREIGN DATA WRAPPER postgres_fdw
          HANDLER postgres_fdw_handler
          VALIDATOR postgres_fdw_validator
-         OPTIONS (debug 'true');
+         OPTIONS (debug '__OPTION_DEBUG__');
 
       -- fdw.drop
       DROP FOREIGN DATA WRAPPER postgres_fdw;
@@ -920,7 +920,7 @@ describe("sql formatting snapshots", () => {
       -- fdw.alter.set_options
       ALTER FOREIGN DATA WRAPPER postgres_fdw
          OPTIONS (
-            SET debug 'false',
+            SET debug '__OPTION_DEBUG__',
             ADD use_remote_estimate ''
          );
 
@@ -1045,13 +1045,13 @@ describe("sql formatting snapshots", () => {
 
       -- user_mapping.create
       CREATE USER MAPPING FOR app_user SERVER remote_server
-         OPTIONS (user 'remote_app', password 'secret123');
+         OPTIONS (user 'remote_app', password '__OPTION_PASSWORD__');
 
       -- user_mapping.drop
       DROP USER MAPPING FOR app_user SERVER remote_server;
 
       -- user_mapping.alter.set_options
-      ALTER USER MAPPING FOR app_user SERVER remote_server OPTIONS (SET password 'new_secret');"
+      ALTER USER MAPPING FOR app_user SERVER remote_server OPTIONS (SET password '__OPTION_PASSWORD__');"
     `);
   });
 });

package/src/core/plan/sql-format/format-pretty-upper.test.ts

@@ -899,7 +899,7 @@ describe("sql formatting snapshots", () => {
       CREATE FOREIGN DATA WRAPPER postgres_fdw
         HANDLER postgres_fdw_handler
         VALIDATOR postgres_fdw_validator
-        OPTIONS (debug 'true');
+        OPTIONS (debug '__OPTION_DEBUG__');
 
       -- fdw.drop
       DROP FOREIGN DATA WRAPPER postgres_fdw;
@@ -911,7 +911,7 @@ describe("sql formatting snapshots", () => {
       -- fdw.alter.set_options
       ALTER FOREIGN DATA WRAPPER postgres_fdw
         OPTIONS (
-          SET debug 'false',
+          SET debug '__OPTION_DEBUG__',
           ADD use_remote_estimate ''
         );
 
@@ -1036,13 +1036,13 @@ describe("sql formatting snapshots", () => {
 
       -- user_mapping.create
       CREATE USER MAPPING FOR app_user SERVER remote_server
-        OPTIONS (user 'remote_app', password 'secret123');
+        OPTIONS (user 'remote_app', password '__OPTION_PASSWORD__');
 
       -- user_mapping.drop
       DROP USER MAPPING FOR app_user SERVER remote_server;
 
       -- user_mapping.alter.set_options
-      ALTER USER MAPPING FOR app_user SERVER remote_server OPTIONS (SET password 'new_secret');"
+      ALTER USER MAPPING FOR app_user SERVER remote_server OPTIONS (SET password '__OPTION_PASSWORD__');"
     `);
   });
 });

package/src/core/postgres-config.test.ts

@@ -1,6 +1,7 @@
-import { describe, expect, test } from "bun:test";
+import { describe, expect, spyOn, test } from "bun:test";
 import {
   connectWithRetry,
+  connectWithTimeout,
   isRetryableConnectError,
   poolConfigFromUrl,
 } from "./postgres-config.ts";
@@ -241,6 +242,43 @@ describe("connectWithRetry", () => {
   });
 });
 
+describe("connectWithTimeout", () => {
+  test("clears the timer when connect resolves before it fires", async () => {
+    const clearSpy = spyOn(globalThis, "clearTimeout");
+    try {
+      const sentinel = { client: true };
+      const result = await connectWithTimeout(
+        () => Promise.resolve(sentinel),
+        60_000,
+        "source",
+      );
+      expect(result).toBe(sentinel);
+      expect(clearSpy).toHaveBeenCalled();
+    } finally {
+      clearSpy.mockRestore();
+    }
+  });
+
+  test("rejects with a timeout error when connect is too slow", async () => {
+    await expect(
+      connectWithTimeout(() => new Promise<never>(() => {}), 5, "target"),
+    ).rejects.toThrow(/timed out after 5ms/);
+  });
+
+  test("clears the timer even when connect rejects", async () => {
+    const clearSpy = spyOn(globalThis, "clearTimeout");
+    try {
+      const boom = new Error("connect ECONNREFUSED");
+      await expect(
+        connectWithTimeout(() => Promise.reject(boom), 60_000, "target"),
+      ).rejects.toBe(boom);
+      expect(clearSpy).toHaveBeenCalled();
+    } finally {
+      clearSpy.mockRestore();
+    }
+  });
+});
+
 describe("poolConfigFromUrl", () => {
   describe("non-IPv6 URLs pass through as connectionString", () => {
     test("DNS hostname", () => {

package/src/core/postgres-config.ts

@@ -209,6 +209,37 @@ export async function connectWithRetry<T>(opts: {
   throw lastError;
 }
 
+/**
+ * Race `connect()` against a `timeoutMs` rejection and clear the timer when
+ * either side wins. If the timer is left running after a fast connect, the
+ * pending `setTimeout` keeps the event loop alive and the process hangs for
+ * the rest of `timeoutMs`.
+ */
+export function connectWithTimeout<T>(
+  connect: () => Promise<T>,
+  timeoutMs: number,
+  label: "source" | "target",
+): Promise<T> {
+  let timer: ReturnType<typeof setTimeout>;
+  return Promise.race([
+    connect(),
+    new Promise<never>((_, reject) => {
+      timer = setTimeout(
+        () =>
+          reject(
+            new Error(
+              `Connection to ${label} database timed out after ${timeoutMs}ms. ` +
+                `The server may require SSL, use an invalid certificate, or be unreachable.`,
+            ),
+          ),
+        timeoutMs,
+      );
+    }),
+  ]).finally(() => {
+    clearTimeout(timer);
+  });
+}
+
 /**
  * Options for creating a Pool with event listeners.
  */
@@ -412,22 +443,7 @@ export async function createManagedPool(
   const timeoutMs = DEFAULT_CONNECT_TIMEOUT_MS;
   try {
     const client = await connectWithRetry({
-      connect: () =>
-        Promise.race([
-          pool.connect(),
-          new Promise<never>((_, reject) =>
-            setTimeout(
-              () =>
-                reject(
-                  new Error(
-                    `Connection to ${label} database timed out after ${timeoutMs}ms. ` +
-                      `The server may require SSL, use an invalid certificate, or be unreachable.`,
-                  ),
-                ),
-              timeoutMs,
-            ),
-          ),
-        ]),
+      connect: () => connectWithTimeout(() => pool.connect(), timeoutMs, label),
     });
     client.release();
   } catch (err) {

package/src/core/sort/debug-visualization.ts

@@ -233,7 +233,7 @@ export function printDebugGraph(
       "\n==== Mermaid (cycle detected) ====\n%s\n==== end ====",
       mermaidDiagram,
     );
-  } catch (_error) {
+  } catch {
     // ignore debug printing errors
   }
 }

package/src/core/sort/sort-changes.test.ts

@@ -144,6 +144,7 @@ function table(
 
 async function catalogWithDepends(depends: PgDepend[]) {
   const base = await createEmptyCatalog(170000, "postgres");
+  // oxlint-disable-next-line typescript/no-misused-spread
   return new Catalog({ ...base, depends });
 }
 

package/src/core/sort/topological-sort.ts

@@ -14,7 +14,7 @@ export function performStableTopologicalSort(
     { length: nodeCount },
     () => new Set<number>(),
   );
-  const inDegreeCounts = new Array<number>(nodeCount).fill(0);
+  const inDegreeCounts: number[] = Array.from({ length: nodeCount }, () => 0);
 
   for (const [sourceIndex, targetIndex] of edges) {
     if (!adjacencyList[sourceIndex].has(targetIndex)) {
@@ -73,7 +73,7 @@ export function findCycle(
   }
 
   // 0 = unvisited, 1 = visiting, 2 = completed
-  const visitState = new Array<number>(nodeCount).fill(0);
+  const visitState: number[] = Array.from({ length: nodeCount }, () => 0);
   const pathStack: number[] = [];
   let cycleNodeIndexes: number[] | null = null;