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

package/src/core/post-diff-normalization.test.ts

@@ -3,6 +3,12 @@ import type { Change } from "./change.types.ts";
 import { CreateIndex } from "./objects/index/changes/index.create.ts";
 import { DropIndex } from "./objects/index/changes/index.drop.ts";
 import { Index, type IndexProps } from "./objects/index/index.model.ts";
+import { CreateSequence } from "./objects/sequence/changes/sequence.create.ts";
+import { DropSequence } from "./objects/sequence/changes/sequence.drop.ts";
+import {
+  Sequence,
+  type SequenceProps,
+} from "./objects/sequence/sequence.model.ts";
 import {
   AlterTableAddConstraint,
   AlterTableChangeOwner,
@@ -304,6 +310,123 @@ describe("normalizePostDiffChanges", () => {
     ).toHaveLength(1);
   });
 
+  describe("DropSequence pruning on replaced tables", () => {
+    const baseSequenceProps: SequenceProps = {
+      schema: "public",
+      name: "project_link_type_id_seq",
+      data_type: "integer",
+      start_value: 1,
+      minimum_value: 1n,
+      maximum_value: 2147483647n,
+      increment: 1,
+      cycle_option: false,
+      cache_size: 1,
+      persistence: "p",
+      owned_by_schema: "public",
+      owned_by_table: "project_link_type",
+      owned_by_column: "id",
+      comment: null,
+      privileges: [],
+      owner: "postgres",
+    };
+
+    test("prunes DropSequence when its OWNED BY table is in replacedTableIds", () => {
+      const replacedTable = new Table({
+        ...baseTableProps,
+        name: "project_link_type",
+        columns: [{ ...integerColumn("id", 1), not_null: true }],
+      });
+      const ownedSequence = new Sequence(baseSequenceProps);
+
+      const dropSequence = new DropSequence({ sequence: ownedSequence });
+      const dropTable = new DropTable({ table: replacedTable });
+      const createTable = new CreateTable({ table: replacedTable });
+
+      const changes: Change[] = [dropSequence, dropTable, createTable];
+
+      const normalized = normalizePostDiffChanges({
+        changes,
+        replacedTableIds: new Set([replacedTable.stableId]),
+      });
+
+      expect(normalized.some((change) => change instanceof DropSequence)).toBe(
+        false,
+      );
+      expect(normalized).toContain(dropTable);
+      expect(normalized).toContain(createTable);
+    });
+
+    test("keeps DropSequence whose OWNED BY table is not in replacedTableIds", () => {
+      const survivingTable = new Table({
+        ...baseTableProps,
+        name: "project_link_type",
+        columns: [{ ...integerColumn("id", 1), not_null: true }],
+      });
+      const ownedSequence = new Sequence(baseSequenceProps);
+
+      const dropSequence = new DropSequence({ sequence: ownedSequence });
+
+      const normalized = normalizePostDiffChanges({
+        changes: [dropSequence],
+        // Different table is being replaced; the sequence's OWNED BY does
+        // not match, so DropSequence must survive.
+        replacedTableIds: new Set([
+          `table:${survivingTable.schema}.unrelated_table` as const,
+        ]),
+      });
+
+      expect(normalized).toContain(dropSequence);
+    });
+
+    test("keeps DropSequence with no OWNED BY when replacedTableIds is non-empty", () => {
+      const orphanSequence = new Sequence({
+        ...baseSequenceProps,
+        owned_by_schema: null,
+        owned_by_table: null,
+        owned_by_column: null,
+      });
+
+      const dropSequence = new DropSequence({ sequence: orphanSequence });
+
+      const normalized = normalizePostDiffChanges({
+        changes: [dropSequence],
+        replacedTableIds: new Set(["table:public.project_link_type" as const]),
+      });
+
+      expect(normalized).toContain(dropSequence);
+    });
+
+    test("keeps unrelated CreateSequence and DropSequence even when its non-owning table is replaced", () => {
+      const sequenceA = new Sequence(baseSequenceProps);
+      const sequenceB = new Sequence({
+        ...baseSequenceProps,
+        name: "unrelated_seq",
+        owned_by_schema: null,
+        owned_by_table: null,
+        owned_by_column: null,
+      });
+
+      const dropOwned = new DropSequence({ sequence: sequenceA });
+      const createUnrelated = new CreateSequence({ sequence: sequenceB });
+
+      const replacedTable = new Table({
+        ...baseTableProps,
+        name: "project_link_type",
+        columns: [{ ...integerColumn("id", 1), not_null: true }],
+      });
+
+      const normalized = normalizePostDiffChanges({
+        changes: [dropOwned, createUnrelated],
+        replacedTableIds: new Set([replacedTable.stableId]),
+      });
+
+      expect(normalized.some((change) => change instanceof DropSequence)).toBe(
+        false,
+      );
+      expect(normalized).toContain(createUnrelated);
+    });
+  });
+
   describe("restoreReplicaIdentityAfterIndexReplace", () => {
     const baseIndexProps: IndexProps = {
       schema: "public",

package/src/core/post-diff-normalization.ts

@@ -1,6 +1,7 @@
 import type { Change } from "./change.types.ts";
 import { CreateIndex } from "./objects/index/changes/index.create.ts";
 import { DropIndex } from "./objects/index/changes/index.drop.ts";
+import { DropSequence } from "./objects/sequence/changes/sequence.drop.ts";
 import {
   AlterTableAddConstraint,
   AlterTableDropColumn,
@@ -24,12 +25,40 @@ function isSupersededByTableReplacement(
   replacedTableIds: ReadonlySet<string>,
 ): boolean {
   if (
-    !(change instanceof AlterTableDropColumn) &&
-    !(change instanceof AlterTableDropConstraint)
+    change instanceof AlterTableDropColumn ||
+    change instanceof AlterTableDropConstraint
   ) {
-    return false;
+    return replacedTableIds.has(change.table.stableId);
   }
-  return replacedTableIds.has(change.table.stableId);
+
+  // `DropSequence(S)` is superseded when S is OWNED BY a column on a table
+  // that `expandReplaceDependencies` has promoted to `DropTable + CreateTable`
+  // in the same plan. PostgreSQL cascade-drops the OWNED BY sequence as part
+  // of the DROP TABLE, so the explicit DROP SEQUENCE is redundant and — more
+  // importantly — closes an unbreakable `DropSequence ↔ DropTable` cycle in
+  // the drop phase via the bidirectional pg_depend edges between the
+  // sequence and its owning column (`column → sequence` for the DEFAULT
+  // nextval reference, `sequence → column` for the OWNED BY auto-dependency).
+  // The alpha.15 short-circuit in `diffSequences.dropped` only suppresses
+  // `DropSequence` when the owning table itself is gone from `branchTables`;
+  // here the table survives in branch and the replacement is added later by
+  // the expander, so this whole-plan rewrite has to happen post-diff.
+  if (change instanceof DropSequence) {
+    if (
+      !change.sequence.owned_by_schema ||
+      !change.sequence.owned_by_table ||
+      !change.sequence.owned_by_column
+    ) {
+      return false;
+    }
+    const ownedByTableId = stableId.table(
+      change.sequence.owned_by_schema,
+      change.sequence.owned_by_table,
+    );
+    return replacedTableIds.has(ownedByTableId);
+  }
+
+  return false;
 }
 
 /**
@@ -219,6 +248,13 @@ function restoreReplicaIdentityAfterIndexReplace(
  *   `DropTable(T) + CreateTable(T)` pair. Without this, the apply phase
  *   would try to drop a column that no longer exists in the freshly
  *   recreated table.
+ * - Prunes `DropSequence(S)` changes when `S` is `OWNED BY` a column on a
+ *   table promoted to `DropTable + CreateTable` by the expander. The
+ *   `DROP TABLE` cascade drops the sequence at apply time; emitting an
+ *   explicit `DROP SEQUENCE` in the same drop phase both duplicates the
+ *   cascade and forms an unbreakable `DropSequence ↔ DropTable` cycle on
+ *   the bidirectional pg_depend edges between the sequence and the
+ *   owning column.
  * - Dedupes duplicate `AlterTableAddConstraint` /
  *   `AlterTableValidateConstraint` / `CreateCommentOnConstraint` changes
  *   produced when `diffTables()` and `expandReplaceDependencies()` both

package/src/core/sort/cycle-breakers.test.ts

@@ -62,7 +62,9 @@ function fkConstraint(props: {
   fkColumn: string;
   targetSchema: string;
   targetTable: string;
+  targetColumn?: string;
 }) {
+  const targetColumn = props.targetColumn ?? "id";
   return {
     name: props.name,
     constraint_type: "f" as const,
@@ -78,7 +80,7 @@ function fkConstraint(props: {
     parent_table_schema: null,
     parent_table_name: null,
     key_columns: [props.fkColumn],
-    foreign_key_columns: ["id"],
+    foreign_key_columns: [targetColumn],
     foreign_key_table: props.targetTable,
     foreign_key_schema: props.targetSchema,
     foreign_key_table_is_partition: false,
@@ -91,7 +93,41 @@ function fkConstraint(props: {
     match_type: "s" as const,
     check_expression: null,
     owner: "postgres",
-    definition: `FOREIGN KEY (${props.fkColumn}) REFERENCES ${props.targetSchema}.${props.targetTable}(id)`,
+    definition: `FOREIGN KEY (${props.fkColumn}) REFERENCES ${props.targetSchema}.${props.targetTable}(${targetColumn})`,
+    comment: null,
+  };
+}
+
+function uniqueConstraint(name: string, column: string) {
+  return {
+    name,
+    constraint_type: "u" as const,
+    deferrable: false,
+    initially_deferred: false,
+    validated: true,
+    is_local: true,
+    no_inherit: false,
+    is_temporal: false,
+    is_partition_clone: false,
+    parent_constraint_schema: null,
+    parent_constraint_name: null,
+    parent_table_schema: null,
+    parent_table_name: null,
+    key_columns: [column],
+    foreign_key_columns: null,
+    foreign_key_table: null,
+    foreign_key_schema: null,
+    foreign_key_table_is_partition: null,
+    foreign_key_parent_schema: null,
+    foreign_key_parent_table: null,
+    foreign_key_effective_schema: null,
+    foreign_key_effective_table: null,
+    on_update: null,
+    on_delete: null,
+    match_type: null,
+    check_expression: null,
+    owner: "postgres",
+    definition: `UNIQUE (${column})`,
     comment: null,
   };
 }
@@ -448,6 +484,204 @@ describe("tryBreakCycleByChangeInjection", () => {
     expect(broken).toBeNull();
   });
 
+  test("publication FK-chain constraint-drop 3-cycle: injects terminal FK drop", () => {
+    // Schema:
+    //   publication p includes labs and posts
+    //   posts.lab_id REFERENCES labs(id)
+    // Diff drops posts and drops labs.unique_lab_id while also removing both
+    // tables from the publication. The FK edge from posts to the terminal
+    // constraint drop forms:
+    //   AlterPublicationDropTables → DropTable(posts)
+    //   DropTable(posts) → AlterTableDropConstraint(labs.unique_lab_id)
+    //   AlterTableDropConstraint(labs.unique_lab_id) → AlterPublicationDropTables
+    const tableLabs = new Table({
+      ...baseTableProps,
+      name: "labs",
+      columns: [{ ...integerColumn("id", 1), not_null: true }],
+      constraints: [uniqueConstraint("unique_lab_id", "id")],
+    });
+    const tablePosts = new Table({
+      ...baseTableProps,
+      name: "posts",
+      columns: [
+        { ...integerColumn("id", 1), not_null: true },
+        integerColumn("lab_id", 2),
+      ],
+      constraints: [
+        fkConstraint({
+          name: "posts_lab_id_fkey",
+          fkColumn: "lab_id",
+          targetSchema: "public",
+          targetTable: "labs",
+        }),
+      ],
+    });
+    const publication = new Publication({
+      name: "p",
+      owner: "postgres",
+      comment: null,
+      all_tables: false,
+      publish_insert: true,
+      publish_update: true,
+      publish_delete: true,
+      publish_truncate: true,
+      publish_via_partition_root: false,
+      tables: [
+        { schema: "public", name: "labs", columns: null, row_filter: null },
+        { schema: "public", name: "posts", columns: null, row_filter: null },
+      ],
+      schemas: [],
+    });
+
+    const terminalDrop = new AlterTableDropConstraint({
+      table: tableLabs,
+      constraint: tableLabs.constraints[0],
+    });
+    const changes: Change[] = [
+      new AlterPublicationDropTables({
+        publication,
+        tables: publication.tables,
+      }),
+      new DropTable({ table: tablePosts }),
+      terminalDrop,
+    ];
+
+    const broken = tryBreakCycleByChangeInjection([0, 1, 2], changes);
+    if (broken === null) throw new Error("expected breaker to fire");
+
+    const injectedDrops = broken.filter(
+      (change): change is AlterTableDropConstraint =>
+        change instanceof AlterTableDropConstraint &&
+        change.table.stableId === tablePosts.stableId,
+    );
+    expect(injectedDrops).toHaveLength(1);
+    expect(injectedDrops[0].constraint.name).toBe("posts_lab_id_fkey");
+
+    const rewrittenPostsDrop = broken.find(
+      (change): change is DropTable =>
+        change instanceof DropTable &&
+        change.table.stableId === tablePosts.stableId,
+    );
+    if (!rewrittenPostsDrop) throw new Error("missing rewritten DropTable");
+    expect(
+      rewrittenPostsDrop.externallyDroppedConstraints.has("posts_lab_id_fkey"),
+    ).toBe(true);
+    expect(broken).toContain(terminalDrop);
+  });
+
+  test("publication FK-chain constraint-drop 4-cycle: injects FK drops along the dropped-table chain", () => {
+    // Schema:
+    //   publication p includes labs, posts, and post_attachments
+    //   post_attachments.post_id REFERENCES posts(id)
+    //   posts.lab_id REFERENCES labs(id)
+    // Diff drops post_attachments and posts, drops labs.unique_lab_id,
+    // and removes all three tables from the publication.
+    const tableLabs = new Table({
+      ...baseTableProps,
+      name: "labs",
+      columns: [{ ...integerColumn("id", 1), not_null: true }],
+      constraints: [uniqueConstraint("unique_lab_id", "id")],
+    });
+    const tablePosts = new Table({
+      ...baseTableProps,
+      name: "posts",
+      columns: [
+        { ...integerColumn("id", 1), not_null: true },
+        integerColumn("lab_id", 2),
+      ],
+      constraints: [
+        fkConstraint({
+          name: "posts_lab_id_fkey",
+          fkColumn: "lab_id",
+          targetSchema: "public",
+          targetTable: "labs",
+        }),
+      ],
+    });
+    const tablePostAttachments = new Table({
+      ...baseTableProps,
+      name: "post_attachments",
+      columns: [
+        { ...integerColumn("id", 1), not_null: true },
+        integerColumn("post_id", 2),
+      ],
+      constraints: [
+        fkConstraint({
+          name: "post_attachments_post_id_fkey",
+          fkColumn: "post_id",
+          targetSchema: "public",
+          targetTable: "posts",
+        }),
+      ],
+    });
+    const publication = new Publication({
+      name: "p",
+      owner: "postgres",
+      comment: null,
+      all_tables: false,
+      publish_insert: true,
+      publish_update: true,
+      publish_delete: true,
+      publish_truncate: true,
+      publish_via_partition_root: false,
+      tables: [
+        { schema: "public", name: "labs", columns: null, row_filter: null },
+        {
+          schema: "public",
+          name: "post_attachments",
+          columns: null,
+          row_filter: null,
+        },
+        { schema: "public", name: "posts", columns: null, row_filter: null },
+      ],
+      schemas: [],
+    });
+
+    const terminalDrop = new AlterTableDropConstraint({
+      table: tableLabs,
+      constraint: tableLabs.constraints[0],
+    });
+    const changes: Change[] = [
+      new AlterPublicationDropTables({
+        publication,
+        tables: publication.tables,
+      }),
+      new DropTable({ table: tablePostAttachments }),
+      new DropTable({ table: tablePosts }),
+      terminalDrop,
+    ];
+
+    const broken = tryBreakCycleByChangeInjection([0, 1, 2, 3], changes);
+    if (broken === null) throw new Error("expected breaker to fire");
+
+    const injectedDropNames = broken
+      .filter(
+        (change): change is AlterTableDropConstraint =>
+          change instanceof AlterTableDropConstraint && change !== terminalDrop,
+      )
+      .map((change) => change.constraint.name)
+      .sort();
+    expect(injectedDropNames).toEqual([
+      "post_attachments_post_id_fkey",
+      "posts_lab_id_fkey",
+    ]);
+
+    for (const [tableId, constraintName] of [
+      [tablePostAttachments.stableId, "post_attachments_post_id_fkey"],
+      [tablePosts.stableId, "posts_lab_id_fkey"],
+    ] as const) {
+      const rewrittenDrop = broken.find(
+        (change): change is DropTable =>
+          change instanceof DropTable && change.table.stableId === tableId,
+      );
+      if (!rewrittenDrop) throw new Error(`missing DropTable for ${tableId}`);
+      expect(
+        rewrittenDrop.externallyDroppedConstraints.has(constraintName),
+      ).toBe(true);
+    }
+    expect(broken).toContain(terminalDrop);
+  });
+
   test("returns null for a cycle with no recognised pattern (e.g. publication-only)", () => {
     // Cycle of `AlterPublicationSetOwner` changes — neither FK nor
     // publication-column shape. Breaker must bail so the formatted