@supabase/pg-delta 1.0.0-alpha.2 → 1.0.0-alpha.21

package/dist/core/objects/trigger/changes/trigger.comment.d.ts

@@ -1,3 +1,4 @@
+import type { SerializeOptions } from "../../../integrations/serialize/serialize.types.ts";
 import type { Trigger } from "../trigger.model.ts";
 import { CreateTriggerChange, DropTriggerChange } from "./trigger.base.ts";
 export type CommentTrigger = CreateCommentOnTrigger | DropCommentOnTrigger;
@@ -9,7 +10,7 @@ export declare class CreateCommentOnTrigger extends CreateTriggerChange {
     });
     get creates(): `comment:${string}`[];
     get requires(): `trigger:${string}`[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }
 export declare class DropCommentOnTrigger extends DropTriggerChange {
     readonly trigger: Trigger;
@@ -19,5 +20,5 @@ export declare class DropCommentOnTrigger extends DropTriggerChange {
     });
     get drops(): `comment:${string}`[];
     get requires(): (`comment:${string}` | `trigger:${string}`)[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }

package/dist/core/objects/trigger/changes/trigger.comment.js

@@ -14,7 +14,7 @@ export class CreateCommentOnTrigger extends CreateTriggerChange {
     get requires() {
         return [this.trigger.stableId];
     }
-    serialize() {
+    serialize(_options) {
         return [
             "COMMENT ON TRIGGER",
             this.trigger.name,
@@ -39,7 +39,7 @@ export class DropCommentOnTrigger extends DropTriggerChange {
     get requires() {
         return [stableId.comment(this.trigger.stableId), this.trigger.stableId];
     }
-    serialize() {
+    serialize(_options) {
         return [
             "COMMENT ON TRIGGER",
             this.trigger.name,

package/dist/core/objects/trigger/changes/trigger.create.d.ts

@@ -1,3 +1,4 @@
+import type { SerializeOptions } from "../../../integrations/serialize/serialize.types.ts";
 import type { TableLikeObject } from "../../base.model.ts";
 import type { Trigger } from "../trigger.model.ts";
 import { CreateTriggerChange } from "./trigger.base.ts";
@@ -37,5 +38,5 @@ export declare class CreateTrigger extends CreateTriggerChange {
     });
     get creates(): `trigger:${string}`[];
     get requires(): string[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }

package/dist/core/objects/trigger/changes/trigger.create.js

@@ -45,17 +45,16 @@ export class CreateTrigger extends CreateTriggerChange {
         // Table dependency
         dependencies.add(stableId.table(this.trigger.schema, this.trigger.table_name));
         // Function dependency
-        // Note: We can't build the exact procedure stableId without argument types.
-        // The trigger definition contains the full function call, but parsing it would be complex.
-        // For now, we rely on pg_depend extraction for procedure dependencies.
-        // If needed, we could parse the trigger definition to extract the full function signature.
+        // Trigger functions always have signature () RETURNS trigger, so no arguments.
+        dependencies.add(stableId.procedure(this.trigger.function_schema, this.trigger.function_name));
         // Owner dependency
         dependencies.add(stableId.role(this.trigger.owner));
         return Array.from(dependencies);
     }
-    serialize() {
+    serialize(_options) {
         let definition = this.trigger.definition.trim();
-        definition = definition.replace(/^CREATE\s+(?:OR\s+REPLACE\s+)?/i, `CREATE ${this.orReplace ? "OR REPLACE " : ""}`);
+        const isConstraintTrigger = this.trigger.isConstraintTrigger;
+        definition = definition.replace(/^CREATE\s+(?:OR\s+REPLACE\s+)?/i, `CREATE ${this.orReplace && !isConstraintTrigger ? "OR REPLACE " : ""}`);
         return definition;
     }
 }

package/dist/core/objects/trigger/changes/trigger.drop.d.ts

@@ -1,3 +1,4 @@
+import type { SerializeOptions } from "../../../integrations/serialize/serialize.types.ts";
 import type { Trigger } from "../trigger.model.ts";
 import { DropTriggerChange } from "./trigger.base.ts";
 /**
@@ -18,5 +19,5 @@ export declare class DropTrigger extends DropTriggerChange {
     });
     get drops(): `trigger:${string}`[];
     get requires(): `trigger:${string}`[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }

package/dist/core/objects/trigger/changes/trigger.drop.js

@@ -22,7 +22,7 @@ export class DropTrigger extends DropTriggerChange {
     get requires() {
         return [this.trigger.stableId];
     }
-    serialize() {
+    serialize(_options) {
         return [
             "DROP TRIGGER",
             this.trigger.name,

package/dist/core/objects/trigger/changes/trigger.types.d.ts

@@ -2,4 +2,5 @@ import type { AlterTrigger } from "./trigger.alter.ts";
 import type { CommentTrigger } from "./trigger.comment.ts";
 import type { CreateTrigger } from "./trigger.create.ts";
 import type { DropTrigger } from "./trigger.drop.ts";
+/** Union of all trigger-related change variants (`objectType: "trigger"`). @category Change Types */
 export type TriggerChange = AlterTrigger | CommentTrigger | CreateTrigger | DropTrigger;

package/dist/core/objects/trigger/trigger.diff.js

@@ -44,6 +44,11 @@ export function diffTriggers(main, branch, branchIndexableObjects) {
         if (mainTrigger.is_partition_clone || branchTrigger.is_partition_clone) {
             continue;
         }
+        // Note: column_numbers is excluded because it contains pg_trigger.tgattr
+        // attnums that differ between databases when physical column layouts
+        // diverge but logical (named) columns match. The definition field
+        // (pg_get_triggerdef) already captures the UPDATE OF column list by name,
+        // so we compare by definition instead.
         const NON_ALTERABLE_FIELDS = [
             "function_schema",
             "function_name",
@@ -53,14 +58,14 @@ export function diffTriggers(main, branch, branchIndexableObjects) {
             "deferrable",
             "initially_deferred",
             "argument_count",
-            "column_numbers",
             "arguments",
             "when_condition",
             "old_table",
             "new_table",
             "owner",
+            "definition", // Compare by definition instead of column_numbers (tgattr)
         ];
-        const shouldReplace = hasNonAlterableChanges(mainTrigger, branchTrigger, NON_ALTERABLE_FIELDS, { column_numbers: deepEqual, arguments: deepEqual });
+        const shouldReplace = hasNonAlterableChanges(mainTrigger, branchTrigger, NON_ALTERABLE_FIELDS, { arguments: deepEqual });
         if (shouldReplace) {
             const tableStableId = stableId.table(branchTrigger.schema, branchTrigger.table_name);
             changes.push(new ReplaceTrigger({

package/dist/core/objects/trigger/trigger.model.d.ts

@@ -5,6 +5,13 @@ declare const triggerPropsSchema: z.ZodObject<{
     schema: z.ZodString;
     name: z.ZodString;
     table_name: z.ZodString;
+    table_relkind: z.ZodEnum<{
+        r: "r";
+        v: "v";
+        m: "m";
+        p: "p";
+        f: "f";
+    }>;
     function_schema: z.ZodString;
     function_name: z.ZodString;
     trigger_type: z.ZodNumber;
@@ -37,6 +44,7 @@ export declare class Trigger extends BasePgModel {
     readonly schema: TriggerProps["schema"];
     readonly name: TriggerProps["name"];
     readonly table_name: TriggerProps["table_name"];
+    readonly table_relkind: TriggerProps["table_relkind"];
     readonly function_schema: TriggerProps["function_schema"];
     readonly function_name: TriggerProps["function_name"];
     readonly trigger_type: TriggerProps["trigger_type"];
@@ -59,6 +67,7 @@ export declare class Trigger extends BasePgModel {
     readonly definition: TriggerProps["definition"];
     readonly comment: TriggerProps["comment"];
     constructor(props: TriggerProps);
+    get isConstraintTrigger(): boolean;
     get stableId(): `trigger:${string}`;
     get identityFields(): {
         schema: string;
@@ -74,7 +83,6 @@ export declare class Trigger extends BasePgModel {
         deferrable: boolean;
         initially_deferred: boolean;
         argument_count: number;
-        column_numbers: number[] | null;
         arguments: string[];
         when_condition: string | null;
         old_table: string | null;
@@ -85,6 +93,7 @@ export declare class Trigger extends BasePgModel {
         parent_table_name: string | null;
         is_on_partitioned_table: boolean;
         owner: string;
+        definition: string;
         comment: string | null;
     };
 }

package/dist/core/objects/trigger/trigger.model.js

@@ -7,10 +7,18 @@ const TriggerEnabledSchema = z.enum([
     "R", // REPLICA - trigger fires only in "replica" mode
     "A", // ALWAYS - trigger fires regardless of replication mode
 ]);
+const TriggerTableRelkindSchema = z.enum([
+    "r", // ordinary table
+    "p", // partitioned table
+    "f", // foreign table
+    "v", // view
+    "m", // materialized view
+]);
 const triggerPropsSchema = z.object({
     schema: z.string(),
     name: z.string(),
     table_name: z.string(),
+    table_relkind: TriggerTableRelkindSchema,
     function_schema: z.string(),
     function_name: z.string(),
     trigger_type: z.number(),
@@ -37,6 +45,7 @@ export class Trigger extends BasePgModel {
     schema;
     name;
     table_name;
+    table_relkind;
     function_schema;
     function_name;
     trigger_type;
@@ -64,6 +73,7 @@ export class Trigger extends BasePgModel {
         this.schema = props.schema;
         this.name = props.name;
         this.table_name = props.table_name;
+        this.table_relkind = props.table_relkind;
         // Data fields
         this.function_schema = props.function_schema;
         this.function_name = props.function_name;
@@ -87,6 +97,9 @@ export class Trigger extends BasePgModel {
         this.definition = props.definition;
         this.comment = props.comment;
     }
+    get isConstraintTrigger() {
+        return /^CREATE\s+CONSTRAINT\s+TRIGGER/i.test(this.definition.trim());
+    }
     get stableId() {
         return `trigger:${this.schema}.${this.table_name}.${this.name}`;
     }
@@ -107,7 +120,10 @@ export class Trigger extends BasePgModel {
             deferrable: this.deferrable,
             initially_deferred: this.initially_deferred,
             argument_count: this.argument_count,
-            column_numbers: this.column_numbers,
+            // column_numbers excluded: contains pg_trigger.tgattr attnums that differ
+            // between databases when physical column layouts diverge but logical
+            // (named) columns match. The definition field (pg_get_triggerdef) captures
+            // the UPDATE OF column list by name, so we compare by definition instead.
             arguments: this.arguments,
             when_condition: this.when_condition,
             old_table: this.old_table,
@@ -118,6 +134,7 @@ export class Trigger extends BasePgModel {
             parent_table_name: this.parent_table_name,
             is_on_partitioned_table: this.is_on_partitioned_table,
             owner: this.owner,
+            definition: this.definition,
             comment: this.comment,
         };
     }
@@ -147,6 +164,7 @@ export async function extractTriggers(pool) {
         tc.relnamespace::regnamespace::text as schema,
         quote_ident(t.tgname)               as name,
         quote_ident(tc.relname)             as table_name,
+        tc.relkind                          as table_relkind,
 
         fc.pronamespace::regnamespace::text as function_schema,
         quote_ident(fc.proname)             as function_name,

package/dist/core/objects/type/composite-type/changes/composite-type.alter.d.ts

@@ -1,3 +1,4 @@
+import type { SerializeOptions } from "../../../../integrations/serialize/serialize.types.ts";
 import type { CompositeType } from "../composite-type.model.ts";
 import { AlterCompositeTypeChange } from "./composite-type.base.ts";
 /**
@@ -29,7 +30,7 @@ export declare class AlterCompositeTypeChangeOwner extends AlterCompositeTypeCha
         owner: string;
     });
     get requires(): `type:${string}`[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }
 /**
  * ALTER TYPE ... ADD ATTRIBUTE ...
@@ -44,7 +45,7 @@ export declare class AlterCompositeTypeAddAttribute extends AlterCompositeTypeCh
     });
     get creates(): string[];
     get requires(): `type:${string}`[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }
 /**
  * ALTER TYPE ... DROP ATTRIBUTE ...
@@ -58,7 +59,7 @@ export declare class AlterCompositeTypeDropAttribute extends AlterCompositeTypeC
         attribute: CompositeType["columns"][number];
     });
     get requires(): string[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }
 /**
  * ALTER TYPE ... ALTER ATTRIBUTE ... TYPE ... [ COLLATE ... ]
@@ -72,7 +73,7 @@ export declare class AlterCompositeTypeAlterAttributeType extends AlterComposite
         attribute: CompositeType["columns"][number];
     });
     get requires(): string[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }
 /**
  * Replace a composite type by dropping and recreating it.

package/dist/core/objects/type/composite-type/changes/composite-type.alter.js

@@ -14,7 +14,7 @@ export class AlterCompositeTypeChangeOwner extends AlterCompositeTypeChange {
     get requires() {
         return [this.compositeType.stableId];
     }
-    serialize() {
+    serialize(_options) {
         return [
             "ALTER TYPE",
             `${this.compositeType.schema}.${this.compositeType.name}`,
@@ -41,7 +41,7 @@ export class AlterCompositeTypeAddAttribute extends AlterCompositeTypeChange {
     get requires() {
         return [this.compositeType.stableId];
     }
-    serialize() {
+    serialize(_options) {
         const parts = [
             "ALTER TYPE",
             `${this.compositeType.schema}.${this.compositeType.name}`,
@@ -73,7 +73,7 @@ export class AlterCompositeTypeDropAttribute extends AlterCompositeTypeChange {
             this.compositeType.stableId,
         ];
     }
-    serialize() {
+    serialize(_options) {
         return [
             "ALTER TYPE",
             `${this.compositeType.schema}.${this.compositeType.name}`,
@@ -100,7 +100,7 @@ export class AlterCompositeTypeAlterAttributeType extends AlterCompositeTypeChan
             this.compositeType.stableId,
         ];
     }
-    serialize() {
+    serialize(_options) {
         const parts = [
             "ALTER TYPE",
             `${this.compositeType.schema}.${this.compositeType.name}`,

package/dist/core/objects/type/composite-type/changes/composite-type.comment.d.ts

@@ -1,3 +1,4 @@
+import type { SerializeOptions } from "../../../../integrations/serialize/serialize.types.ts";
 import type { ColumnProps } from "../../../base.model.ts";
 import type { CompositeType } from "../composite-type.model.ts";
 import { CreateCompositeTypeChange, DropCompositeTypeChange } from "./composite-type.base.ts";
@@ -15,7 +16,7 @@ export declare class CreateCommentOnCompositeType extends CreateCompositeTypeCha
     });
     get creates(): `comment:${string}`[];
     get requires(): `type:${string}`[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }
 export declare class DropCommentOnCompositeType extends DropCompositeTypeChange {
     readonly compositeType: CompositeType;
@@ -25,7 +26,7 @@ export declare class DropCommentOnCompositeType extends DropCompositeTypeChange
     });
     get drops(): `comment:${string}`[];
     get requires(): (`comment:${string}` | `type:${string}`)[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }
 export declare class CreateCommentOnCompositeTypeAttribute extends CreateCompositeTypeChange {
     readonly compositeType: CompositeType;
@@ -37,7 +38,7 @@ export declare class CreateCommentOnCompositeTypeAttribute extends CreateComposi
     });
     get creates(): `comment:${string}`[];
     get requires(): string[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }
 export declare class DropCommentOnCompositeTypeAttribute extends DropCompositeTypeChange {
     readonly compositeType: CompositeType;
@@ -49,5 +50,5 @@ export declare class DropCommentOnCompositeTypeAttribute extends DropCompositeTy
     });
     get drops(): `comment:${string}`[];
     get requires(): string[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }

package/dist/core/objects/type/composite-type/changes/composite-type.comment.js

@@ -14,7 +14,7 @@ export class CreateCommentOnCompositeType extends CreateCompositeTypeChange {
     get requires() {
         return [this.compositeType.stableId];
     }
-    serialize() {
+    serialize(_options) {
         return [
             "COMMENT ON TYPE",
             `${this.compositeType.schema}.${this.compositeType.name}`,
@@ -40,7 +40,7 @@ export class DropCommentOnCompositeType extends DropCompositeTypeChange {
             this.compositeType.stableId,
         ];
     }
-    serialize() {
+    serialize(_options) {
         return [
             "COMMENT ON TYPE",
             `${this.compositeType.schema}.${this.compositeType.name}`,
@@ -67,7 +67,7 @@ export class CreateCommentOnCompositeTypeAttribute extends CreateCompositeTypeCh
             this.compositeType.stableId,
         ];
     }
-    serialize() {
+    serialize(_options) {
         return [
             "COMMENT ON COLUMN",
             `${this.compositeType.schema}.${this.compositeType.name}.${this.attribute.name}`,
@@ -98,7 +98,7 @@ export class DropCommentOnCompositeTypeAttribute extends DropCompositeTypeChange
             this.compositeType.stableId,
         ];
     }
-    serialize() {
+    serialize(_options) {
         return [
             "COMMENT ON COLUMN",
             `${this.compositeType.schema}.${this.compositeType.name}.${this.attribute.name}`,

package/dist/core/objects/type/composite-type/changes/composite-type.create.d.ts

@@ -1,3 +1,4 @@
+import type { SerializeOptions } from "../../../../integrations/serialize/serialize.types.ts";
 import type { CompositeType } from "../composite-type.model.ts";
 import { CreateCompositeTypeChange } from "./composite-type.base.ts";
 /**
@@ -19,5 +20,5 @@ export declare class CreateCompositeType extends CreateCompositeTypeChange {
     });
     get creates(): `type:${string}`[];
     get requires(): string[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }

package/dist/core/objects/type/composite-type/changes/composite-type.create.js

@@ -48,7 +48,7 @@ export class CreateCompositeType extends CreateCompositeTypeChange {
         }
         return Array.from(dependencies);
     }
-    serialize() {
+    serialize(_options) {
         const parts = ["CREATE TYPE"];
         // Add schema and name
         parts.push(`${this.compositeType.schema}.${this.compositeType.name}`);

package/dist/core/objects/type/composite-type/changes/composite-type.drop.d.ts

@@ -1,3 +1,4 @@
+import type { SerializeOptions } from "../../../../integrations/serialize/serialize.types.ts";
 import type { CompositeType } from "../composite-type.model.ts";
 import { DropCompositeTypeChange } from "./composite-type.base.ts";
 /**
@@ -18,5 +19,5 @@ export declare class DropCompositeType extends DropCompositeTypeChange {
     });
     get drops(): `type:${string}`[];
     get requires(): `type:${string}`[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }

package/dist/core/objects/type/composite-type/changes/composite-type.drop.js

@@ -22,7 +22,7 @@ export class DropCompositeType extends DropCompositeTypeChange {
     get requires() {
         return [this.compositeType.stableId];
     }
-    serialize() {
+    serialize(_options) {
         return [
             "DROP TYPE",
             `${this.compositeType.schema}.${this.compositeType.name}`,

package/dist/core/objects/type/composite-type/changes/composite-type.privilege.d.ts

@@ -1,3 +1,4 @@
+import type { SerializeOptions } from "../../../../integrations/serialize/serialize.types.ts";
 import type { CompositeType } from "../composite-type.model.ts";
 import { AlterCompositeTypeChange } from "./composite-type.base.ts";
 export type CompositeTypePrivilege = GrantCompositeTypePrivileges | RevokeCompositeTypePrivileges | RevokeGrantOptionCompositeTypePrivileges;
@@ -34,7 +35,7 @@ export declare class GrantCompositeTypePrivileges extends AlterCompositeTypeChan
     });
     get creates(): `acl:${string}::grantee:${string}`[];
     get requires(): (`role:${string}` | `type:${string}`)[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }
 /**
  * Revoke privileges on a composite type.
@@ -71,7 +72,7 @@ export declare class RevokeCompositeTypePrivileges extends AlterCompositeTypeCha
     });
     get drops(): `acl:${string}::grantee:${string}`[];
     get requires(): (`acl:${string}::grantee:${string}` | `role:${string}` | `type:${string}`)[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }
 /**
  * Revoke grant option for privileges on a composite type.
@@ -93,5 +94,5 @@ export declare class RevokeGrantOptionCompositeTypePrivileges extends AlterCompo
         version?: number;
     });
     get requires(): (`acl:${string}::grantee:${string}` | `role:${string}` | `type:${string}`)[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }

package/dist/core/objects/type/composite-type/changes/composite-type.privilege.js

@@ -33,7 +33,7 @@ export class GrantCompositeTypePrivileges extends AlterCompositeTypeChange {
     get requires() {
         return [this.compositeType.stableId, stableId.role(this.grantee)];
     }
-    serialize() {
+    serialize(_options) {
         const hasGrantable = this.privileges.some((p) => p.grantable);
         const hasBase = this.privileges.some((p) => !p.grantable);
         if (hasGrantable && hasBase) {
@@ -87,7 +87,7 @@ export class RevokeCompositeTypePrivileges extends AlterCompositeTypeChange {
             stableId.role(this.grantee),
         ];
     }
-    serialize() {
+    serialize(_options) {
         const kindPrefix = getObjectKindPrefix("TYPE");
         const list = this.privileges.map((p) => p.privilege);
         const privSql = formatObjectPrivilegeList("TYPE", list, this.version);
@@ -122,7 +122,7 @@ export class RevokeGrantOptionCompositeTypePrivileges extends AlterCompositeType
             stableId.role(this.grantee),
         ];
     }
-    serialize() {
+    serialize(_options) {
         const kindPrefix = getObjectKindPrefix("TYPE");
         const privSql = formatObjectPrivilegeList("TYPE", this.privilegeNames, this.version);
         const typeName = `${this.compositeType.schema}.${this.compositeType.name}`;

package/dist/core/objects/type/composite-type/changes/composite-type.types.d.ts

@@ -3,4 +3,5 @@ import type { CommentCompositeType } from "./composite-type.comment.ts";
 import type { CreateCompositeType } from "./composite-type.create.ts";
 import type { DropCompositeType } from "./composite-type.drop.ts";
 import type { CompositeTypePrivilege } from "./composite-type.privilege.ts";
+/** Union of all composite-type-related change variants (`objectType: "composite_type"`). @category Change Types */
 export type CompositeTypeChange = AlterCompositeType | CommentCompositeType | CreateCompositeType | DropCompositeType | CompositeTypePrivilege;

package/dist/core/objects/type/composite-type/composite-type.diff.d.ts

@@ -1,5 +1,4 @@
-import type { DefaultPrivilegeState } from "../../base.default-privileges.ts";
-import type { Role } from "../../role/role.model.ts";
+import type { ObjectDiffContext } from "../../diff-context.ts";
 import type { CompositeTypeChange } from "./changes/composite-type.types.ts";
 import type { CompositeType } from "./composite-type.model.ts";
 /**
@@ -10,9 +9,4 @@ import type { CompositeType } from "./composite-type.model.ts";
  * @param branch - The composite types in the branch catalog.
  * @returns A list of changes to apply to main to make it match branch.
  */
-export declare function diffCompositeTypes(ctx: {
-    version: number;
-    currentUser: string;
-    defaultPrivilegeState: DefaultPrivilegeState;
-    mainRoles: Record<string, Role>;
-}, main: Record<string, CompositeType>, branch: Record<string, CompositeType>): CompositeTypeChange[];
+export declare function diffCompositeTypes(ctx: Pick<ObjectDiffContext, "version" | "currentUser" | "defaultPrivilegeState">, main: Record<string, CompositeType>, branch: Record<string, CompositeType>): CompositeTypeChange[];

package/dist/core/objects/type/composite-type/composite-type.diff.js

@@ -1,5 +1,5 @@
 import { diffObjects } from "../../base.diff.js";
-import { diffPrivileges, filterPublicBuiltInDefaults, groupPrivilegesByGrantable, } from "../../base.privilege-diff.js";
+import { diffPrivileges, emitObjectPrivilegeChanges, filterPublicBuiltInDefaults, } from "../../base.privilege-diff.js";
 import { deepEqual, hasNonAlterableChanges } from "../../utils.js";
 import { AlterCompositeTypeAddAttribute, AlterCompositeTypeAlterAttributeType, AlterCompositeTypeChangeOwner, AlterCompositeTypeDropAttribute, } from "./changes/composite-type.alter.js";
 import { CreateCommentOnCompositeType, CreateCommentOnCompositeTypeAttribute, DropCommentOnCompositeType, DropCommentOnCompositeTypeAttribute, } from "./changes/composite-type.comment.js";
@@ -47,50 +47,21 @@ export function diffCompositeTypes(ctx, main, branch) {
         // 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, "composite_type", ct.schema ?? "");
+        const creatorFilteredDefaults = ct.owner !== ctx.currentUser
+            ? effectiveDefaults.filter((p) => p.grantee !== ctx.currentUser)
+            : effectiveDefaults;
         // 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("composite_type", ct.privileges);
         // Filter out owner privileges - owner always has ALL privileges implicitly
         // and shouldn't be compared. Use the composite type owner as the reference.
-        const privilegeResults = diffPrivileges(effectiveDefaults, desiredPrivileges, ct.owner);
-        // 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 GrantCompositeTypePrivileges({
-                        compositeType: ct,
-                        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 RevokeCompositeTypePrivileges({
-                        compositeType: ct,
-                        grantee,
-                        privileges: list,
-                        version: ctx.version,
-                    }));
-                }
-            }
-            // Generate revoke grant option changes
-            if (result.revokeGrantOption.length > 0) {
-                changes.push(new RevokeGrantOptionCompositeTypePrivileges({
-                    compositeType: ct,
-                    grantee,
-                    privilegeNames: result.revokeGrantOption,
-                    version: ctx.version,
-                }));
-            }
-        }
+        const privilegeResults = diffPrivileges(filterPublicBuiltInDefaults("composite_type", creatorFilteredDefaults), desiredPrivileges, ct.owner);
+        changes.push(...emitObjectPrivilegeChanges(privilegeResults, ct, ct, "compositeType", {
+            Grant: GrantCompositeTypePrivileges,
+            Revoke: RevokeCompositeTypePrivileges,
+            RevokeGrantOption: RevokeGrantOptionCompositeTypePrivileges,
+        }, ctx.version));
     }
     for (const compositeTypeId of dropped) {
         changes.push(new DropCompositeType({ compositeType: main[compositeTypeId] }));
@@ -203,44 +174,12 @@ export function diffCompositeTypes(ctx, main, branch) {
             const branchPrivilegesFiltered = filterPublicBuiltInDefaults("composite_type", branchCompositeType.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, branchCompositeType.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 GrantCompositeTypePrivileges({
-                            compositeType: branchCompositeType,
-                            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 RevokeCompositeTypePrivileges({
-                            compositeType: mainCompositeType,
-                            grantee,
-                            privileges: list,
-                            version: ctx.version,
-                        }));
-                    }
-                }
-                // Generate revoke grant option changes
-                if (result.revokeGrantOption.length > 0) {
-                    changes.push(new RevokeGrantOptionCompositeTypePrivileges({
-                        compositeType: mainCompositeType,
-                        grantee,
-                        privilegeNames: result.revokeGrantOption,
-                        version: ctx.version,
-                    }));
-                }
-            }
+            const privilegeResults = diffPrivileges(mainPrivilegesFiltered, branchPrivilegesFiltered, branchCompositeType.owner);
+            changes.push(...emitObjectPrivilegeChanges(privilegeResults, branchCompositeType, mainCompositeType, "compositeType", {
+                Grant: GrantCompositeTypePrivileges,
+                Revoke: RevokeCompositeTypePrivileges,
+                RevokeGrantOption: RevokeGrantOptionCompositeTypePrivileges,
+            }, ctx.version));
             // Note: Composite type renaming would also use ALTER TYPE ... RENAME TO ...
             // But since our CompositeType model uses 'name' as the identity field,
             // a name change would be handled as drop + create by diffObjects()