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

package/dist/core/objects/aggregate/aggregate.diff.d.ts

@@ -1,10 +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 { Aggregate } from "./aggregate.model.ts";
 import type { AggregateChange } from "./changes/aggregate.types.ts";
-export declare function diffAggregates(ctx: {
-    version: number;
-    currentUser: string;
-    defaultPrivilegeState: DefaultPrivilegeState;
-    mainRoles: Record<string, Role>;
-}, main: Record<string, Aggregate>, branch: Record<string, Aggregate>): AggregateChange[];
+export declare function diffAggregates(ctx: Pick<ObjectDiffContext, "version" | "currentUser" | "defaultPrivilegeState">, main: Record<string, Aggregate>, branch: Record<string, Aggregate>): AggregateChange[];

package/dist/core/objects/aggregate/aggregate.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 { AlterAggregateChangeOwner } from "./changes/aggregate.alter.js";
 import { CreateCommentOnAggregate, DropCommentOnAggregate, } from "./changes/aggregate.comment.js";
@@ -29,48 +29,21 @@ export function diffAggregates(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, "aggregate", aggregate.schema ?? "");
+        const creatorFilteredDefaults = aggregate.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
         const desiredPrivileges = filterPublicBuiltInDefaults("aggregate", aggregate.privileges);
         // Filter out owner privileges - owner always has ALL privileges implicitly
         // and shouldn't be compared. Use the aggregate owner as the reference.
-        const privilegeResults = diffPrivileges(effectiveDefaults, desiredPrivileges, aggregate.owner, ctx.mainRoles);
-        // Generate grant changes
-        for (const [grantee, result] of privilegeResults) {
-            if (result.grants.length > 0) {
-                const grantGroups = groupPrivilegesByGrantable(result.grants);
-                for (const [, list] of grantGroups) {
-                    changes.push(new GrantAggregatePrivileges({
-                        aggregate,
-                        grantee,
-                        privileges: list,
-                        version: ctx.version,
-                    }));
-                }
-            }
-            // Generate revoke changes
-            if (result.revokes.length > 0) {
-                const revokeGroups = groupPrivilegesByGrantable(result.revokes);
-                for (const [, list] of revokeGroups) {
-                    changes.push(new RevokeAggregatePrivileges({
-                        aggregate,
-                        grantee,
-                        privileges: list,
-                        version: ctx.version,
-                    }));
-                }
-            }
-            // Generate revoke grant option changes
-            if (result.revokeGrantOption.length > 0) {
-                changes.push(new RevokeGrantOptionAggregatePrivileges({
-                    aggregate,
-                    grantee,
-                    privilegeNames: result.revokeGrantOption,
-                    version: ctx.version,
-                }));
-            }
-        }
+        const privilegeResults = diffPrivileges(filterPublicBuiltInDefaults("aggregate", creatorFilteredDefaults), desiredPrivileges, aggregate.owner);
+        changes.push(...emitObjectPrivilegeChanges(privilegeResults, aggregate, aggregate, "aggregate", {
+            Grant: GrantAggregatePrivileges,
+            Revoke: RevokeAggregatePrivileges,
+            RevokeGrantOption: RevokeGrantOptionAggregatePrivileges,
+        }, ctx.version));
     }
     for (const aggregateId of dropped) {
         changes.push(new DropAggregate({ aggregate: main[aggregateId] }));
@@ -148,39 +121,12 @@ export function diffAggregates(ctx, main, branch) {
         const branchPrivilegesFiltered = filterPublicBuiltInDefaults("aggregate", branchAggregate.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, branchAggregate.owner, ctx.mainRoles);
-        for (const [grantee, result] of privilegeResults) {
-            if (result.grants.length > 0) {
-                const grantGroups = groupPrivilegesByGrantable(result.grants);
-                for (const [, list] of grantGroups) {
-                    changes.push(new GrantAggregatePrivileges({
-                        aggregate: branchAggregate,
-                        grantee,
-                        privileges: list,
-                        version: ctx.version,
-                    }));
-                }
-            }
-            if (result.revokes.length > 0) {
-                const revokeGroups = groupPrivilegesByGrantable(result.revokes);
-                for (const [, list] of revokeGroups) {
-                    changes.push(new RevokeAggregatePrivileges({
-                        aggregate: mainAggregate,
-                        grantee,
-                        privileges: list,
-                        version: ctx.version,
-                    }));
-                }
-            }
-            if (result.revokeGrantOption.length > 0) {
-                changes.push(new RevokeGrantOptionAggregatePrivileges({
-                    aggregate: mainAggregate,
-                    grantee,
-                    privilegeNames: result.revokeGrantOption,
-                    version: ctx.version,
-                }));
-            }
-        }
+        const privilegeResults = diffPrivileges(mainPrivilegesFiltered, branchPrivilegesFiltered, branchAggregate.owner);
+        changes.push(...emitObjectPrivilegeChanges(privilegeResults, branchAggregate, mainAggregate, "aggregate", {
+            Grant: GrantAggregatePrivileges,
+            Revoke: RevokeAggregatePrivileges,
+            RevokeGrantOption: RevokeGrantOptionAggregatePrivileges,
+        }, ctx.version));
     }
     return changes;
 }

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

@@ -1,4 +1,4 @@
-import type { Sql } from "postgres";
+import type { Pool } from "pg";
 import z from "zod";
 import { BasePgModel } from "../base.model.ts";
 import { type PrivilegeProps } from "../base.privilege-diff.ts";
@@ -16,9 +16,9 @@ declare const aggregatePropsSchema: z.ZodObject<{
     return_type: z.ZodString;
     return_type_schema: z.ZodNullable<z.ZodString>;
     parallel_safety: z.ZodEnum<{
-        r: "r";
         u: "u";
         s: "s";
+        r: "r";
     }>;
     is_strict: z.ZodBoolean;
     transition_function: z.ZodString;
@@ -28,8 +28,8 @@ declare const aggregatePropsSchema: z.ZodObject<{
     final_function: z.ZodNullable<z.ZodString>;
     final_function_extra_args: z.ZodBoolean;
     final_function_modify: z.ZodNullable<z.ZodEnum<{
-        r: "r";
         s: "s";
+        r: "r";
         w: "w";
     }>>;
     combine_function: z.ZodNullable<z.ZodString>;
@@ -44,8 +44,8 @@ declare const aggregatePropsSchema: z.ZodObject<{
     moving_final_function: z.ZodNullable<z.ZodString>;
     moving_final_function_extra_args: z.ZodBoolean;
     moving_final_function_modify: z.ZodNullable<z.ZodEnum<{
-        r: "r";
         s: "s";
+        r: "r";
         w: "w";
     }>>;
     moving_initial_condition: z.ZodNullable<z.ZodString>;
@@ -56,8 +56,8 @@ declare const aggregatePropsSchema: z.ZodObject<{
     argument_types: z.ZodNullable<z.ZodArray<z.ZodString>>;
     all_argument_types: z.ZodNullable<z.ZodArray<z.ZodString>>;
     argument_modes: z.ZodNullable<z.ZodArray<z.ZodEnum<{
-        o: "o";
         i: "i";
+        o: "o";
         b: "b";
         v: "v";
         t: "t";
@@ -129,7 +129,7 @@ export declare class Aggregate extends BasePgModel {
         num_direct_args: number;
         return_type: string;
         return_type_schema: string | null;
-        parallel_safety: "r" | "u" | "s";
+        parallel_safety: "u" | "s" | "r";
         is_strict: boolean;
         transition_function: string;
         state_data_type: string;
@@ -137,7 +137,7 @@ export declare class Aggregate extends BasePgModel {
         state_data_space: number;
         final_function: string | null;
         final_function_extra_args: boolean;
-        final_function_modify: "r" | "s" | "w" | null;
+        final_function_modify: "s" | "r" | "w" | null;
         combine_function: string | null;
         serial_function: string | null;
         deserial_function: string | null;
@@ -149,7 +149,7 @@ export declare class Aggregate extends BasePgModel {
         moving_state_data_space: number | null;
         moving_final_function: string | null;
         moving_final_function_extra_args: boolean;
-        moving_final_function_modify: "r" | "s" | "w" | null;
+        moving_final_function_modify: "s" | "r" | "w" | null;
         moving_initial_condition: string | null;
         sort_operator: string | null;
         argument_count: number;
@@ -157,7 +157,7 @@ export declare class Aggregate extends BasePgModel {
         argument_names: string[] | null;
         argument_types: string[] | null;
         all_argument_types: string[] | null;
-        argument_modes: ("o" | "i" | "b" | "v" | "t")[] | null;
+        argument_modes: ("i" | "o" | "b" | "v" | "t")[] | null;
         argument_defaults: string | null;
         identity_arguments: string;
         owner: string;
@@ -170,5 +170,5 @@ export declare class Aggregate extends BasePgModel {
         }[];
     };
 }
-export declare function extractAggregates(sql: Sql): Promise<Aggregate[]>;
+export declare function extractAggregates(pool: Pool): Promise<Aggregate[]>;
 export {};

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

@@ -1,3 +1,4 @@
+import { sql } from "@ts-safeql/sql-tag";
 import z from "zod";
 import { BasePgModel } from "../base.model.js";
 import { privilegePropsSchema, } from "../base.privilege-diff.js";
@@ -208,10 +209,8 @@ export class Aggregate extends BasePgModel {
         };
     }
 }
-export async function extractAggregates(sql) {
-    return sql.begin(async (sql) => {
-        await sql `set search_path = ''`;
-        const aggregateRows = await sql `
+export async function extractAggregates(pool) {
+    const { rows: aggregateRows } = await pool.query(sql `
 with extension_oids as (
   select
     objid
@@ -274,7 +273,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
@@ -289,9 +288,8 @@ where
   and not p.pronamespace::regnamespace::text like any(array['pg\\_%', 'information\\_schema'])
   and e.objid is null
 order by
-  1, 2, 3;
-    `;
-        const validatedRows = aggregateRows.map((row) => aggregatePropsSchema.parse(row));
-        return validatedRows.map((row) => new Aggregate(row));
-    });
+  1, 2, 3
+  `);
+    const validatedRows = aggregateRows.map((row) => aggregatePropsSchema.parse(row));
+    return validatedRows.map((row) => new Aggregate(row));
 }

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

@@ -183,7 +183,7 @@ export class CreateAggregate extends CreateAggregateChange {
             clauses.push(`SORTOP = ${formatOperator(this.aggregate.sort_operator)}`);
         }
         if (this.aggregate.parallel_safety !== "u") {
-            clauses.push(`PARALLEL ${formatParallel(this.aggregate.parallel_safety)}`);
+            clauses.push(`PARALLEL = ${formatParallel(this.aggregate.parallel_safety)}`);
         }
         if (this.aggregate.is_strict) {
             clauses.push("STRICT");

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

@@ -20,7 +20,7 @@ export class DropAggregate extends DropAggregateChange {
     serialize() {
         const signature = this.aggregate.identityArguments;
         const qualifiedName = `${this.aggregate.schema}.${this.aggregate.name}`;
-        const withArgs = signature.length > 0 ? `(${signature})` : "()";
+        const withArgs = signature.length > 0 ? `(${signature})` : "(*)";
         return `DROP AGGREGATE ${qualifiedName}${withArgs}`;
     }
 }

package/dist/core/objects/base.privilege-diff.d.ts

@@ -1,6 +1,6 @@
 import z from "zod";
 import type { Change } from "../change.types.ts";
-import type { Role } from "./role/role.model.ts";
+import type { BaseChange } from "./base.change.ts";
 /**
  * Privilege properties that all privilege objects share.
  */
@@ -19,17 +19,6 @@ interface PrivilegeDiffResult<T extends PrivilegeProps> {
     revokes: T[];
     revokeGrantOption: string[];
 }
-/**
- * Groups privileges by grantable flag for efficient SQL generation
- */
-export declare function groupPrivilegesByGrantable<T extends PrivilegeProps>(privileges: T[]): Map<boolean, T[]>;
-/**
- * Groups privileges by columns and grantable flag
- */
-export declare function groupPrivilegesByColumns<T extends PrivilegeProps>(privileges: T[]): Map<string, {
-    columns?: string[];
-    byGrant: Map<boolean, Set<string>>;
-}>;
 /**
  * Filters out PUBLIC's built-in default privileges that PostgreSQL automatically grants
  * when creating certain object types. This prevents generating unnecessary GRANT statements
@@ -50,5 +39,41 @@ export declare function filterPublicBuiltInDefaults<T extends PrivilegeProps>(ob
 /**
  * Generic privilege diffing function that works for any object type
  */
-export declare function diffPrivileges<T extends PrivilegeProps>(mainPrivileges: T[], branchPrivileges: T[], owner?: string, mainRoles?: Record<string, Role>): Map<string, PrivilegeDiffResult<T>>;
+export declare function diffPrivileges<T extends PrivilegeProps>(mainPrivileges: T[], branchPrivileges: T[], owner?: string): Map<string, PrivilegeDiffResult<T>>;
+/**
+ * Factory constructors for Grant / Revoke / RevokeGrantOption change classes.
+ * Every object type provides its own concrete classes.  The `any` props type
+ * is intentional: the helpers build props with a computed `[objectKey]` key
+ * whose name varies per object type, so no single concrete type can unify
+ * all call sites without an unsafe cast elsewhere.
+ */
+interface PrivilegeChangeFactories {
+    Grant: new (props: any) => BaseChange;
+    Revoke: new (props: any) => BaseChange;
+    RevokeGrantOption: new (props: any) => BaseChange;
+}
+/**
+ * Emit privilege changes for object-level privileges (schema, sequence,
+ * procedure, etc.).
+ *
+ * For each grantee in `privilegeResults` the function groups grants and revokes
+ * by the `grantable` flag and pushes one change per group.  Revoke-grant-option
+ * entries produce a single change carrying `privilegeNames`.
+ *
+ * `grantTarget` is the *branch* object (the desired state) while `revokeTarget`
+ * is the *main* object (the current state), so that GRANTs reference the
+ * newly-created/altered object and REVOKEs reference the existing one.
+ */
+export declare function emitObjectPrivilegeChanges(privilegeResults: Map<string, PrivilegeDiffResult<PrivilegeProps>>, grantTarget: unknown, revokeTarget: unknown, objectKey: string, factories: PrivilegeChangeFactories, version?: number): BaseChange[];
+/**
+ * Emit privilege changes for column-level privileges (table, view,
+ * materialized view).
+ *
+ * Like {@link emitObjectPrivilegeChanges} but groups by column set (via
+ * `groupPrivilegesByColumns`) instead of only by grantable.  For
+ * revoke-grant-option the column sets come from `sourcePrivileges` so that
+ * `REVOKE GRANT OPTION FOR` is emitted per column set that originally carried
+ * the privilege.
+ */
+export declare function emitColumnPrivilegeChanges(privilegeResults: Map<string, PrivilegeDiffResult<PrivilegeProps>>, grantTarget: unknown, revokeTarget: unknown, objectKey: string, factories: PrivilegeChangeFactories, sourcePrivileges: PrivilegeProps[], version?: number): BaseChange[];
 export {};

package/dist/core/objects/base.privilege-diff.js

@@ -1,5 +1,4 @@
 import z from "zod";
-import { stableId } from "./utils.js";
 /**
  * Privilege properties that all privilege objects share.
  */
@@ -81,7 +80,7 @@ function checkStillHasBase(targetPrivs, privilege, key) {
 /**
  * Groups privileges by grantable flag for efficient SQL generation
  */
-export function groupPrivilegesByGrantable(privileges) {
+function groupPrivilegesByGrantable(privileges) {
     const groups = new Map();
     for (const privilege of privileges) {
         const arr = groups.get(privilege.grantable) ?? [];
@@ -93,7 +92,7 @@ export function groupPrivilegesByGrantable(privileges) {
 /**
  * Groups privileges by columns and grantable flag
  */
-export function groupPrivilegesByColumns(privileges) {
+function groupPrivilegesByColumns(privileges) {
     const groups = new Map();
     for (const privilege of privileges) {
         const key = privilege.columns ? privilege.columns.sort().join(",") : "";
@@ -171,33 +170,17 @@ export function filterPublicBuiltInDefaults(objectType, privileges) {
 function filterOwnerPrivileges(privileges, owner) {
     return privileges.filter((p) => p.grantee !== owner);
 }
-/**
- * Filter out privileges for superuser roles, as PostgreSQL doesn't store
- * GRANTs to superusers in relacl (they already have all privileges implicitly).
- * Reference: https://www.postgresql.org/docs/current/role-attributes.html
- */
-function filterSuperuserPrivileges(privileges, mainRoles) {
-    if (!mainRoles)
-        return privileges;
-    return privileges.filter((priv) => {
-        const role = mainRoles[stableId.role(priv.grantee)];
-        return !role?.is_superuser;
-    });
-}
 /**
  * Generic privilege diffing function that works for any object type
  */
-export function diffPrivileges(mainPrivileges, branchPrivileges, owner, mainRoles) {
-    // Filter out superuser privileges from branch - PostgreSQL doesn't store GRANTs
-    // to superusers in relacl because they already have all privileges implicitly
-    const branchPrivilegesFiltered = filterSuperuserPrivileges(branchPrivileges, mainRoles);
+export function diffPrivileges(mainPrivileges, branchPrivileges, owner) {
     // Filter out owner privileges if owner is provided
     const mainFiltered = owner
         ? filterOwnerPrivileges(mainPrivileges, owner)
         : mainPrivileges;
     const branchFiltered = owner
-        ? filterOwnerPrivileges(branchPrivilegesFiltered, owner)
-        : branchPrivilegesFiltered;
+        ? filterOwnerPrivileges(branchPrivileges, owner)
+        : branchPrivileges;
     const mainByGrantee = groupPrivilegesByGrantee(mainFiltered);
     const branchByGrantee = groupPrivilegesByGrantee(branchFiltered);
     // Get all grantees
@@ -214,3 +197,102 @@ export function diffPrivileges(mainPrivileges, branchPrivileges, owner, mainRole
     }
     return results;
 }
+/**
+ * Emit privilege changes for object-level privileges (schema, sequence,
+ * procedure, etc.).
+ *
+ * For each grantee in `privilegeResults` the function groups grants and revokes
+ * by the `grantable` flag and pushes one change per group.  Revoke-grant-option
+ * entries produce a single change carrying `privilegeNames`.
+ *
+ * `grantTarget` is the *branch* object (the desired state) while `revokeTarget`
+ * is the *main* object (the current state), so that GRANTs reference the
+ * newly-created/altered object and REVOKEs reference the existing one.
+ */
+export function emitObjectPrivilegeChanges(privilegeResults, grantTarget, revokeTarget, objectKey, factories, version) {
+    const changes = [];
+    for (const [grantee, result] of privilegeResults) {
+        for (const [, revokes] of groupPrivilegesByGrantable(result.revokes)) {
+            changes.push(new factories.Revoke({
+                [objectKey]: revokeTarget,
+                privileges: revokes,
+                grantee,
+                version,
+            }));
+        }
+        if (result.revokeGrantOption.length > 0) {
+            changes.push(new factories.RevokeGrantOption({
+                [objectKey]: revokeTarget,
+                privilegeNames: result.revokeGrantOption,
+                grantee,
+                version,
+            }));
+        }
+        for (const [, grants] of groupPrivilegesByGrantable(result.grants)) {
+            changes.push(new factories.Grant({
+                [objectKey]: grantTarget,
+                privileges: grants,
+                grantee,
+                version,
+            }));
+        }
+    }
+    return changes;
+}
+/**
+ * Emit privilege changes for column-level privileges (table, view,
+ * materialized view).
+ *
+ * Like {@link emitObjectPrivilegeChanges} but groups by column set (via
+ * `groupPrivilegesByColumns`) instead of only by grantable.  For
+ * revoke-grant-option the column sets come from `sourcePrivileges` so that
+ * `REVOKE GRANT OPTION FOR` is emitted per column set that originally carried
+ * the privilege.
+ */
+export function emitColumnPrivilegeChanges(privilegeResults, grantTarget, revokeTarget, objectKey, factories, sourcePrivileges, version) {
+    const changes = [];
+    for (const [grantee, result] of privilegeResults) {
+        for (const [, group] of groupPrivilegesByColumns(result.revokes)) {
+            const allPrivileges = new Set();
+            for (const [, privSet] of group.byGrant) {
+                for (const priv of privSet) {
+                    allPrivileges.add(priv);
+                }
+            }
+            changes.push(new factories.Revoke({
+                [objectKey]: revokeTarget,
+                privileges: [...allPrivileges].map((p) => ({
+                    privilege: p,
+                    grantable: false,
+                })),
+                grantee,
+                columns: group.columns,
+                version,
+            }));
+        }
+        if (result.revokeGrantOption.length > 0) {
+            const sourcePrivsForGrantee = sourcePrivileges.filter((p) => p.grantee === grantee);
+            for (const [, group] of groupPrivilegesByColumns(sourcePrivsForGrantee.filter((p) => result.revokeGrantOption.includes(p.privilege)))) {
+                changes.push(new factories.RevokeGrantOption({
+                    [objectKey]: revokeTarget,
+                    privilegeNames: result.revokeGrantOption,
+                    grantee,
+                    columns: group.columns,
+                    version,
+                }));
+            }
+        }
+        for (const [, group] of groupPrivilegesByColumns(result.grants)) {
+            for (const [grantable, privSet] of group.byGrant) {
+                changes.push(new factories.Grant({
+                    [objectKey]: grantTarget,
+                    privileges: [...privSet].map((p) => ({ privilege: p, grantable })),
+                    grantee,
+                    columns: group.columns,
+                    version,
+                }));
+            }
+        }
+    }
+    return changes;
+}

package/dist/core/objects/base.privilege.d.ts

@@ -24,4 +24,5 @@ export declare function normalizePrivileges(privileges: PrivilegeProps[]): {
     grantee: string;
     privilege: string;
     grantable: boolean;
+    columns: string[] | null | undefined;
 }[];

package/dist/core/objects/base.privilege.js

@@ -149,7 +149,7 @@ export function getObjectKindPrefix(objectKind) {
         case "TYPE":
             return "ON TYPE";
         case "FOREIGN TABLE":
-            return "ON FOREIGN TABLE";
+            return "ON TABLE";
         default:
             return "ON";
     }
@@ -160,10 +160,17 @@ export function normalizePrivileges(privileges) {
         grantee: privilege.grantee,
         privilege: privilege.privilege,
         grantable: privilege.grantable,
+        columns: privilege.columns
+            ? [...privilege.columns].sort()
+            : privilege.columns,
     }))
         .sort((a, b) => {
         if (a.grantee !== b.grantee)
             return a.grantee.localeCompare(b.grantee);
-        return a.privilege.localeCompare(b.privilege);
+        if (a.privilege !== b.privilege)
+            return a.privilege.localeCompare(b.privilege);
+        const colA = a.columns?.join(",") ?? "";
+        const colB = b.columns?.join(",") ?? "";
+        return colA.localeCompare(colB);
     });
 }

package/dist/core/objects/collation/collation.diff.d.ts

@@ -1,3 +1,4 @@
+import type { ObjectDiffContext } from "../diff-context.ts";
 import type { CollationChange } from "./changes/collation.types.ts";
 import type { Collation } from "./collation.model.ts";
 /**
@@ -8,6 +9,4 @@ import type { Collation } from "./collation.model.ts";
  * @param branch - The collations in the branch catalog.
  * @returns A list of changes to apply to main to make it match branch.
  */
-export declare function diffCollations(ctx: {
-    currentUser: string;
-}, main: Record<string, Collation>, branch: Record<string, Collation>): CollationChange[];
+export declare function diffCollations(ctx: Pick<ObjectDiffContext, "currentUser">, main: Record<string, Collation>, branch: Record<string, Collation>): CollationChange[];

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

@@ -1,4 +1,4 @@
-import type { Sql } from "postgres";
+import type { Pool } from "pg";
 import z from "zod";
 import { BasePgModel } from "../base.model.ts";
 /**
@@ -63,5 +63,5 @@ export declare class Collation extends BasePgModel {
         comment: string | null;
     };
 }
-export declare function extractCollations(sql: Sql): Promise<Collation[]>;
+export declare function extractCollations(pool: Pool): Promise<Collation[]>;
 export {};

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

@@ -1,3 +1,4 @@
+import { sql } from "@ts-safeql/sql-tag";
 import z from "zod";
 import { extractVersion } from "../../context.js";
 import { BasePgModel } from "../base.model.js";
@@ -88,15 +89,13 @@ export class Collation extends BasePgModel {
         };
     }
 }
-export async function extractCollations(sql) {
-    return sql.begin(async (sql) => {
-        await sql `set search_path = ''`;
-        const version = await extractVersion(sql);
-        const isPostgres17OrGreater = version >= 170000;
-        const isPostgres16OrGreater = version >= 160000;
-        let collations;
-        if (isPostgres17OrGreater) {
-            collations = await sql `
+export async function extractCollations(pool) {
+    const version = await extractVersion(pool);
+    const isPostgres17OrGreater = version >= 170000;
+    const isPostgres16OrGreater = version >= 160000;
+    let collationRows;
+    if (isPostgres17OrGreater) {
+        const result = await pool.query(sql `
       with extension_oids as (
         select
           objid
@@ -125,12 +124,13 @@ export async function extractCollations(sql) {
         where not c.collnamespace::regnamespace::text like any(array['pg\\_%', 'information\\_schema'])
         and e.objid is null
       order by
-        1, 2;
-  `;
-        }
-        else if (isPostgres16OrGreater) {
-            // On postgres 16 there colllocale column was named colliculocale
-            collations = await sql `
+        1, 2
+    `);
+        collationRows = result.rows;
+    }
+    else if (isPostgres16OrGreater) {
+        // On postgres 16 there colllocale column was named colliculocale
+        const result = await pool.query(sql `
       with extension_oids as (
         select
           objid
@@ -161,12 +161,13 @@ export async function extractCollations(sql) {
         and e.objid is null
         -- </EXCLUDE_INTERNAL>
       order by
-        1, 2;
-    `;
-        }
-        else {
-            // On postgres 15 icu_rules does not exist
-            collations = await sql `
+        1, 2
+    `);
+        collationRows = result.rows;
+    }
+    else {
+        // On postgres 15 icu_rules does not exist
+        const result = await pool.query(sql `
       with extension_oids as (
         select
           objid
@@ -197,11 +198,11 @@ export async function extractCollations(sql) {
         and e.objid is null
         -- </EXCLUDE_INTERNAL>
       order by
-        1, 2;
-    `;
-        }
-        // Validate and parse each row using the Zod schema
-        const validatedRows = collations.map((row) => collationPropsSchema.parse(row));
-        return validatedRows.map((row) => new Collation(row));
-    });
+        1, 2
+    `);
+        collationRows = result.rows;
+    }
+    // Validate and parse each row using the Zod schema
+    const validatedRows = collationRows.map((row) => collationPropsSchema.parse(row));
+    return validatedRows.map((row) => new Collation(row));
 }