@supabase/pg-delta 1.0.0-alpha.10 → 1.0.0-alpha.12

package/src/core/objects/view/view.diff.test.ts

@@ -105,6 +105,102 @@ describe.concurrent("view.diff", () => {
     expect(changes[0]).toBeInstanceOf(CreateView);
   });
 
+  test("drop and recreate when view columns change", () => {
+    const main = makeView({
+      owner: "postgres",
+      columns: [
+        {
+          name: "id",
+          position: 1,
+          data_type: "integer",
+          data_type_str: "integer",
+          is_custom_type: false,
+          custom_type_type: null,
+          custom_type_category: null,
+          custom_type_schema: null,
+          custom_type_name: null,
+          not_null: false,
+          is_identity: false,
+          is_identity_always: false,
+          is_generated: false,
+          collation: null,
+          default: null,
+          comment: null,
+        },
+      ],
+    });
+    const branch = makeView({
+      owner: "postgres",
+      columns: [
+        ...main.columns,
+        {
+          name: "priority",
+          position: 2,
+          data_type: "integer",
+          data_type_str: "integer",
+          is_custom_type: false,
+          custom_type_type: null,
+          custom_type_category: null,
+          custom_type_schema: null,
+          custom_type_name: null,
+          not_null: false,
+          is_identity: false,
+          is_identity_always: false,
+          is_generated: false,
+          collation: null,
+          default: null,
+          comment: null,
+        },
+      ],
+    });
+    const changes = diffViews(
+      testContext,
+      { [main.stableId]: main },
+      { [branch.stableId]: branch },
+    );
+    expect(changes).toHaveLength(2);
+    expect(changes[0]).toBeInstanceOf(DropView);
+    expect(changes[1]).toBeInstanceOf(CreateView);
+  });
+
+  test("column position-only change does not trigger drop+create", () => {
+    const col = {
+      name: "id",
+      position: 1,
+      data_type: "integer",
+      data_type_str: "integer",
+      is_custom_type: false,
+      custom_type_type: null,
+      custom_type_category: null,
+      custom_type_schema: null,
+      custom_type_name: null,
+      not_null: false,
+      is_identity: false,
+      is_identity_always: false,
+      is_generated: false,
+      collation: null,
+      default: null,
+      comment: "my column",
+    };
+    const main = makeView({
+      owner: "postgres",
+      comment: "old comment",
+      columns: [{ ...col, position: 1 }],
+    });
+    const branch = makeView({
+      owner: "postgres",
+      comment: "new comment",
+      columns: [{ ...col, position: 2 }],
+    });
+    const changes = diffViews(
+      testContext,
+      { [main.stableId]: main },
+      { [branch.stableId]: branch },
+    );
+    expect(changes.some((c) => c instanceof DropView)).toBe(false);
+    expect(changes.some((c) => c instanceof CreateCommentOnView)).toBe(true);
+  });
+
   test("create with privileges emits grant changes", () => {
     const v = makeView({
       privileges: [

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

@@ -1,4 +1,5 @@
 import { diffObjects } from "../base.diff.ts";
+import { normalizeColumns } from "../base.model.ts";
 import {
   diffPrivileges,
   emitColumnPrivilegeChanges,
@@ -43,19 +44,17 @@ export function diffViews(
   const { created, dropped, altered } = diffObjects(main, branch);
 
   const changes: ViewChange[] = [];
-
-  for (const viewId of created) {
-    const v = branch[viewId];
-    changes.push(new CreateView({ view: v }));
+  const appendCreateViewChanges = (view: View) => {
+    changes.push(new CreateView({ view }));
 
     // OWNER: If the view should be owned by someone other than the current user,
     // emit ALTER VIEW ... OWNER TO after creation
-    if (v.owner !== ctx.currentUser) {
-      changes.push(new AlterViewChangeOwner({ view: v, owner: v.owner }));
+    if (view.owner !== ctx.currentUser) {
+      changes.push(new AlterViewChangeOwner({ view, owner: view.owner }));
     }
 
-    if (v.comment !== null) {
-      changes.push(new CreateCommentOnView({ view: v }));
+    if (view.comment !== null) {
+      changes.push(new CreateCommentOnView({ view }));
     }
 
     // PRIVILEGES: For created objects, compare against default privileges state
@@ -66,26 +65,26 @@ export function diffViews(
     const effectiveDefaults = ctx.defaultPrivilegeState.getEffectiveDefaults(
       ctx.currentUser,
       "view",
-      v.schema ?? "",
+      view.schema ?? "",
     );
     const creatorFilteredDefaults =
-      v.owner !== ctx.currentUser
+      view.owner !== ctx.currentUser
         ? effectiveDefaults.filter((p) => p.grantee !== ctx.currentUser)
         : effectiveDefaults;
-    const desiredPrivileges = v.privileges;
+    const desiredPrivileges = view.privileges;
     // Filter out owner privileges - owner always has ALL privileges implicitly
     // and shouldn't be compared. Use the view owner as the reference.
     const privilegeResults = diffPrivileges(
       creatorFilteredDefaults,
       desiredPrivileges,
-      v.owner,
+      view.owner,
     );
 
     changes.push(
       ...(emitColumnPrivilegeChanges(
         privilegeResults,
-        v,
-        v,
+        view,
+        view,
         "view",
         {
           Grant: GrantViewPrivileges,
@@ -96,6 +95,10 @@ export function diffViews(
         ctx.version,
       ) as ViewChange[]),
     );
+  };
+
+  for (const viewId of created) {
+    appendCreateViewChanges(branch[viewId]);
   }
 
   for (const viewId of dropped) {
@@ -128,7 +131,19 @@ export function diffViews(
       { options: deepEqual },
     );
 
-    if (nonAlterablePropsChanged) {
+    // Normalize columns (strip position, sort by name) to match stableSnapshot().
+    // Position-only differences are safe to ignore here because column order in a
+    // view is determined by its definition, which is already checked above via
+    // NON_ALTERABLE_FIELDS - a position change always implies a definition change.
+    if (
+      !deepEqual(
+        normalizeColumns(mainView.columns),
+        normalizeColumns(branchView.columns),
+      )
+    ) {
+      changes.push(new DropView({ view: mainView }));
+      appendCreateViewChanges(branchView);
+    } else if (nonAlterablePropsChanged) {
       // Replace the entire view using CREATE OR REPLACE to avoid drop when possible
       changes.push(new CreateView({ view: branchView, orReplace: true }));
     } else {

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

@@ -439,7 +439,7 @@ describe("sql formatting snapshots", () => {
       CREATE SEQUENCE public.table_with_very_long_name_for_formatting_and_wrapping_test_id_seq;
 
       -- sequence.drop
-      DROP SEQUENCE public.table_with_very_long_name_for_formatting_and_wrapping_test_id_seq;
+      DROP SEQUENCE public.table_with_very_long_name_for_formatting_and_wrapping_test_id_seq CASCADE;
 
       -- sequence.alter.set_owned_by
       ALTER SEQUENCE public.table_with_very_long_name_for_formatting_and_wrapping_test_id_seq OWNED BY public.table_with_very_long_name_for_formatting_and_wrapping_test.id;

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

@@ -579,7 +579,7 @@ describe("sql formatting snapshots", () => {
       create sequence public.table_with_very_long_name_for_formatting_and_wrapping_test_id_seq;
 
       -- sequence.drop
-      drop sequence public.table_with_very_long_name_for_formatting_and_wrapping_test_id_seq;
+      drop sequence public.table_with_very_long_name_for_formatting_and_wrapping_test_id_seq cascade;
 
       -- sequence.alter.set_owned_by
       alter sequence public.table_with_very_long_name_for_formatting_and_wrapping_test_id_seq owned by

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

@@ -684,7 +684,7 @@ describe("sql formatting snapshots", () => {
 
       -- sequence.drop
       DROP SEQUENCE
-        public.table_with_very_long_name_for_formatting_and_wrapping_test_id_seq;
+        public.table_with_very_long_name_for_formatting_and_wrapping_test_id_seq CASCADE;
 
       -- sequence.alter.set_owned_by
       ALTER SEQUENCE

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

@@ -577,7 +577,7 @@ describe("sql formatting snapshots", () => {
       CREATE SEQUENCE public.table_with_very_long_name_for_formatting_and_wrapping_test_id_seq;
 
       -- sequence.drop
-      DROP SEQUENCE public.table_with_very_long_name_for_formatting_and_wrapping_test_id_seq;
+      DROP SEQUENCE public.table_with_very_long_name_for_formatting_and_wrapping_test_id_seq CASCADE;
 
       -- sequence.alter.set_owned_by
       ALTER SEQUENCE public.table_with_very_long_name_for_formatting_and_wrapping_test_id_seq OWNED BY

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

@@ -570,7 +570,7 @@ describe("sql formatting snapshots", () => {
       CREATE SEQUENCE public.table_with_very_long_name_for_formatting_and_wrapping_test_id_seq;
 
       -- sequence.drop
-      DROP SEQUENCE public.table_with_very_long_name_for_formatting_and_wrapping_test_id_seq;
+      DROP SEQUENCE public.table_with_very_long_name_for_formatting_and_wrapping_test_id_seq CASCADE;
 
       -- sequence.alter.set_owned_by
       ALTER SEQUENCE public.table_with_very_long_name_for_formatting_and_wrapping_test_id_seq OWNED BY

package/src/core/postgres-config.ts

@@ -2,7 +2,7 @@
  * PostgreSQL connection configuration with custom type handlers.
  */
 
-import type { PoolClient, PoolConfig } from "pg";
+import type { ClientBase, PoolClient, PoolConfig } from "pg";
 import { escapeIdentifier, Pool, types } from "pg";
 import { parseSslConfig } from "./plan/ssl-config.ts";
 
@@ -115,7 +115,7 @@ const DEFAULT_CONNECT_TIMEOUT_MS =
  */
 interface CreatePoolOptions extends Partial<PoolConfig> {
   /** Called when a new client connects to the pool */
-  onConnect?: (client: PoolClient) => void | Promise<void>;
+  onConnect?: (client: ClientBase) => void | Promise<void>;
   /** Called when an idle client emits an error */
   onError?: (err: Error, client: PoolClient) => void;
   /** Called when a client is acquired from the pool */

package/src/core/sort/custom-constraints.ts

@@ -1,9 +1,15 @@
 import type { Change } from "../change.types.ts";
-import { getSchema } from "../integrations/filter/extractors.ts";
+import { getSchema } from "../change-utils.ts";
 import {
   GrantRoleDefaultPrivileges,
   RevokeRoleDefaultPrivileges,
 } from "../objects/role/changes/role.privilege.ts";
+import {
+  AlterTableAlterColumnAddIdentity,
+  AlterTableAlterColumnDropDefault,
+  AlterTableAlterColumnDropIdentity,
+  AlterTableAlterColumnSetDefault,
+} from "../objects/table/changes/table.alter.ts";
 import type { Constraint } from "./types.ts";
 
 /**
@@ -143,11 +149,79 @@ function generateDefaultPrivilegeConstraints(changes: Change[]): Constraint[] {
   return constraints;
 }
 
+function generateIdentityTransitionConstraints(
+  changes: Change[],
+): Constraint[] {
+  const constraints: Constraint[] = [];
+  const dropDefaultByColumn = new Map<string, number[]>();
+  const dropIdentityByColumn = new Map<string, number[]>();
+  const addIdentityByColumn = new Map<string, number[]>();
+  const setDefaultByColumn = new Map<string, number[]>();
+
+  for (let i = 0; i < changes.length; i++) {
+    const change = changes[i];
+    const columnKey =
+      "table" in change && "column" in change
+        ? `${change.table.schema}.${change.table.name}.${change.column.name}`
+        : null;
+    if (!columnKey) continue;
+
+    if (change instanceof AlterTableAlterColumnDropDefault) {
+      const entries = dropDefaultByColumn.get(columnKey) ?? [];
+      entries.push(i);
+      dropDefaultByColumn.set(columnKey, entries);
+    } else if (change instanceof AlterTableAlterColumnAddIdentity) {
+      const entries = addIdentityByColumn.get(columnKey) ?? [];
+      entries.push(i);
+      addIdentityByColumn.set(columnKey, entries);
+    } else if (change instanceof AlterTableAlterColumnDropIdentity) {
+      const entries = dropIdentityByColumn.get(columnKey) ?? [];
+      entries.push(i);
+      dropIdentityByColumn.set(columnKey, entries);
+    } else if (change instanceof AlterTableAlterColumnSetDefault) {
+      const entries = setDefaultByColumn.get(columnKey) ?? [];
+      entries.push(i);
+      setDefaultByColumn.set(columnKey, entries);
+    }
+  }
+
+  // These rules only order same-column ALTERs inside the create/alter phase.
+  // Sequence drops are handled separately in the earlier drop phase.
+  for (const [columnKey, dropDefaultIndexes] of dropDefaultByColumn) {
+    const addIdentityIndexes = addIdentityByColumn.get(columnKey) ?? [];
+    for (const sourceIndex of dropDefaultIndexes) {
+      for (const targetIndex of addIdentityIndexes) {
+        constraints.push({
+          sourceChangeIndex: sourceIndex,
+          targetChangeIndex: targetIndex,
+          source: "custom",
+        });
+      }
+    }
+  }
+
+  for (const [columnKey, dropIdentityIndexes] of dropIdentityByColumn) {
+    const setDefaultIndexes = setDefaultByColumn.get(columnKey) ?? [];
+    for (const sourceIndex of dropIdentityIndexes) {
+      for (const targetIndex of setDefaultIndexes) {
+        constraints.push({
+          sourceChangeIndex: sourceIndex,
+          targetChangeIndex: targetIndex,
+          source: "custom",
+        });
+      }
+    }
+  }
+
+  return constraints;
+}
+
 /**
  * All custom constraint generators.
  */
 const customConstraintGenerators: ConstraintGenerator[] = [
   generateDefaultPrivilegeConstraints,
+  generateIdentityTransitionConstraints,
 ];
 
 /**

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

@@ -10,7 +10,7 @@
  */
 
 import type { Change } from "../change.types.ts";
-import { getSchema } from "../integrations/filter/extractors.ts";
+import { getSchema } from "../change-utils.ts";
 import { getExecutionPhase, isMetadataStableId, type Phase } from "./utils.ts";
 
 /**
@@ -308,30 +308,6 @@ function getParentStableId(change: Change): string | null {
   return requires.length > 0 ? requires[0] : null;
 }
 
-/**
- * Extract schema name from a change.
- * Returns the schema name if present, or null for non-schema objects.
- *
- * Uses the getSchema helper which directly accesses schema properties from change objects.
- * For default_privilege changes, accesses the inSchema property directly.
- * For event_trigger changes, groups by their function's schema.
- */
-function extractSchemaFromChange(change: Change): string | null {
-  // Handle default_privilege changes specially (they have inSchema property)
-  if (change.scope === "default_privilege") {
-    // TypeScript doesn't know about inSchema, but we know it exists for default_privilege changes
-    return (change as { inSchema: string | null }).inSchema ?? null;
-  }
-
-  // Handle event_trigger changes specially - group by their function's schema
-  if (change.objectType === "event_trigger") {
-    return change.eventTrigger.function_schema;
-  }
-
-  // Use the getSchema helper for all other changes
-  return getSchema(change);
-}
-
 /**
  * Get the effective object type for sorting purposes.
  * For sub-entities, returns the parent's object type (table/view/materialized_view).
@@ -438,8 +414,8 @@ function sortPhase(changes: Change[], phase: Phase): Change[] {
     const changeB = b.change;
 
     // 1. Compare schemas (group objects by schema)
-    const schemaA = extractSchemaFromChange(changeA);
-    const schemaB = extractSchemaFromChange(changeB);
+    const schemaA = getSchema(changeA);
+    const schemaB = getSchema(changeB);
 
     // Non-schema objects (roles, languages, extensions, etc.) sort first
     // Use a special prefix to ensure they come before schema objects