@supabase/pg-delta 1.0.0-alpha.3 → 1.0.0-alpha.4

package/src/core/objects/type/enum/enum.diff.test.ts

@@ -0,0 +1,191 @@
+import { describe, expect, test } from "bun:test";
+import { DefaultPrivilegeState } from "../../base.default-privileges.ts";
+import {
+  AlterEnumAddValue,
+  AlterEnumChangeOwner,
+} from "./changes/enum.alter.ts";
+import { CreateEnum } from "./changes/enum.create.ts";
+import { DropEnum } from "./changes/enum.drop.ts";
+import { diffEnums } from "./enum.diff.ts";
+import { Enum, type EnumProps } from "./enum.model.ts";
+
+const testContext = {
+  version: 170000,
+  currentUser: "postgres",
+  defaultPrivilegeState: new DefaultPrivilegeState({}),
+  mainRoles: {},
+};
+
+describe.concurrent("enum.diff", () => {
+  test("create and drop", () => {
+    const props: EnumProps = {
+      schema: "public",
+      name: "e1",
+      owner: "o1",
+      labels: [
+        { label: "a", sort_order: 1 },
+        { label: "b", sort_order: 2 },
+      ],
+      comment: null,
+      privileges: [],
+    };
+    const e = new Enum(props);
+
+    const created = diffEnums(testContext, {}, { [e.stableId]: e });
+    expect(created[0]).toBeInstanceOf(CreateEnum);
+
+    const dropped = diffEnums(testContext, { [e.stableId]: e }, {});
+    expect(dropped[0]).toBeInstanceOf(DropEnum);
+  });
+
+  test("alter: owner change and add value positioning", () => {
+    const main = new Enum({
+      schema: "public",
+      name: "e1",
+      owner: "o1",
+      labels: [
+        { label: "a", sort_order: 1 },
+        { label: "c", sort_order: 3 },
+      ],
+      comment: null,
+      privileges: [],
+    });
+    const branch = new Enum({
+      schema: "public",
+      name: "e1",
+      owner: "o2",
+      labels: [
+        { label: "a", sort_order: 1 },
+        { label: "b", sort_order: 2 },
+        { label: "c", sort_order: 3 },
+      ],
+      comment: null,
+      privileges: [],
+    });
+
+    const changes = diffEnums(
+      testContext,
+      { [main.stableId]: main },
+      { [branch.stableId]: branch },
+    );
+    expect(changes.some((c) => c instanceof AlterEnumChangeOwner)).toBe(true);
+    const add = changes.find((c) => c instanceof AlterEnumAddValue) as
+      | AlterEnumAddValue
+      | undefined;
+    expect(add).toBeDefined();
+  });
+
+  test("add value at beginning (BEFORE first)", () => {
+    const main = new Enum({
+      schema: "public",
+      name: "e1",
+      owner: "o1",
+      labels: [
+        { label: "b", sort_order: 2 },
+        { label: "c", sort_order: 3 },
+      ],
+      comment: null,
+      privileges: [],
+    });
+    const branch = new Enum({
+      schema: "public",
+      name: "e1",
+      owner: "o1",
+      labels: [
+        { label: "a", sort_order: 1 },
+        { label: "b", sort_order: 2 },
+        { label: "c", sort_order: 3 },
+      ],
+      comment: null,
+      privileges: [],
+    });
+
+    const changes = diffEnums(
+      testContext,
+      { [main.stableId]: main },
+      { [branch.stableId]: branch },
+    );
+    const add = changes.find((c) => c instanceof AlterEnumAddValue) as
+      | AlterEnumAddValue
+      | undefined;
+    expect(add).toBeDefined();
+    expect(add?.position?.before).toBe("b");
+    expect(add?.position?.after).toBeUndefined();
+  });
+
+  test("add value in middle (AFTER previous)", () => {
+    const main = new Enum({
+      schema: "public",
+      name: "e1",
+      owner: "o1",
+      labels: [
+        { label: "a", sort_order: 1 },
+        { label: "c", sort_order: 3 },
+      ],
+      comment: null,
+      privileges: [],
+    });
+    const branch = new Enum({
+      schema: "public",
+      name: "e1",
+      owner: "o1",
+      labels: [
+        { label: "a", sort_order: 1 },
+        { label: "b", sort_order: 2 },
+        { label: "c", sort_order: 3 },
+      ],
+      comment: null,
+      privileges: [],
+    });
+
+    const changes = diffEnums(
+      testContext,
+      { [main.stableId]: main },
+      { [branch.stableId]: branch },
+    );
+    const add = changes.find((c) => c instanceof AlterEnumAddValue) as
+      | AlterEnumAddValue
+      | undefined;
+    expect(add).toBeDefined();
+    expect(add?.position?.after).toBe("a");
+    expect(add?.position?.before).toBeUndefined();
+  });
+
+  test("add value at end (AFTER last)", () => {
+    const main = new Enum({
+      schema: "public",
+      name: "e1",
+      owner: "o1",
+      labels: [
+        { label: "a", sort_order: 1 },
+        { label: "b", sort_order: 2 },
+      ],
+      comment: null,
+      privileges: [],
+    });
+    const branch = new Enum({
+      schema: "public",
+      name: "e1",
+      owner: "o1",
+      labels: [
+        { label: "a", sort_order: 1 },
+        { label: "b", sort_order: 2 },
+        { label: "c", sort_order: 3 },
+      ],
+      comment: null,
+      privileges: [],
+    });
+
+    const changes = diffEnums(
+      testContext,
+      { [main.stableId]: main },
+      { [branch.stableId]: branch },
+    );
+    const add = changes.find((c) => c instanceof AlterEnumAddValue) as
+      | AlterEnumAddValue
+      | undefined;
+    expect(add).toBeDefined();
+    expect(add?.position?.after).toBe("b");
+    expect(add?.position?.before).toBeUndefined();
+  });
+});

package/src/core/objects/type/enum/enum.diff.ts

@@ -0,0 +1,396 @@
+import type { DefaultPrivilegeState } from "../../base.default-privileges.ts";
+import { diffObjects } from "../../base.diff.ts";
+import {
+  diffPrivileges,
+  filterPublicBuiltInDefaults,
+  groupPrivilegesByGrantable,
+} from "../../base.privilege-diff.ts";
+import type { Role } from "../../role/role.model.ts";
+import {
+  AlterEnumAddValue,
+  AlterEnumChangeOwner,
+} from "./changes/enum.alter.ts";
+import {
+  CreateCommentOnEnum,
+  DropCommentOnEnum,
+} from "./changes/enum.comment.ts";
+import { CreateEnum } from "./changes/enum.create.ts";
+import { DropEnum } from "./changes/enum.drop.ts";
+import {
+  GrantEnumPrivileges,
+  RevokeEnumPrivileges,
+  RevokeGrantOptionEnumPrivileges,
+} from "./changes/enum.privilege.ts";
+import type { EnumChange } from "./changes/enum.types.ts";
+import type { Enum } from "./enum.model.ts";
+
+/**
+ * Diff two sets of enums from main and branch catalogs.
+ *
+ * @param ctx - Context containing version, currentUser, and defaultPrivilegeState
+ * @param main - The enums in the main catalog.
+ * @param branch - The enums in the branch catalog.
+ * @returns A list of changes to apply to main to make it match branch.
+ */
+export function diffEnums(
+  ctx: {
+    version: number;
+    currentUser: string;
+    defaultPrivilegeState: DefaultPrivilegeState;
+    mainRoles: Record<string, Role>;
+  },
+  main: Record<string, Enum>,
+  branch: Record<string, Enum>,
+): EnumChange[] {
+  const { created, dropped, altered } = diffObjects(main, branch);
+
+  const changes: EnumChange[] = [];
+
+  for (const enumId of created) {
+    const createdEnum = branch[enumId];
+    changes.push(new CreateEnum({ enum: createdEnum }));
+
+    // OWNER: If the enum should be owned by someone other than the current user,
+    // emit ALTER TYPE ... OWNER TO after creation
+    if (createdEnum.owner !== ctx.currentUser) {
+      changes.push(
+        new AlterEnumChangeOwner({
+          enum: createdEnum,
+          owner: createdEnum.owner,
+        }),
+      );
+    }
+
+    if (createdEnum.comment !== null) {
+      changes.push(new CreateCommentOnEnum({ enum: createdEnum }));
+    }
+
+    // PRIVILEGES: For created objects, compare against default privileges state
+    // The migration script will run ALTER DEFAULT PRIVILEGES before CREATE (via constraint spec),
+    // so objects are created with the default privileges state in effect.
+    // We compare default privileges against desired privileges to generate REVOKE/GRANT statements
+    // needed to reach the final desired state.
+    const effectiveDefaults = ctx.defaultPrivilegeState.getEffectiveDefaults(
+      ctx.currentUser,
+      "enum",
+      createdEnum.schema ?? "",
+    );
+    // Filter out PUBLIC's built-in default USAGE privilege (PostgreSQL grants it automatically)
+    // Reference: https://www.postgresql.org/docs/17/ddl-priv.html Table 5.2
+    // This prevents generating unnecessary "GRANT USAGE TO PUBLIC" statements
+    const desiredPrivileges = filterPublicBuiltInDefaults(
+      "enum",
+      createdEnum.privileges,
+    );
+    // Filter out owner privileges - owner always has ALL privileges implicitly
+    // and shouldn't be compared. Use the enum owner as the reference.
+    const privilegeResults = diffPrivileges(
+      effectiveDefaults,
+      desiredPrivileges,
+      createdEnum.owner,
+      ctx.mainRoles,
+    );
+
+    // Generate grant changes
+    for (const [grantee, result] of privilegeResults) {
+      if (result.grants.length > 0) {
+        const grantGroups = groupPrivilegesByGrantable(result.grants);
+        for (const [grantable, list] of grantGroups) {
+          void grantable;
+          changes.push(
+            new GrantEnumPrivileges({
+              enum: createdEnum,
+              grantee,
+              privileges: list,
+              version: ctx.version,
+            }),
+          );
+        }
+      }
+
+      // Generate revoke changes
+      if (result.revokes.length > 0) {
+        const revokeGroups = groupPrivilegesByGrantable(result.revokes);
+        for (const [grantable, list] of revokeGroups) {
+          void grantable;
+          changes.push(
+            new RevokeEnumPrivileges({
+              enum: createdEnum,
+              grantee,
+              privileges: list,
+              version: ctx.version,
+            }),
+          );
+        }
+      }
+
+      // Generate revoke grant option changes
+      if (result.revokeGrantOption.length > 0) {
+        changes.push(
+          new RevokeGrantOptionEnumPrivileges({
+            enum: createdEnum,
+            grantee,
+            privilegeNames: result.revokeGrantOption,
+            version: ctx.version,
+          }),
+        );
+      }
+    }
+  }
+
+  for (const enumId of dropped) {
+    changes.push(new DropEnum({ enum: main[enumId] }));
+  }
+
+  for (const enumId of altered) {
+    const mainEnum = main[enumId];
+    const branchEnum = branch[enumId];
+
+    // If labels were removed (branch is missing labels present in main),
+    // recreate the enum to avoid relying on unsupported DROP VALUE operations.
+    const removedLabels = mainEnum.labels
+      .map((l) => l.label)
+      .filter((label) => !branchEnum.labels.some((b) => b.label === label));
+    if (removedLabels.length > 0) {
+      changes.push(new DropEnum({ enum: mainEnum }));
+      changes.push(new CreateEnum({ enum: branchEnum }));
+
+      if (branchEnum.owner !== ctx.currentUser) {
+        changes.push(
+          new AlterEnumChangeOwner({
+            enum: branchEnum,
+            owner: branchEnum.owner,
+          }),
+        );
+      }
+
+      if (branchEnum.comment !== null) {
+        changes.push(new CreateCommentOnEnum({ enum: branchEnum }));
+      }
+
+      const effectiveDefaults = ctx.defaultPrivilegeState.getEffectiveDefaults(
+        ctx.currentUser,
+        "enum",
+        branchEnum.schema ?? "",
+      );
+      const desiredPrivileges = filterPublicBuiltInDefaults(
+        "enum",
+        branchEnum.privileges,
+      );
+      const privilegeResults = diffPrivileges(
+        effectiveDefaults,
+        desiredPrivileges,
+        branchEnum.owner,
+        ctx.mainRoles,
+      );
+
+      for (const [grantee, result] of privilegeResults) {
+        if (result.grants.length > 0) {
+          const grantGroups = groupPrivilegesByGrantable(result.grants);
+          for (const [grantable, list] of grantGroups) {
+            void grantable;
+            changes.push(
+              new GrantEnumPrivileges({
+                enum: branchEnum,
+                grantee,
+                privileges: list,
+                version: ctx.version,
+              }),
+            );
+          }
+        }
+
+        if (result.revokes.length > 0) {
+          const revokeGroups = groupPrivilegesByGrantable(result.revokes);
+          for (const [grantable, list] of revokeGroups) {
+            void grantable;
+            changes.push(
+              new RevokeEnumPrivileges({
+                enum: branchEnum,
+                grantee,
+                privileges: list,
+                version: ctx.version,
+              }),
+            );
+          }
+        }
+
+        if (result.revokeGrantOption.length > 0) {
+          changes.push(
+            new RevokeGrantOptionEnumPrivileges({
+              enum: branchEnum,
+              grantee,
+              privilegeNames: result.revokeGrantOption,
+              version: ctx.version,
+            }),
+          );
+        }
+      }
+
+      continue;
+    }
+
+    // OWNER
+    if (mainEnum.owner !== branchEnum.owner) {
+      changes.push(
+        new AlterEnumChangeOwner({ enum: mainEnum, owner: branchEnum.owner }),
+      );
+    }
+
+    // LABELS (enum values)
+    if (JSON.stringify(mainEnum.labels) !== JSON.stringify(branchEnum.labels)) {
+      const labelChanges = diffEnumLabels(mainEnum, branchEnum);
+      changes.push(...labelChanges);
+    }
+
+    // COMMENT
+    if (mainEnum.comment !== branchEnum.comment) {
+      if (branchEnum.comment === null) {
+        changes.push(new DropCommentOnEnum({ enum: mainEnum }));
+      } else {
+        changes.push(new CreateCommentOnEnum({ enum: branchEnum }));
+      }
+    }
+
+    // PRIVILEGES
+    // Filter out PUBLIC's built-in default USAGE privilege from main catalog
+    // (PostgreSQL grants it automatically, so we shouldn't compare it)
+    const mainPrivilegesFiltered = filterPublicBuiltInDefaults(
+      "enum",
+      mainEnum.privileges,
+    );
+    // Filter out PUBLIC's built-in default USAGE privilege from branch catalog
+    const branchPrivilegesFiltered = filterPublicBuiltInDefaults(
+      "enum",
+      branchEnum.privileges,
+    );
+    // Filter out owner privileges - owner always has ALL privileges implicitly
+    // and shouldn't be compared. Use branch owner as the reference.
+    const privilegeResults = diffPrivileges(
+      mainPrivilegesFiltered,
+      branchPrivilegesFiltered,
+      branchEnum.owner,
+      ctx.mainRoles,
+    );
+
+    for (const [grantee, result] of privilegeResults) {
+      // Generate grant changes
+      if (result.grants.length > 0) {
+        const grantGroups = groupPrivilegesByGrantable(result.grants);
+        for (const [grantable, list] of grantGroups) {
+          void grantable;
+          changes.push(
+            new GrantEnumPrivileges({
+              enum: branchEnum,
+              grantee,
+              privileges: list,
+              version: ctx.version,
+            }),
+          );
+        }
+      }
+
+      // Generate revoke changes
+      if (result.revokes.length > 0) {
+        const revokeGroups = groupPrivilegesByGrantable(result.revokes);
+        for (const [grantable, list] of revokeGroups) {
+          void grantable;
+          changes.push(
+            new RevokeEnumPrivileges({
+              enum: mainEnum,
+              grantee,
+              privileges: list,
+              version: ctx.version,
+            }),
+          );
+        }
+      }
+
+      // Generate revoke grant option changes
+      if (result.revokeGrantOption.length > 0) {
+        changes.push(
+          new RevokeGrantOptionEnumPrivileges({
+            enum: mainEnum,
+            grantee,
+            privilegeNames: result.revokeGrantOption,
+            version: ctx.version,
+          }),
+        );
+      }
+    }
+
+    // Note: Enum renaming would also use ALTER TYPE ... RENAME TO ...
+    // But since our Enum model uses 'name' as the identity field,
+    // a name change would be handled as drop + create by diffObjects()
+  }
+
+  return changes;
+}
+
+/**
+ * Diff enum labels to determine what ALTER TYPE statements are needed.
+ * This implementation properly handles enum value positioning using sort_order.
+ * Note: We cannot reliably detect renames, so we only handle additions.
+ */
+function diffEnumLabels(mainEnum: Enum, branchEnum: Enum): EnumChange[] {
+  const changes: EnumChange[] = [];
+
+  // Create maps for efficient lookup
+  const mainLabelMap = new Map(
+    mainEnum.labels.map((label) => [label.label, label.sort_order]),
+  );
+  const branchLabelMap = new Map(
+    branchEnum.labels.map((label) => [label.label, label.sort_order]),
+  );
+
+  // Find added values (values in branch but not in main)
+  const addedValues = Array.from(branchLabelMap.keys()).filter(
+    (label) => !mainLabelMap.has(label),
+  );
+
+  // Maintain a working list of labels (by name) to calculate correct BEFORE/AFTER
+  // anchors as we simulate applying the additions in order.
+  const branchOrdered = [...branchEnum.labels].sort(
+    (a, b) => a.sort_order - b.sort_order,
+  );
+  const workingLabels = [...mainEnum.labels].map((l) => l.label);
+
+  for (const newValue of addedValues) {
+    const branchIdx = branchOrdered.findIndex((l) => l.label === newValue);
+    if (branchIdx === -1) continue;
+
+    const prevBranch = branchOrdered[branchIdx - 1]?.label;
+    const nextBranch = branchOrdered[branchIdx + 1]?.label;
+
+    let position: { before?: string; after?: string } | undefined;
+
+    // Prefer AFTER when prevBranch exists in workingLabels (more natural for sequential additions)
+    // Use BEFORE only when we need to insert before the first value or when prevBranch doesn't exist
+    if (prevBranch && workingLabels.includes(prevBranch)) {
+      position = { after: prevBranch };
+      // Insert after the previous label in our working list
+      const prevIdx = workingLabels.indexOf(prevBranch);
+      workingLabels.splice(prevIdx + 1, 0, newValue);
+    } else if (nextBranch && workingLabels.includes(nextBranch)) {
+      // Insert before nextBranch when prevBranch doesn't exist (e.g., adding at beginning)
+      position = { before: nextBranch };
+      const nextIdx = workingLabels.indexOf(nextBranch);
+      workingLabels.splice(nextIdx, 0, newValue);
+    } else if (nextBranch) {
+      // nextBranch exists but not in workingLabels yet (shouldn't happen in normal flow)
+      position = { before: nextBranch };
+      workingLabels.push(newValue);
+    } else {
+      // Fallback: append to the end
+      position = { after: workingLabels[workingLabels.length - 1] };
+      workingLabels.push(newValue);
+    }
+
+    changes.push(new AlterEnumAddValue({ enum: mainEnum, newValue, position }));
+  }
+
+  // Complex changes (removals, resorting) are currently not auto-handled.
+  // We intentionally avoid emitting drop+create to prevent data loss.
+
+  return changes;
+}