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

package/dist/core/objects/foreign-data-wrapper/server/changes/server.alter.js

@@ -1,5 +1,6 @@
 import { quoteLiteral } from "../../../base.change.js";
 import { stableId } from "../../../utils.js";
+import { redactOptionValue } from "../../sensitive-options.js";
 import { AlterServerChange } from "./server.base.js";
 /**
  * ALTER SERVER ... OWNER TO ...
@@ -16,7 +17,7 @@ export class AlterServerChangeOwner extends AlterServerChange {
     get requires() {
         return [this.server.stableId, stableId.role(this.owner)];
     }
-    serialize() {
+    serialize(_options) {
         return ["ALTER SERVER", this.server.name, "OWNER TO", this.owner].join(" ");
     }
 }
@@ -35,7 +36,7 @@ export class AlterServerSetVersion extends AlterServerChange {
     get requires() {
         return [this.server.stableId];
     }
-    serialize() {
+    serialize(_options) {
         if (this.version === null) {
             // PostgreSQL doesn't support removing version, but we'll handle it
             return ["ALTER SERVER", this.server.name, "VERSION", "''"].join(" ");
@@ -63,14 +64,16 @@ export class AlterServerSetOptions extends AlterServerChange {
     get requires() {
         return [this.server.stableId];
     }
-    serialize() {
+    serialize(_options) {
         const optionParts = [];
         for (const opt of this.options) {
             if (opt.action === "DROP") {
                 optionParts.push(`DROP ${opt.option}`);
             }
             else {
-                const value = opt.value !== undefined ? quoteLiteral(opt.value) : "''";
+                const value = opt.value !== undefined
+                    ? quoteLiteral(redactOptionValue(opt.option, opt.value))
+                    : "''";
                 optionParts.push(`${opt.action} ${opt.option} ${value}`);
             }
         }

package/dist/core/objects/foreign-data-wrapper/server/changes/server.comment.d.ts

@@ -1,3 +1,4 @@
+import type { SerializeOptions } from "../../../../integrations/serialize/serialize.types.ts";
 import type { Server } from "../server.model.ts";
 import { CreateServerChange, DropServerChange } from "./server.base.ts";
 /**
@@ -12,7 +13,7 @@ export declare class CreateCommentOnServer extends CreateServerChange {
     });
     get creates(): `comment:${string}`[];
     get requires(): `server:${string}`[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }
 export declare class DropCommentOnServer extends DropServerChange {
     readonly server: Server;
@@ -22,5 +23,5 @@ export declare class DropCommentOnServer extends DropServerChange {
     });
     get drops(): `comment:${string}`[];
     get requires(): (`comment:${string}` | `server:${string}`)[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }

package/dist/core/objects/foreign-data-wrapper/server/changes/server.comment.js

@@ -14,7 +14,7 @@ export class CreateCommentOnServer extends CreateServerChange {
     get requires() {
         return [this.server.stableId];
     }
-    serialize() {
+    serialize(_options) {
         return [
             "COMMENT ON SERVER",
             this.server.name,
@@ -37,7 +37,7 @@ export class DropCommentOnServer extends DropServerChange {
     get requires() {
         return [stableId.comment(this.server.stableId), this.server.stableId];
     }
-    serialize() {
+    serialize(_options) {
         return ["COMMENT ON SERVER", this.server.name, "IS NULL"].join(" ");
     }
 }

package/dist/core/objects/foreign-data-wrapper/server/changes/server.create.d.ts

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

package/dist/core/objects/foreign-data-wrapper/server/changes/server.create.js

@@ -1,5 +1,6 @@
 import { quoteLiteral } from "../../../base.change.js";
 import { stableId } from "../../../utils.js";
+import { redactOptionValue } from "../../sensitive-options.js";
 import { CreateServerChange } from "./server.base.js";
 /**
  * Create a server.
@@ -31,7 +32,7 @@ export class CreateServer extends CreateServerChange {
         dependencies.add(stableId.role(this.server.owner));
         return Array.from(dependencies);
     }
-    serialize() {
+    serialize(_options) {
         const parts = ["CREATE SERVER"];
         // Add server name
         parts.push(this.server.name);
@@ -49,9 +50,11 @@ export class CreateServer extends CreateServerChange {
         if (this.server.options && this.server.options.length > 0) {
             const optionPairs = [];
             for (let i = 0; i < this.server.options.length; i += 2) {
-                if (i + 1 < this.server.options.length) {
-                    optionPairs.push(`${this.server.options[i]} ${quoteLiteral(this.server.options[i + 1])}`);
-                }
+                const key = this.server.options[i];
+                const value = this.server.options[i + 1];
+                if (key === undefined || value === undefined)
+                    continue;
+                optionPairs.push(`${key} ${quoteLiteral(redactOptionValue(key, value))}`);
             }
             if (optionPairs.length > 0) {
                 parts.push(`OPTIONS (${optionPairs.join(", ")})`);

package/dist/core/objects/foreign-data-wrapper/server/changes/server.drop.d.ts

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

package/dist/core/objects/foreign-data-wrapper/server/changes/server.drop.js

@@ -22,7 +22,7 @@ export class DropServer extends DropServerChange {
     get requires() {
         return [this.server.stableId];
     }
-    serialize() {
+    serialize(_options) {
         return ["DROP SERVER", this.server.name].join(" ");
     }
 }

package/dist/core/objects/foreign-data-wrapper/server/changes/server.privilege.d.ts

@@ -1,3 +1,4 @@
+import type { SerializeOptions } from "../../../../integrations/serialize/serialize.types.ts";
 import type { Server } from "../server.model.ts";
 import { AlterServerChange } from "./server.base.ts";
 export type ServerPrivilege = GrantServerPrivileges | RevokeServerPrivileges | RevokeGrantOptionServerPrivileges;
@@ -34,7 +35,7 @@ export declare class GrantServerPrivileges extends AlterServerChange {
     });
     get creates(): `acl:${string}::grantee:${string}`[];
     get requires(): (`role:${string}` | `server:${string}`)[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }
 /**
  * Revoke privileges on a server.
@@ -71,7 +72,7 @@ export declare class RevokeServerPrivileges extends AlterServerChange {
     });
     get drops(): `acl:${string}::grantee:${string}`[];
     get requires(): (`acl:${string}::grantee:${string}` | `role:${string}` | `server:${string}`)[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }
 /**
  * Revoke grant option for privileges on a server.
@@ -93,5 +94,5 @@ export declare class RevokeGrantOptionServerPrivileges extends AlterServerChange
         version?: number;
     });
     get requires(): (`acl:${string}::grantee:${string}` | `role:${string}` | `server:${string}`)[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }

package/dist/core/objects/foreign-data-wrapper/server/changes/server.privilege.js

@@ -33,7 +33,7 @@ export class GrantServerPrivileges extends AlterServerChange {
     get requires() {
         return [this.server.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) {
@@ -83,7 +83,7 @@ export class RevokeServerPrivileges extends AlterServerChange {
             stableId.role(this.grantee),
         ];
     }
-    serialize() {
+    serialize(_options) {
         const list = this.privileges.map((p) => p.privilege);
         const privSql = formatObjectPrivilegeList("SERVER", list, this.version);
         return `REVOKE ${privSql} ON SERVER ${this.server.name} FROM ${this.grantee}`;
@@ -116,7 +116,7 @@ export class RevokeGrantOptionServerPrivileges extends AlterServerChange {
             stableId.role(this.grantee),
         ];
     }
-    serialize() {
+    serialize(_options) {
         const privSql = formatObjectPrivilegeList("SERVER", this.privilegeNames, this.version);
         return `REVOKE GRANT OPTION FOR ${privSql} ON SERVER ${this.server.name} FROM ${this.grantee}`;
     }

package/dist/core/objects/foreign-data-wrapper/server/changes/server.types.d.ts

@@ -3,4 +3,5 @@ import type { CommentServer } from "./server.comment.ts";
 import type { CreateServer } from "./server.create.ts";
 import type { DropServer } from "./server.drop.ts";
 import type { ServerPrivilege } from "./server.privilege.ts";
+/** Union of all server-related change variants (`objectType: "server"`). @category Change Types */
 export type ServerChange = AlterServer | CommentServer | CreateServer | DropServer | ServerPrivilege;

package/dist/core/objects/foreign-data-wrapper/server/server.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 { ServerChange } from "./changes/server.types.ts";
 import type { Server } from "./server.model.ts";
 /**
@@ -10,9 +9,4 @@ import type { Server } from "./server.model.ts";
  * @param branch - The servers in the branch catalog.
  * @returns A list of changes to apply to main to make it match branch.
  */
-export declare function diffServers(ctx: {
-    version: number;
-    currentUser: string;
-    defaultPrivilegeState: DefaultPrivilegeState;
-    mainRoles: Record<string, Role>;
-}, main: Record<string, Server>, branch: Record<string, Server>): ServerChange[];
+export declare function diffServers(ctx: Pick<ObjectDiffContext, "version" | "currentUser">, main: Record<string, Server>, branch: Record<string, Server>): ServerChange[];

package/dist/core/objects/foreign-data-wrapper/server/server.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 { AlterServerChangeOwner, AlterServerSetOptions, AlterServerSetVersion, } from "./changes/server.alter.js";
 import { CreateCommentOnServer, DropCommentOnServer, } from "./changes/server.comment.js";
 import { CreateServer } from "./changes/server.create.js";
@@ -33,44 +33,12 @@ export function diffServers(ctx, main, branch) {
         // PRIVILEGES: Servers don't have default privileges
         const effectiveDefaults = [];
         const desiredPrivileges = filterPublicBuiltInDefaults("server", createdServer.privileges);
-        const privilegeResults = diffPrivileges(effectiveDefaults, desiredPrivileges, createdServer.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 GrantServerPrivileges({
-                        server: createdServer,
-                        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 RevokeServerPrivileges({
-                        server: createdServer,
-                        grantee,
-                        privileges: list,
-                        version: ctx.version,
-                    }));
-                }
-            }
-            // Generate revoke grant option changes
-            if (result.revokeGrantOption.length > 0) {
-                changes.push(new RevokeGrantOptionServerPrivileges({
-                    server: createdServer,
-                    grantee,
-                    privilegeNames: result.revokeGrantOption,
-                    version: ctx.version,
-                }));
-            }
-        }
+        const privilegeResults = diffPrivileges(effectiveDefaults, desiredPrivileges, createdServer.owner);
+        changes.push(...emitObjectPrivilegeChanges(privilegeResults, createdServer, createdServer, "server", {
+            Grant: GrantServerPrivileges,
+            Revoke: RevokeServerPrivileges,
+            RevokeGrantOption: RevokeGrantOptionServerPrivileges,
+        }, ctx.version));
     }
     for (const serverId of dropped) {
         changes.push(new DropServer({ server: main[serverId] }));
@@ -121,44 +89,12 @@ export function diffServers(ctx, main, branch) {
         // PRIVILEGES
         const mainPrivilegesFiltered = filterPublicBuiltInDefaults("server", mainServer.privileges);
         const branchPrivilegesFiltered = filterPublicBuiltInDefaults("server", branchServer.privileges);
-        const privilegeResults = diffPrivileges(mainPrivilegesFiltered, branchPrivilegesFiltered, branchServer.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 GrantServerPrivileges({
-                        server: branchServer,
-                        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 RevokeServerPrivileges({
-                        server: mainServer,
-                        grantee,
-                        privileges: list,
-                        version: ctx.version,
-                    }));
-                }
-            }
-            // Generate revoke grant option changes
-            if (result.revokeGrantOption.length > 0) {
-                changes.push(new RevokeGrantOptionServerPrivileges({
-                    server: mainServer,
-                    grantee,
-                    privilegeNames: result.revokeGrantOption,
-                    version: ctx.version,
-                }));
-            }
-        }
+        const privilegeResults = diffPrivileges(mainPrivilegesFiltered, branchPrivilegesFiltered, branchServer.owner);
+        changes.push(...emitObjectPrivilegeChanges(privilegeResults, branchServer, mainServer, "server", {
+            Grant: GrantServerPrivileges,
+            Revoke: RevokeServerPrivileges,
+            RevokeGrantOption: RevokeGrantOptionServerPrivileges,
+        }, ctx.version));
         // Note: Server renaming would also use ALTER SERVER ... RENAME TO ...
         // But since our Server model uses 'name' as the identity field,
         // a name change would be handled as drop + create by diffObjects()

package/dist/core/objects/foreign-data-wrapper/server/server.model.d.ts

@@ -26,6 +26,8 @@ declare const serverPropsSchema: z.ZodObject<{
         grantable: z.ZodBoolean;
         columns: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodString>>>;
     }, z.z.core.$strip>>;
+    wrapper_handler: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+    wrapper_validator: z.ZodOptional<z.ZodNullable<z.ZodString>>;
 }, z.z.core.$strip>;
 type ServerPrivilegeProps = PrivilegeProps;
 export type ServerProps = z.infer<typeof serverPropsSchema>;
@@ -38,6 +40,8 @@ export declare class Server extends BasePgModel {
     readonly options: ServerProps["options"];
     readonly comment: ServerProps["comment"];
     readonly privileges: ServerPrivilegeProps[];
+    readonly wrapper_handler: ServerProps["wrapper_handler"];
+    readonly wrapper_validator: ServerProps["wrapper_validator"];
     constructor(props: ServerProps);
     get stableId(): `server:${string}`;
     get identityFields(): {
@@ -58,5 +62,15 @@ export declare class Server extends BasePgModel {
         }[];
     };
 }
+/**
+ * Extract `pg_foreign_server` rows into `Server` models.
+ *
+ * The returned models carry option values **verbatim** from
+ * `pg_foreign_server.srvoptions`, which means cleartext secrets like
+ * `password` are present in memory. Always route through
+ * `extractCatalog` (which calls `normalizeCatalog`) before emitting
+ * options to any output channel — see CLI-1467 and
+ * `packages/pg-delta/src/core/objects/foreign-data-wrapper/sensitive-options.ts`.
+ */
 export declare function extractServers(pool: Pool): Promise<Server[]>;
 export {};

package/dist/core/objects/foreign-data-wrapper/server/server.model.js

@@ -21,6 +21,9 @@ const serverPropsSchema = z.object({
     options: z.array(z.string()).nullable(),
     comment: z.string().nullable(),
     privileges: z.array(privilegePropsSchema),
+    // Parent FDW handler/validator — filter metadata only, not in dataFields.
+    wrapper_handler: z.string().nullable().optional(),
+    wrapper_validator: z.string().nullable().optional(),
 });
 export class Server extends BasePgModel {
     name;
@@ -31,6 +34,8 @@ export class Server extends BasePgModel {
     options;
     comment;
     privileges;
+    wrapper_handler;
+    wrapper_validator;
     constructor(props) {
         super();
         // Identity fields
@@ -43,6 +48,8 @@ export class Server extends BasePgModel {
         this.options = props.options;
         this.comment = props.comment;
         this.privileges = props.privileges;
+        this.wrapper_handler = props.wrapper_handler ?? null;
+        this.wrapper_validator = props.wrapper_validator ?? null;
     }
     get stableId() {
         return `server:${this.name}`;
@@ -64,6 +71,16 @@ export class Server extends BasePgModel {
         };
     }
 }
+/**
+ * Extract `pg_foreign_server` rows into `Server` models.
+ *
+ * The returned models carry option values **verbatim** from
+ * `pg_foreign_server.srvoptions`, which means cleartext secrets like
+ * `password` are present in memory. Always route through
+ * `extractCatalog` (which calls `normalizeCatalog`) before emitting
+ * options to any output channel — see CLI-1467 and
+ * `packages/pg-delta/src/core/objects/foreign-data-wrapper/sensitive-options.ts`.
+ */
 export async function extractServers(pool) {
     const { rows: serverRows } = await pool.query(sql `
       select
@@ -86,10 +103,20 @@ export async function extractServers(pool) {
             )
             from lateral aclexplode(srv.srvacl) as x(grantor, grantee, privilege_type, is_grantable)
           ), '[]'
-        ) as privileges
+        ) as privileges,
+        case
+          when fdw.fdwhandler = 0 then null
+          else p_handler.pronamespace::regnamespace::text || '.' || quote_ident(p_handler.proname)
+        end as wrapper_handler,
+        case
+          when fdw.fdwvalidator = 0 then null
+          else p_validator.pronamespace::regnamespace::text || '.' || quote_ident(p_validator.proname)
+        end as wrapper_validator
       from
         pg_catalog.pg_foreign_server srv
         inner join pg_catalog.pg_foreign_data_wrapper fdw on fdw.oid = srv.srvfdw
+        left join pg_catalog.pg_proc p_handler on p_handler.oid = fdw.fdwhandler
+        left join pg_catalog.pg_proc p_validator on p_validator.oid = fdw.fdwvalidator
       where
         not fdw.fdwname like any(array['pg\\_%'])
       order by

package/dist/core/objects/foreign-data-wrapper/user-mapping/changes/user-mapping.alter.d.ts

@@ -1,3 +1,4 @@
+import type { SerializeOptions } from "../../../../integrations/serialize/serialize.types.ts";
 import type { UserMapping } from "../user-mapping.model.ts";
 import { AlterUserMappingChange } from "./user-mapping.base.ts";
 /**
@@ -33,5 +34,5 @@ export declare class AlterUserMappingSetOptions extends AlterUserMappingChange {
         }>;
     });
     get requires(): `userMapping:${string}:${string}`[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }

package/dist/core/objects/foreign-data-wrapper/user-mapping/changes/user-mapping.alter.js

@@ -1,4 +1,5 @@
 import { quoteLiteral } from "../../../base.change.js";
+import { redactOptionValue } from "../../sensitive-options.js";
 import { AlterUserMappingChange } from "./user-mapping.base.js";
 /**
  * ALTER USER MAPPING ... OPTIONS ( ADD | SET | DROP ... )
@@ -15,14 +16,16 @@ export class AlterUserMappingSetOptions extends AlterUserMappingChange {
     get requires() {
         return [this.userMapping.stableId];
     }
-    serialize() {
+    serialize(_options) {
         const optionParts = [];
         for (const opt of this.options) {
             if (opt.action === "DROP") {
                 optionParts.push(`DROP ${opt.option}`);
             }
             else {
-                const value = opt.value !== undefined ? quoteLiteral(opt.value) : "''";
+                const value = opt.value !== undefined
+                    ? quoteLiteral(redactOptionValue(opt.option, opt.value))
+                    : "''";
                 optionParts.push(`${opt.action} ${opt.option} ${value}`);
             }
         }

package/dist/core/objects/foreign-data-wrapper/user-mapping/changes/user-mapping.create.d.ts

@@ -1,3 +1,4 @@
+import type { SerializeOptions } from "../../../../integrations/serialize/serialize.types.ts";
 import type { UserMapping } from "../user-mapping.model.ts";
 import { CreateUserMappingChange } from "./user-mapping.base.ts";
 /**
@@ -20,5 +21,5 @@ export declare class CreateUserMapping extends CreateUserMappingChange {
     });
     get creates(): `userMapping:${string}:${string}`[];
     get requires(): string[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }

package/dist/core/objects/foreign-data-wrapper/user-mapping/changes/user-mapping.create.js

@@ -1,5 +1,6 @@
 import { quoteLiteral } from "../../../base.change.js";
 import { stableId } from "../../../utils.js";
+import { redactOptionValue } from "../../sensitive-options.js";
 import { CreateUserMappingChange } from "./user-mapping.base.js";
 /**
  * Create a user mapping.
@@ -29,7 +30,7 @@ export class CreateUserMapping extends CreateUserMappingChange {
         dependencies.add(stableId.server(this.userMapping.server));
         return Array.from(dependencies);
     }
-    serialize() {
+    serialize(_options) {
         const parts = ["CREATE USER MAPPING FOR"];
         // Add user (can be CURRENT_USER, PUBLIC, etc.)
         parts.push(this.userMapping.user);
@@ -39,9 +40,11 @@ export class CreateUserMapping extends CreateUserMappingChange {
         if (this.userMapping.options && this.userMapping.options.length > 0) {
             const optionPairs = [];
             for (let i = 0; i < this.userMapping.options.length; i += 2) {
-                if (i + 1 < this.userMapping.options.length) {
-                    optionPairs.push(`${this.userMapping.options[i]} ${quoteLiteral(this.userMapping.options[i + 1])}`);
-                }
+                const key = this.userMapping.options[i];
+                const value = this.userMapping.options[i + 1];
+                if (key === undefined || value === undefined)
+                    continue;
+                optionPairs.push(`${key} ${quoteLiteral(redactOptionValue(key, value))}`);
             }
             if (optionPairs.length > 0) {
                 parts.push(`OPTIONS (${optionPairs.join(", ")})`);

package/dist/core/objects/foreign-data-wrapper/user-mapping/changes/user-mapping.drop.d.ts

@@ -1,3 +1,4 @@
+import type { SerializeOptions } from "../../../../integrations/serialize/serialize.types.ts";
 import type { UserMapping } from "../user-mapping.model.ts";
 import { DropUserMappingChange } from "./user-mapping.base.ts";
 /**
@@ -19,5 +20,5 @@ export declare class DropUserMapping extends DropUserMappingChange {
     });
     get drops(): `userMapping:${string}:${string}`[];
     get requires(): `userMapping:${string}:${string}`[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }

package/dist/core/objects/foreign-data-wrapper/user-mapping/changes/user-mapping.drop.js

@@ -23,7 +23,7 @@ export class DropUserMapping extends DropUserMappingChange {
     get requires() {
         return [this.userMapping.stableId];
     }
-    serialize() {
+    serialize(_options) {
         return [
             "DROP USER MAPPING FOR",
             this.userMapping.user,

package/dist/core/objects/foreign-data-wrapper/user-mapping/changes/user-mapping.types.d.ts

@@ -1,4 +1,5 @@
 import type { AlterUserMapping } from "./user-mapping.alter.ts";
 import type { CreateUserMapping } from "./user-mapping.create.ts";
 import type { DropUserMapping } from "./user-mapping.drop.ts";
+/** Union of all user-mapping-related change variants (`objectType: "user_mapping"`). @category Change Types */
 export type UserMappingChange = AlterUserMapping | CreateUserMapping | DropUserMapping;

package/dist/core/objects/foreign-data-wrapper/user-mapping/user-mapping.model.d.ts

@@ -16,12 +16,16 @@ declare const userMappingPropsSchema: z.ZodObject<{
     user: z.ZodString;
     server: z.ZodString;
     options: z.ZodNullable<z.ZodArray<z.ZodString>>;
+    wrapper_handler: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+    wrapper_validator: z.ZodOptional<z.ZodNullable<z.ZodString>>;
 }, z.z.core.$strip>;
 export type UserMappingProps = z.infer<typeof userMappingPropsSchema>;
 export declare class UserMapping extends BasePgModel {
     readonly user: UserMappingProps["user"];
     readonly server: UserMappingProps["server"];
     readonly options: UserMappingProps["options"];
+    readonly wrapper_handler: UserMappingProps["wrapper_handler"];
+    readonly wrapper_validator: UserMappingProps["wrapper_validator"];
     constructor(props: UserMappingProps);
     get stableId(): `userMapping:${string}:${string}`;
     get identityFields(): {
@@ -32,5 +36,15 @@ export declare class UserMapping extends BasePgModel {
         options: string[] | null;
     };
 }
+/**
+ * Extract `pg_user_mapping` rows into `UserMapping` models.
+ *
+ * The returned models carry option values **verbatim** from
+ * `pg_user_mapping.umoptions`, which means cleartext secrets like
+ * `password` are present in memory. Always route through
+ * `extractCatalog` (which calls `normalizeCatalog`) before emitting
+ * options to any output channel — see CLI-1467 and
+ * `packages/pg-delta/src/core/objects/foreign-data-wrapper/sensitive-options.ts`.
+ */
 export declare function extractUserMappings(pool: Pool): Promise<UserMapping[]>;
 export {};

package/dist/core/objects/foreign-data-wrapper/user-mapping/user-mapping.model.js

@@ -16,11 +16,16 @@ const userMappingPropsSchema = z.object({
     user: z.string(),
     server: z.string(),
     options: z.array(z.string()).nullable(),
+    // Parent FDW handler/validator — filter metadata only, not in dataFields.
+    wrapper_handler: z.string().nullable().optional(),
+    wrapper_validator: z.string().nullable().optional(),
 });
 export class UserMapping extends BasePgModel {
     user;
     server;
     options;
+    wrapper_handler;
+    wrapper_validator;
     constructor(props) {
         super();
         // Identity fields
@@ -28,6 +33,8 @@ export class UserMapping extends BasePgModel {
         this.server = props.server;
         // Data fields
         this.options = props.options;
+        this.wrapper_handler = props.wrapper_handler ?? null;
+        this.wrapper_validator = props.wrapper_validator ?? null;
     }
     get stableId() {
         return `userMapping:${this.server}:${this.user}`;
@@ -44,6 +51,16 @@ export class UserMapping extends BasePgModel {
         };
     }
 }
+/**
+ * Extract `pg_user_mapping` rows into `UserMapping` models.
+ *
+ * The returned models carry option values **verbatim** from
+ * `pg_user_mapping.umoptions`, which means cleartext secrets like
+ * `password` are present in memory. Always route through
+ * `extractCatalog` (which calls `normalizeCatalog`) before emitting
+ * options to any output channel — see CLI-1467 and
+ * `packages/pg-delta/src/core/objects/foreign-data-wrapper/sensitive-options.ts`.
+ */
 export async function extractUserMappings(pool) {
     const { rows: mappingRows } = await pool.query(sql `
       select
@@ -52,11 +69,21 @@ export async function extractUserMappings(pool) {
           else um.umuser::regrole::text
         end as user,
         quote_ident(srv.srvname) as server,
-        coalesce(um.umoptions, array[]::text[]) as options
+        coalesce(um.umoptions, array[]::text[]) as options,
+        case
+          when fdw.fdwhandler = 0 then null
+          else p_handler.pronamespace::regnamespace::text || '.' || quote_ident(p_handler.proname)
+        end as wrapper_handler,
+        case
+          when fdw.fdwvalidator = 0 then null
+          else p_validator.pronamespace::regnamespace::text || '.' || quote_ident(p_validator.proname)
+        end as wrapper_validator
       from
         pg_catalog.pg_user_mapping um
         inner join pg_catalog.pg_foreign_server srv on srv.oid = um.umserver
         inner join pg_catalog.pg_foreign_data_wrapper fdw on fdw.oid = srv.srvfdw
+        left join pg_catalog.pg_proc p_handler on p_handler.oid = fdw.fdwhandler
+        left join pg_catalog.pg_proc p_validator on p_validator.oid = fdw.fdwvalidator
       where
         not fdw.fdwname like any(array['pg\\_%'])
       order by