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

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

@@ -1,11 +1,10 @@
-import type { DefaultPrivilegeState } from "../base.default-privileges.ts";
 import { diffObjects } from "../base.diff.ts";
 import {
   diffPrivileges,
+  emitObjectPrivilegeChanges,
   filterPublicBuiltInDefaults,
-  groupPrivilegesByGrantable,
 } from "../base.privilege-diff.ts";
-import type { Role } from "../role/role.model.ts";
+import type { ObjectDiffContext } from "../diff-context.ts";
 import { deepEqual, hasNonAlterableChanges } from "../utils.ts";
 import {
   AlterProcedureChangeOwner,
@@ -39,12 +38,10 @@ import type { Procedure } from "./procedure.model.ts";
  * @returns A list of changes to apply to main to make it match branch.
  */
 export function diffProcedures(
-  ctx: {
-    version: number;
-    currentUser: string;
-    defaultPrivilegeState: DefaultPrivilegeState;
-    mainRoles: Record<string, Role>;
-  },
+  ctx: Pick<
+    ObjectDiffContext,
+    "version" | "currentUser" | "defaultPrivilegeState"
+  >,
   main: Record<string, Procedure>,
   branch: Record<string, Procedure>,
 ): ProcedureChange[] {
@@ -81,6 +78,10 @@ export function diffProcedures(
       "procedure",
       proc.schema ?? "",
     );
+    const creatorFilteredDefaults =
+      proc.owner !== ctx.currentUser
+        ? effectiveDefaults.filter((p) => p.grantee !== ctx.currentUser)
+        : effectiveDefaults;
     // Filter out PUBLIC's built-in default EXECUTE privilege (PostgreSQL grants it automatically)
     // Reference: https://www.postgresql.org/docs/17/ddl-priv.html Table 5.2
     // This prevents generating unnecessary "GRANT EXECUTE TO PUBLIC" statements
@@ -92,57 +93,25 @@ export function diffProcedures(
     // and shouldn't be compared. Note: we use the final owner (proc.owner), not the
     // current user, because ownership change happens before privilege diffing.
     const privilegeResults = diffPrivileges(
-      effectiveDefaults,
+      filterPublicBuiltInDefaults("procedure", creatorFilteredDefaults),
       desiredPrivileges,
       proc.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 GrantProcedurePrivileges({
-              procedure: proc,
-              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 RevokeProcedurePrivileges({
-              procedure: proc,
-              grantee,
-              privileges: list,
-              version: ctx.version,
-            }),
-          );
-        }
-      }
-
-      // Generate revoke grant option changes
-      if (result.revokeGrantOption.length > 0) {
-        changes.push(
-          new RevokeGrantOptionProcedurePrivileges({
-            procedure: proc,
-            grantee,
-            privilegeNames: result.revokeGrantOption,
-            version: ctx.version,
-          }),
-        );
-      }
-    }
+    changes.push(
+      ...(emitObjectPrivilegeChanges(
+        privilegeResults,
+        proc,
+        proc,
+        "procedure",
+        {
+          Grant: GrantProcedurePrivileges,
+          Revoke: RevokeProcedurePrivileges,
+          RevokeGrantOption: RevokeGrantOptionProcedurePrivileges,
+        },
+        ctx.version,
+      ) as ProcedureChange[]),
+    );
   }
 
   for (const procedureId of dropped) {
@@ -349,54 +318,22 @@ export function diffProcedures(
         mainPrivilegesFiltered,
         branchPrivilegesFiltered,
         branchProcedure.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 GrantProcedurePrivileges({
-                procedure: branchProcedure,
-                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 RevokeProcedurePrivileges({
-                procedure: mainProcedure,
-                grantee,
-                privileges: list,
-                version: ctx.version,
-              }),
-            );
-          }
-        }
-
-        // Generate revoke grant option changes
-        if (result.revokeGrantOption.length > 0) {
-          changes.push(
-            new RevokeGrantOptionProcedurePrivileges({
-              procedure: mainProcedure,
-              grantee,
-              privilegeNames: result.revokeGrantOption,
-              version: ctx.version,
-            }),
-          );
-        }
-      }
+      changes.push(
+        ...(emitObjectPrivilegeChanges(
+          privilegeResults,
+          branchProcedure,
+          mainProcedure,
+          "procedure",
+          {
+            Grant: GrantProcedurePrivileges,
+            Revoke: RevokeProcedurePrivileges,
+            RevokeGrantOption: RevokeGrantOptionProcedurePrivileges,
+          },
+          ctx.version,
+        ) as ProcedureChange[]),
+      );
     }
   }
 

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

@@ -242,7 +242,7 @@ select
         )
         order by x.grantee, x.privilege_type
       )
-      from lateral aclexplode(p.proacl) as x(grantor, grantee, privilege_type, is_grantable)
+      from lateral aclexplode(COALESCE(p.proacl, acldefault('f', p.proowner))) as x(grantor, grantee, privilege_type, is_grantable)
     ), '[]'
   ) as privileges
 from

package/src/core/objects/publication/changes/publication.alter.test.ts

@@ -1,4 +1,5 @@
 import { describe, expect, test } from "bun:test";
+import { assertValidSql } from "../../../test-utils/assert-valid-sql.ts";
 import { stableId } from "../../utils.ts";
 import type { PublicationTableProps } from "../publication.model.ts";
 import { Publication } from "../publication.model.ts";
@@ -7,7 +8,6 @@ import {
   AlterPublicationAddTables,
   AlterPublicationDropSchemas,
   AlterPublicationDropTables,
-  AlterPublicationSetForAllTables,
   AlterPublicationSetList,
   AlterPublicationSetOptions,
   AlterPublicationSetOwner,
@@ -46,7 +46,7 @@ const makePublication = (override: Partial<PublicationProps> = {}) =>
   });
 
 describe("publication.alter", () => {
-  test("set options serializes assignments and requires publication", () => {
+  test("set options serializes assignments and requires publication", async () => {
     const publication = makePublication({
       name: "pub_options",
       publish_delete: false,
@@ -60,25 +60,13 @@ describe("publication.alter", () => {
     });
 
     expect(change.requires).toEqual([publication.stableId]);
+    await assertValidSql(change.serialize());
     expect(change.serialize()).toBe(
       "ALTER PUBLICATION pub_options SET (publish = 'insert, update', publish_via_partition_root = true)",
     );
   });
 
-  test("set for all tables serializes and requires publication", () => {
-    const publication = makePublication({
-      name: "pub_all",
-      all_tables: false,
-    });
-    const change = new AlterPublicationSetForAllTables({ publication });
-
-    expect(change.requires).toEqual([publication.stableId]);
-    expect(change.serialize()).toBe(
-      "ALTER PUBLICATION pub_all SET FOR ALL TABLES",
-    );
-  });
-
-  test("set list serializes object selection and tracks dependencies", () => {
+  test("set list serializes object selection and tracks dependencies", async () => {
     const publication = makePublication({
       name: "pub_set_list",
       all_tables: false,
@@ -108,12 +96,13 @@ describe("publication.alter", () => {
       stableId.column("public", "authors", "name"),
       stableId.schema("analytics"),
     ]);
+    await assertValidSql(change.serialize());
     expect(change.serialize()).toBe(
       "ALTER PUBLICATION pub_set_list SET TABLE public.articles WHERE (published = true), TABLE public.authors (id, name), TABLES IN SCHEMA analytics",
     );
   });
 
-  test("add tables serializes new tables and tracks dependencies", () => {
+  test("add tables serializes new tables and tracks dependencies", async () => {
     const publication = makePublication({ name: "pub_add_tables" });
     const tables: PublicationTableProps[] = [
       {
@@ -138,12 +127,13 @@ describe("publication.alter", () => {
       stableId.column("audit", "events", "created_at"),
       stableId.column("audit", "events", "id"),
     ]);
+    await assertValidSql(change.serialize());
     expect(change.serialize()).toBe(
       "ALTER PUBLICATION pub_add_tables ADD TABLE public.logs, TABLE audit.events (created_at, id)",
     );
   });
 
-  test("drop tables serializes target list and tracks dependencies", () => {
+  test("drop tables serializes target list and tracks dependencies", async () => {
     const publication = makePublication({ name: "pub_drop_tables" });
     const tables: PublicationTableProps[] = [
       {
@@ -166,12 +156,13 @@ describe("publication.alter", () => {
       stableId.table("public", "logs"),
       stableId.table("audit", "events"),
     ]);
+    await assertValidSql(change.serialize());
     expect(change.serialize()).toBe(
       "ALTER PUBLICATION pub_drop_tables DROP TABLE public.logs, audit.events",
     );
   });
 
-  test("add schemas serializes and tracks dependencies", () => {
+  test("add schemas serializes and tracks dependencies", async () => {
     const publication = makePublication({ name: "pub_add_schemas" });
     const change = new AlterPublicationAddSchemas({
       publication,
@@ -183,12 +174,13 @@ describe("publication.alter", () => {
       stableId.schema("analytics"),
       stableId.schema("sales"),
     ]);
+    await assertValidSql(change.serialize());
     expect(change.serialize()).toBe(
       "ALTER PUBLICATION pub_add_schemas ADD TABLES IN SCHEMA analytics, TABLES IN SCHEMA sales",
     );
   });
 
-  test("drop schemas serializes and tracks dependencies", () => {
+  test("drop schemas serializes and tracks dependencies", async () => {
     const publication = makePublication({ name: "pub_drop_schemas" });
     const change = new AlterPublicationDropSchemas({
       publication,
@@ -200,12 +192,13 @@ describe("publication.alter", () => {
       stableId.schema("analytics"),
       stableId.schema("sales"),
     ]);
+    await assertValidSql(change.serialize());
     expect(change.serialize()).toBe(
       "ALTER PUBLICATION pub_drop_schemas DROP TABLES IN SCHEMA analytics, TABLES IN SCHEMA sales",
     );
   });
 
-  test("set owner serializes and tracks dependencies", () => {
+  test("set owner serializes and tracks dependencies", async () => {
     const publication = makePublication({ name: "pub_owner" });
     const change = new AlterPublicationSetOwner({
       publication,
@@ -216,6 +209,7 @@ describe("publication.alter", () => {
       publication.stableId,
       stableId.role("owner2"),
     ]);
+    await assertValidSql(change.serialize());
     expect(change.serialize()).toBe(
       "ALTER PUBLICATION pub_owner OWNER TO owner2",
     );

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

@@ -49,24 +49,6 @@ export class AlterPublicationSetOptions extends AlterPublicationChange {
   }
 }
 
-export class AlterPublicationSetForAllTables extends AlterPublicationChange {
-  public readonly publication: Publication;
-  public readonly scope = "object" as const;
-
-  constructor(props: { publication: Publication }) {
-    super();
-    this.publication = props.publication;
-  }
-
-  get requires() {
-    return [this.publication.stableId];
-  }
-
-  serialize(): string {
-    return `ALTER PUBLICATION ${this.publication.name} SET FOR ALL TABLES`;
-  }
-}
-
 export class AlterPublicationSetList extends AlterPublicationChange {
   public readonly publication: Publication;
   public readonly scope = "object" as const;

package/src/core/objects/publication/changes/publication.comment.test.ts

@@ -1,4 +1,5 @@
 import { describe, expect, test } from "bun:test";
+import { assertValidSql } from "../../../test-utils/assert-valid-sql.ts";
 import { stableId } from "../../utils.ts";
 import { Publication } from "../publication.model.ts";
 import {
@@ -39,7 +40,7 @@ const makePublication = (override: Partial<PublicationProps> = {}) =>
   });
 
 describe("publication.comment", () => {
-  test("create comment serializes and tracks dependencies", () => {
+  test("create comment serializes and tracks dependencies", async () => {
     const publication = makePublication({
       comment: "publication's overview",
     });
@@ -47,12 +48,13 @@ describe("publication.comment", () => {
 
     expect(change.creates).toEqual([stableId.comment(publication.stableId)]);
     expect(change.requires).toEqual([publication.stableId]);
+    await assertValidSql(change.serialize());
     expect(change.serialize()).toBe(
       "COMMENT ON PUBLICATION pub_comment IS 'publication''s overview'",
     );
   });
 
-  test("drop comment serializes and tracks dependencies", () => {
+  test("drop comment serializes and tracks dependencies", async () => {
     const publication = makePublication({
       comment: "some comment",
     });
@@ -63,6 +65,7 @@ describe("publication.comment", () => {
       stableId.comment(publication.stableId),
       publication.stableId,
     ]);
+    await assertValidSql(change.serialize());
     expect(change.serialize()).toBe(
       "COMMENT ON PUBLICATION pub_comment IS NULL",
     );

package/src/core/objects/publication/changes/publication.create.test.ts

@@ -1,4 +1,5 @@
 import { describe, expect, test } from "bun:test";
+import { assertValidSql } from "../../../test-utils/assert-valid-sql.ts";
 import { stableId } from "../../utils.ts";
 import { Publication } from "../publication.model.ts";
 import { CreatePublication } from "./publication.create.ts";
@@ -36,18 +37,19 @@ const makePublication = (override: Partial<PublicationProps> = {}) =>
   });
 
 describe("publication.create", () => {
-  test("serialize publication for all tables", () => {
+  test("serialize publication for all tables", async () => {
     const publication = makePublication();
     const change = new CreatePublication({ publication });
 
     expect(change.creates).toEqual([publication.stableId]);
     expect(change.requires).toEqual([stableId.role(publication.owner)]);
+    await assertValidSql(change.serialize());
     expect(change.serialize()).toBe(
       "CREATE PUBLICATION pub_all_tables FOR ALL TABLES",
     );
   });
 
-  test("serialize publication with explicit objects and options", () => {
+  test("serialize publication with explicit objects and options", async () => {
     const publication = makePublication({
       name: "pub_custom",
       all_tables: false,
@@ -80,6 +82,7 @@ describe("publication.create", () => {
       stableId.column("public", "authors", "name"),
       stableId.schema("analytics"),
     ]);
+    await assertValidSql(change.serialize());
     expect(change.serialize()).toBe(
       "CREATE PUBLICATION pub_custom FOR TABLE public.articles WHERE (id > 1), TABLE public.authors (id, name), TABLES IN SCHEMA analytics WITH (publish = 'insert, update', publish_via_partition_root = true)",
     );

package/src/core/objects/publication/changes/publication.drop.test.ts

@@ -1,4 +1,5 @@
 import { describe, expect, test } from "bun:test";
+import { assertValidSql } from "../../../test-utils/assert-valid-sql.ts";
 import { Publication } from "../publication.model.ts";
 import { DropPublication } from "./publication.drop.ts";
 
@@ -35,12 +36,13 @@ const makePublication = (override: Partial<PublicationProps> = {}) =>
   });
 
 describe("publication.drop", () => {
-  test("serialize drop statement and track dependencies", () => {
+  test("serialize drop statement and track dependencies", async () => {
     const publication = makePublication();
     const change = new DropPublication({ publication });
 
     expect(change.drops).toEqual([publication.stableId]);
     expect(change.requires).toEqual([publication.stableId]);
+    await assertValidSql(change.serialize());
     expect(change.serialize()).toBe("DROP PUBLICATION pub_drop_me");
   });
 });

package/src/core/objects/publication/changes/publication.types.ts

@@ -3,7 +3,6 @@ import type {
   AlterPublicationAddTables,
   AlterPublicationDropSchemas,
   AlterPublicationDropTables,
-  AlterPublicationSetForAllTables,
   AlterPublicationSetList,
   AlterPublicationSetOptions,
   AlterPublicationSetOwner,
@@ -17,7 +16,6 @@ export type PublicationChange =
   | AlterPublicationAddTables
   | AlterPublicationDropSchemas
   | AlterPublicationDropTables
-  | AlterPublicationSetForAllTables
   | AlterPublicationSetList
   | AlterPublicationSetOptions
   | AlterPublicationSetOwner

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

@@ -1,10 +1,10 @@
 import { describe, expect, test } from "bun:test";
+import type { ObjectDiffContext } from "../diff-context.ts";
 import {
   AlterPublicationAddSchemas,
   AlterPublicationAddTables,
   AlterPublicationDropSchemas,
   AlterPublicationDropTables,
-  AlterPublicationSetForAllTables,
   AlterPublicationSetOptions,
   AlterPublicationSetOwner,
 } from "./changes/publication.alter.ts";
@@ -17,6 +17,10 @@ import { DropPublication } from "./changes/publication.drop.ts";
 import { diffPublications } from "./publication.diff.ts";
 import { Publication, type PublicationProps } from "./publication.model.ts";
 
+const ctx: Pick<ObjectDiffContext, "currentUser"> = {
+  currentUser: "postgres",
+};
+
 const base: PublicationProps = {
   name: "mypub",
   owner: "postgres",
@@ -35,7 +39,7 @@ describe.concurrent("publication.diff", () => {
   test("create and drop publication", () => {
     const publication = new Publication(base);
     const created = diffPublications(
-      { currentUser: "postgres" },
+      ctx,
       {},
       { [publication.stableId]: publication },
     );
@@ -44,7 +48,7 @@ describe.concurrent("publication.diff", () => {
     );
 
     const dropped = diffPublications(
-      { currentUser: "postgres" },
+      ctx,
       { [publication.stableId]: publication },
       {},
     );
@@ -68,7 +72,7 @@ describe.concurrent("publication.diff", () => {
     });
 
     const changes = diffPublications(
-      { currentUser: "postgres" },
+      ctx,
       {},
       { [publication.stableId]: publication },
     );
@@ -95,7 +99,7 @@ describe.concurrent("publication.diff", () => {
       publish_delete: false,
     });
     const changes = diffPublications(
-      { currentUser: "postgres" },
+      ctx,
       { [mainPublication.stableId]: mainPublication },
       { [branchPublication.stableId]: branchPublication },
     );
@@ -111,15 +115,16 @@ describe.concurrent("publication.diff", () => {
       all_tables: true,
     });
     const changes = diffPublications(
-      { currentUser: "postgres" },
+      ctx,
       { [mainPublication.stableId]: mainPublication },
       { [branchPublication.stableId]: branchPublication },
     );
-    expect(
-      changes.some(
-        (change) => change instanceof AlterPublicationSetForAllTables,
-      ),
-    ).toBe(true);
+    expect(changes.some((change) => change instanceof DropPublication)).toBe(
+      true,
+    );
+    expect(changes.some((change) => change instanceof CreatePublication)).toBe(
+      true,
+    );
   });
 
   test("switch from FOR ALL TABLES to explicit list", () => {
@@ -139,7 +144,7 @@ describe.concurrent("publication.diff", () => {
       ],
     });
     const changes = diffPublications(
-      { currentUser: "postgres" },
+      ctx,
       { [mainPublication.stableId]: mainPublication },
       { [branchPublication.stableId]: branchPublication },
     );
@@ -165,7 +170,7 @@ describe.concurrent("publication.diff", () => {
       ],
     });
     const addChanges = diffPublications(
-      { currentUser: "postgres" },
+      ctx,
       { [mainPublication.stableId]: mainPublication },
       { [branchPublication.stableId]: branchPublication },
     );
@@ -181,7 +186,7 @@ describe.concurrent("publication.diff", () => {
     );
 
     const dropChanges = diffPublications(
-      { currentUser: "postgres" },
+      ctx,
       { [branchPublication.stableId]: branchPublication },
       { [mainPublication.stableId]: mainPublication },
     );
@@ -216,7 +221,7 @@ describe.concurrent("publication.diff", () => {
       ],
     });
     const changes = diffPublications(
-      { currentUser: "postgres" },
+      ctx,
       { [mainPublication.stableId]: mainPublication },
       { [branchPublication.stableId]: branchPublication },
     );
@@ -235,7 +240,7 @@ describe.concurrent("publication.diff", () => {
       schemas: ["public"],
     });
     const addChanges = diffPublications(
-      { currentUser: "postgres" },
+      ctx,
       { [mainPublication.stableId]: mainPublication },
       { [branchPublication.stableId]: branchPublication },
     );
@@ -244,7 +249,7 @@ describe.concurrent("publication.diff", () => {
     ).toBe(true);
 
     const dropChanges = diffPublications(
-      { currentUser: "postgres" },
+      ctx,
       { [branchPublication.stableId]: branchPublication },
       { [mainPublication.stableId]: mainPublication },
     );
@@ -263,7 +268,7 @@ describe.concurrent("publication.diff", () => {
       comment: "replication publication",
     });
     const changes = diffPublications(
-      { currentUser: "postgres" },
+      ctx,
       { [mainPublication.stableId]: mainPublication },
       { [branchPublication.stableId]: branchPublication },
     );
@@ -279,7 +284,7 @@ describe.concurrent("publication.diff", () => {
       comment: null,
     });
     const dropCommentChanges = diffPublications(
-      { currentUser: "postgres" },
+      ctx,
       { [branchPublication.stableId]: branchPublication },
       { [removeCommentPublication.stableId]: removeCommentPublication },
     );

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

@@ -1,11 +1,11 @@
 import { diffObjects } from "../base.diff.ts";
+import type { ObjectDiffContext } from "../diff-context.ts";
 import { deepEqual } from "../utils.ts";
 import {
   AlterPublicationAddSchemas,
   AlterPublicationAddTables,
   AlterPublicationDropSchemas,
   AlterPublicationDropTables,
-  AlterPublicationSetForAllTables,
   AlterPublicationSetOptions,
   AlterPublicationSetOwner,
 } from "./changes/publication.alter.ts";
@@ -22,7 +22,7 @@ import type {
 } from "./publication.model.ts";
 
 export function diffPublications(
-  ctx: { currentUser: string },
+  ctx: Pick<ObjectDiffContext, "currentUser">,
   main: Record<string, Publication>,
   branch: Record<string, Publication>,
 ): PublicationChange[] {
@@ -92,24 +92,18 @@ export function diffPublications(
 
     if (mainPublication.all_tables !== branchPublication.all_tables) {
       handledObjectLists = true;
-      if (branchPublication.all_tables) {
+      // Changing the all_tables mode requires DROP + CREATE because
+      // ALTER PUBLICATION does not support SET ALL TABLES.
+      changes.push(new DropPublication({ publication: mainPublication }));
+      changes.push(new CreatePublication({ publication: branchPublication }));
+      if (branchPublication.comment !== null) {
         changes.push(
-          new AlterPublicationSetForAllTables({
+          new CreateCommentOnPublication({
             publication: branchPublication,
           }),
         );
-      } else {
-        changes.push(new DropPublication({ publication: mainPublication }));
-        changes.push(new CreatePublication({ publication: branchPublication }));
-        if (branchPublication.comment !== null) {
-          changes.push(
-            new CreateCommentOnPublication({
-              publication: branchPublication,
-            }),
-          );
-        }
-        continue;
       }
+      continue;
     }
 
     if (!handledObjectLists && !branchPublication.all_tables) {