@supabase/pg-delta 1.0.0-alpha.23 → 1.0.0-alpha.25

package/src/core/objects/foreign-data-wrapper/user-mapping/changes/user-mapping.create.ts

@@ -1,6 +1,7 @@
 import type { SerializeOptions } from "../../../../integrations/serialize/serialize.types.ts";
 import { quoteLiteral } from "../../../base.change.ts";
 import { stableId } from "../../../utils.ts";
+import { redactOptionValue } from "../../sensitive-options.ts";
 import type { UserMapping } from "../user-mapping.model.ts";
 import { CreateUserMappingChange } from "./user-mapping.base.ts";
 
@@ -51,11 +52,12 @@ export class CreateUserMapping extends CreateUserMappingChange {
     if (this.userMapping.options && this.userMapping.options.length > 0) {
       const optionPairs: string[] = [];
       for (let i = 0; i < this.userMapping.options.length; i += 2) {
-        if (i + 1 < this.userMapping.options.length) {
-          optionPairs.push(
-            `${this.userMapping.options[i]} ${quoteLiteral(this.userMapping.options[i + 1])}`,
-          );
-        }
+        const key = this.userMapping.options[i];
+        const value = this.userMapping.options[i + 1];
+        if (key === undefined || value === undefined) continue;
+        optionPairs.push(
+          `${key} ${quoteLiteral(redactOptionValue(key, value))}`,
+        );
       }
       if (optionPairs.length > 0) {
         parts.push(`OPTIONS (${optionPairs.join(", ")})`);

package/src/core/objects/foreign-data-wrapper/user-mapping/user-mapping.model.ts

@@ -56,6 +56,16 @@ export class UserMapping extends BasePgModel {
   }
 }
 
+/**
+ * Extract `pg_user_mapping` rows into `UserMapping` models.
+ *
+ * The returned models carry option values **verbatim** from
+ * `pg_user_mapping.umoptions`, which means cleartext secrets like
+ * `password` are present in memory. Always route through
+ * `extractCatalog` (which calls `normalizeCatalog`) before emitting
+ * options to any output channel — see CLI-1467 and
+ * `packages/pg-delta/src/core/objects/foreign-data-wrapper/sensitive-options.ts`.
+ */
 export async function extractUserMappings(pool: Pool): Promise<UserMapping[]> {
   const { rows: mappingRows } = await pool.query<UserMappingProps>(sql`
       select

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/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/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