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

package/dist/core/objects/event-trigger/changes/event-trigger.security-label.js

@@ -0,0 +1,61 @@
+import { quoteLiteral } from "../../base.change.js";
+import { stableId } from "../../utils.js";
+import { CreateEventTriggerChange, DropEventTriggerChange, } from "./event-trigger.base.js";
+export class CreateSecurityLabelOnEventTrigger extends CreateEventTriggerChange {
+    eventTrigger;
+    securityLabel;
+    scope = "security_label";
+    constructor(props) {
+        super();
+        this.eventTrigger = props.eventTrigger;
+        this.securityLabel = props.securityLabel;
+    }
+    get creates() {
+        return [
+            stableId.securityLabel(this.eventTrigger.stableId, this.securityLabel.provider),
+        ];
+    }
+    get requires() {
+        return [this.eventTrigger.stableId];
+    }
+    serialize() {
+        return [
+            "SECURITY LABEL FOR",
+            this.securityLabel.provider,
+            "ON EVENT TRIGGER",
+            this.eventTrigger.name,
+            "IS",
+            quoteLiteral(this.securityLabel.label),
+        ].join(" ");
+    }
+}
+export class DropSecurityLabelOnEventTrigger extends DropEventTriggerChange {
+    eventTrigger;
+    securityLabel;
+    scope = "security_label";
+    constructor(props) {
+        super();
+        this.eventTrigger = props.eventTrigger;
+        this.securityLabel = props.securityLabel;
+    }
+    get drops() {
+        return [
+            stableId.securityLabel(this.eventTrigger.stableId, this.securityLabel.provider),
+        ];
+    }
+    get requires() {
+        return [
+            stableId.securityLabel(this.eventTrigger.stableId, this.securityLabel.provider),
+            this.eventTrigger.stableId,
+        ];
+    }
+    serialize() {
+        return [
+            "SECURITY LABEL FOR",
+            this.securityLabel.provider,
+            "ON EVENT TRIGGER",
+            this.eventTrigger.name,
+            "IS NULL",
+        ].join(" ");
+    }
+}

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

@@ -2,4 +2,6 @@ import type { AlterEventTrigger } from "./event-trigger.alter.ts";
 import type { CommentEventTrigger } from "./event-trigger.comment.ts";
 import type { CreateEventTrigger } from "./event-trigger.create.ts";
 import type { DropEventTrigger } from "./event-trigger.drop.ts";
-export type EventTriggerChange = AlterEventTrigger | CommentEventTrigger | CreateEventTrigger | DropEventTrigger;
+import type { SecurityLabelEventTrigger } from "./event-trigger.security-label.ts";
+/** Union of all event-trigger-related change variants (`objectType: "event_trigger"`). @category Change Types */
+export type EventTriggerChange = AlterEventTrigger | CommentEventTrigger | CreateEventTrigger | DropEventTrigger | SecurityLabelEventTrigger;

package/dist/core/objects/event-trigger/event-trigger.diff.d.ts

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

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

@@ -1,9 +1,11 @@
 import { diffObjects } from "../base.diff.js";
+import { diffSecurityLabels } from "../security-label.types.js";
 import { deepEqual, hasNonAlterableChanges } from "../utils.js";
 import { AlterEventTriggerChangeOwner, AlterEventTriggerSetEnabled, } from "./changes/event-trigger.alter.js";
 import { CreateCommentOnEventTrigger, DropCommentOnEventTrigger, } from "./changes/event-trigger.comment.js";
 import { CreateEventTrigger } from "./changes/event-trigger.create.js";
 import { DropEventTrigger } from "./changes/event-trigger.drop.js";
+import { CreateSecurityLabelOnEventTrigger, DropSecurityLabelOnEventTrigger, } from "./changes/event-trigger.security-label.js";
 /**
  * Diff two sets of event triggers from main and branch catalogs.
  *
@@ -29,6 +31,12 @@ export function diffEventTriggers(ctx, main, branch) {
         if (eventTrigger.comment !== null) {
             changes.push(new CreateCommentOnEventTrigger({ eventTrigger }));
         }
+        for (const label of eventTrigger.security_labels) {
+            changes.push(new CreateSecurityLabelOnEventTrigger({
+                eventTrigger,
+                securityLabel: label,
+            }));
+        }
     }
     for (const eventTriggerId of dropped) {
         changes.push(new DropEventTrigger({ eventTrigger: main[eventTriggerId] }));
@@ -76,6 +84,14 @@ export function diffEventTriggers(ctx, main, branch) {
                 }));
             }
         }
+        // SECURITY LABELS
+        changes.push(...diffSecurityLabels(mainEventTrigger.security_labels, branchEventTrigger.security_labels, (securityLabel) => new CreateSecurityLabelOnEventTrigger({
+            eventTrigger: branchEventTrigger,
+            securityLabel,
+        }), (securityLabel) => new DropSecurityLabelOnEventTrigger({
+            eventTrigger: mainEventTrigger,
+            securityLabel,
+        })));
     }
     return changes;
 }

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

@@ -1,6 +1,7 @@
 import type { Pool } from "pg";
 import z from "zod";
 import { BasePgModel } from "../base.model.ts";
+import { type SecurityLabelProps } from "../security-label.types.ts";
 declare const eventTriggerPropsSchema: z.ZodObject<{
     name: z.ZodString;
     event: z.ZodString;
@@ -15,6 +16,10 @@ declare const eventTriggerPropsSchema: z.ZodObject<{
     tags: z.ZodNullable<z.ZodArray<z.ZodString>>;
     owner: z.ZodString;
     comment: z.ZodNullable<z.ZodString>;
+    security_labels: z.ZodOptional<z.ZodDefault<z.ZodArray<z.ZodObject<{
+        provider: z.ZodString;
+        label: z.ZodString;
+    }, z.z.core.$strip>>>>;
 }, z.z.core.$strip>;
 export type EventTriggerProps = z.infer<typeof eventTriggerPropsSchema>;
 export declare class EventTrigger extends BasePgModel {
@@ -26,6 +31,7 @@ export declare class EventTrigger extends BasePgModel {
     readonly tags: EventTriggerProps["tags"];
     readonly owner: EventTriggerProps["owner"];
     readonly comment: EventTriggerProps["comment"];
+    readonly security_labels: SecurityLabelProps[];
     constructor(props: EventTriggerProps);
     get stableId(): `eventTrigger:${string}`;
     get identityFields(): {
@@ -39,6 +45,10 @@ export declare class EventTrigger extends BasePgModel {
         tags: string[] | null;
         owner: string;
         comment: string | null;
+        security_labels: {
+            provider: string;
+            label: string;
+        }[];
     };
 }
 export declare function extractEventTriggers(pool: Pool): Promise<EventTrigger[]>;

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

@@ -1,6 +1,7 @@
 import { sql } from "@ts-safeql/sql-tag";
 import z from "zod";
 import { BasePgModel } from "../base.model.js";
+import { securityLabelPropsSchema, } from "../security-label.types.js";
 const EventTriggerEnabledSchema = z.enum([
     "O", // ORIGIN - trigger fires in origin mode
     "D", // DISABLED - trigger does not fire
@@ -16,6 +17,7 @@ const eventTriggerPropsSchema = z.object({
     tags: z.array(z.string()).nullable(),
     owner: z.string(),
     comment: z.string().nullable(),
+    security_labels: z.array(securityLabelPropsSchema).default([]).optional(),
 });
 export class EventTrigger extends BasePgModel {
     name;
@@ -26,6 +28,7 @@ export class EventTrigger extends BasePgModel {
     tags;
     owner;
     comment;
+    security_labels;
     constructor(props) {
         super();
         // Identity fields
@@ -38,6 +41,7 @@ export class EventTrigger extends BasePgModel {
         this.tags = props.tags;
         this.owner = props.owner;
         this.comment = props.comment;
+        this.security_labels = props.security_labels ?? [];
     }
     get stableId() {
         return `eventTrigger:${this.name}`;
@@ -56,6 +60,7 @@ export class EventTrigger extends BasePgModel {
             tags: this.tags,
             owner: this.owner,
             comment: this.comment,
+            security_labels: this.security_labels,
         };
     }
 }
@@ -75,7 +80,20 @@ select
   et.evtenabled as enabled,
   et.evttags as tags,
   et.evtowner::regrole::text as owner,
-  obj_description(et.oid, 'pg_event_trigger') as comment
+  obj_description(et.oid, 'pg_event_trigger') as comment,
+  coalesce(
+    (
+      select json_agg(
+        json_build_object('provider', sl.provider, 'label', sl.label)
+        order by sl.provider
+      )
+      from pg_catalog.pg_seclabel sl
+      where sl.objoid = et.oid
+        and sl.classoid = 'pg_event_trigger'::regclass
+        and sl.objsubid = 0
+    ),
+    '[]'::json
+  ) as security_labels
 from pg_catalog.pg_event_trigger et
 join pg_catalog.pg_proc p on p.oid = et.evtfoid
 left join extension_oids e on e.objid = et.oid

package/dist/core/objects/extension/changes/extension.alter.d.ts

@@ -1,3 +1,4 @@
+import type { SerializeOptions } from "../../../integrations/serialize/serialize.types.ts";
 import type { Extension } from "../extension.model.ts";
 import { AlterExtensionChange } from "./extension.base.ts";
 /**
@@ -26,7 +27,7 @@ export declare class AlterExtensionUpdateVersion extends AlterExtensionChange {
         version: string;
     });
     get requires(): `extension:${string}`[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }
 /**
  * ALTER EXTENSION ... SET SCHEMA ...
@@ -40,5 +41,5 @@ export declare class AlterExtensionSetSchema extends AlterExtensionChange {
         schema: string;
     });
     get requires(): (`schema:${string}` | `extension:${string}`)[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }

package/dist/core/objects/extension/changes/extension.alter.js

@@ -16,7 +16,7 @@ export class AlterExtensionUpdateVersion extends AlterExtensionChange {
     get requires() {
         return [this.extension.stableId];
     }
-    serialize() {
+    serialize(_options) {
         return [
             "ALTER EXTENSION",
             this.extension.name,
@@ -40,7 +40,7 @@ export class AlterExtensionSetSchema extends AlterExtensionChange {
     get requires() {
         return [this.extension.stableId, stableId.schema(this.schema)];
     }
-    serialize() {
+    serialize(_options) {
         return [
             "ALTER EXTENSION",
             this.extension.name,

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

@@ -1,3 +1,4 @@
+import type { SerializeOptions } from "../../../integrations/serialize/serialize.types.ts";
 import type { Extension } from "../extension.model.ts";
 import { CreateExtensionChange, DropExtensionChange } from "./extension.base.ts";
 export type CommentExtension = CreateCommentOnExtension | DropCommentOnExtension;
@@ -12,7 +13,7 @@ export declare class CreateCommentOnExtension extends CreateExtensionChange {
     });
     get creates(): `comment:${string}`[];
     get requires(): `extension:${string}`[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }
 export declare class DropCommentOnExtension extends DropExtensionChange {
     readonly extension: Extension;
@@ -22,5 +23,5 @@ export declare class DropCommentOnExtension extends DropExtensionChange {
     });
     get drops(): `comment:${string}`[];
     get requires(): (`comment:${string}` | `extension:${string}`)[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }

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

@@ -17,7 +17,7 @@ export class CreateCommentOnExtension extends CreateExtensionChange {
     get requires() {
         return [this.extension.stableId];
     }
-    serialize() {
+    serialize(_options) {
         return [
             "COMMENT ON EXTENSION",
             this.extension.name,
@@ -40,7 +40,7 @@ export class DropCommentOnExtension extends DropExtensionChange {
     get requires() {
         return [stableId.comment(this.extension.stableId), this.extension.stableId];
     }
-    serialize() {
+    serialize(_options) {
         return ["COMMENT ON EXTENSION", this.extension.name, "IS NULL"].join(" ");
     }
 }

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

@@ -1,3 +1,4 @@
+import type { ExtensionSerializeOptions } from "../../../integrations/serialize/serialize.types.ts";
 import type { Extension } from "../extension.model.ts";
 import { CreateExtensionChange } from "./extension.base.ts";
 /**
@@ -21,5 +22,5 @@ export declare class CreateExtension extends CreateExtensionChange {
     });
     get creates(): string[];
     get requires(): string[];
-    serialize(): string;
+    serialize(options?: ExtensionSerializeOptions): string;
 }

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

@@ -31,12 +31,14 @@ export class CreateExtension extends CreateExtensionChange {
         dependencies.add(stableId.role(this.extension.owner));
         return Array.from(dependencies);
     }
-    serialize() {
+    serialize(options) {
         const parts = ["CREATE EXTENSION"];
         // Add extension name
         parts.push(this.extension.name);
         // Add schema
-        parts.push("WITH SCHEMA", this.extension.schema);
+        if (!options?.skipSchema) {
+            parts.push("WITH SCHEMA", this.extension.schema);
+        }
         // Add version
         // TODO: Omit version for now as versions can differ between main and branch
         // if (this.extension.version) {

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

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

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

@@ -22,7 +22,7 @@ export class DropExtension extends DropExtensionChange {
     get requires() {
         return [this.extension.stableId, ...this.extension.members];
     }
-    serialize() {
+    serialize(_options) {
         return ["DROP EXTENSION", this.extension.name].join(" ");
     }
 }

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

@@ -2,4 +2,5 @@ import type { AlterExtension } from "./extension.alter.ts";
 import type { CommentExtension } from "./extension.comment.ts";
 import type { CreateExtension } from "./extension.create.ts";
 import type { DropExtension } from "./extension.drop.ts";
+/** Union of all extension-related change variants (`objectType: "extension"`). @category Change Types */
 export type ExtensionChange = AlterExtension | CommentExtension | CreateExtension | DropExtension;

package/dist/core/objects/extract-with-retry.d.ts

@@ -0,0 +1,36 @@
+export interface ExtractRetryOptions {
+    /**
+     * Number of retry attempts to make when a `pg_get_*def()` call returns NULL
+     * for at least one row. Total attempts is `retries + 1`. Negative values are
+     * clamped to 0. When this option is undefined the value is read from the
+     * `PGDELTA_EXTRACT_RETRIES` environment variable, falling back to a default
+     * of 1 (i.e. the first attempt plus one retry, 2 attempts total).
+     */
+    retries?: number;
+    /**
+     * Delay between retry attempts in milliseconds; the actual wait is
+     * `backoffMs * attemptNumber` (linear). Defaults to 50. Set to 0 in tests.
+     */
+    backoffMs?: number;
+}
+export declare function resolveExtractRetries(option?: number): number;
+/**
+ * Runs `query()` up to `retries + 1` times, retrying as long as at least one
+ * row in the result satisfies `hasNullDefinition`. The retry exists because
+ * `pg_get_<x>def()` can return NULL transiently when the underlying catalog
+ * row is dropped concurrently or the catalog state is in flux; in practice a
+ * second attempt either no longer sees the dropped row or succeeds in
+ * resolving the definition.
+ *
+ * Returns the rows from the first attempt with no offenders, or — once
+ * retries are exhausted — the rows from the final attempt (still containing
+ * offenders). The caller is responsible for the final filter so this helper
+ * works for both flat schemas (definition on the row) and nested schemas
+ * (definition on a child collection, e.g. table constraints).
+ */
+export declare function extractWithDefinitionRetry<TRow>(params: {
+    label: string;
+    query: () => Promise<TRow[]>;
+    hasNullDefinition: (row: TRow) => boolean;
+    options?: ExtractRetryOptions;
+}): Promise<TRow[]>;

package/dist/core/objects/extract-with-retry.js

@@ -0,0 +1,51 @@
+import debug from "debug";
+const log = debug("pg-delta:extract");
+const DEFAULT_RETRIES = 1;
+const DEFAULT_BACKOFF_MS = 50;
+export function resolveExtractRetries(option) {
+    if (typeof option === "number" && Number.isFinite(option)) {
+        return Math.max(0, Math.floor(option));
+    }
+    const envVal = process.env.PGDELTA_EXTRACT_RETRIES;
+    if (envVal !== undefined && envVal !== "") {
+        const n = Number(envVal);
+        if (Number.isFinite(n))
+            return Math.max(0, Math.floor(n));
+    }
+    return DEFAULT_RETRIES;
+}
+const sleep = (ms) => ms > 0 ? new Promise((r) => setTimeout(r, ms)) : Promise.resolve();
+/**
+ * Runs `query()` up to `retries + 1` times, retrying as long as at least one
+ * row in the result satisfies `hasNullDefinition`. The retry exists because
+ * `pg_get_<x>def()` can return NULL transiently when the underlying catalog
+ * row is dropped concurrently or the catalog state is in flux; in practice a
+ * second attempt either no longer sees the dropped row or succeeds in
+ * resolving the definition.
+ *
+ * Returns the rows from the first attempt with no offenders, or — once
+ * retries are exhausted — the rows from the final attempt (still containing
+ * offenders). The caller is responsible for the final filter so this helper
+ * works for both flat schemas (definition on the row) and nested schemas
+ * (definition on a child collection, e.g. table constraints).
+ */
+export async function extractWithDefinitionRetry(params) {
+    const retries = resolveExtractRetries(params.options?.retries);
+    const backoffMs = params.options?.backoffMs ?? DEFAULT_BACKOFF_MS;
+    const maxAttempts = retries + 1;
+    let rows = [];
+    for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+        rows = await params.query();
+        const offenders = rows.filter(params.hasNullDefinition).length;
+        if (offenders === 0)
+            return rows;
+        if (attempt < maxAttempts) {
+            log("%s: pg_get_*def() returned NULL for %d row(s) on attempt %d/%d; retrying", params.label, offenders, attempt, maxAttempts);
+            await sleep(backoffMs * attempt);
+        }
+        else {
+            log("%s: pg_get_*def() returned NULL for %d row(s) after %d attempt(s); skipping", params.label, offenders, maxAttempts);
+        }
+    }
+    return rows;
+}

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

@@ -1,3 +1,4 @@
+import type { SerializeOptions } from "../../../../integrations/serialize/serialize.types.ts";
 import type { ForeignDataWrapper } from "../foreign-data-wrapper.model.ts";
 import { AlterForeignDataWrapperChange } from "./foreign-data-wrapper.base.ts";
 /**
@@ -25,7 +26,7 @@ export declare class AlterForeignDataWrapperChangeOwner extends AlterForeignData
         owner: string;
     });
     get requires(): (`role:${string}` | `foreignDataWrapper:${string}`)[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }
 /**
  * ALTER FOREIGN DATA WRAPPER ... OPTIONS ( ADD | SET | DROP ... )
@@ -47,5 +48,5 @@ export declare class AlterForeignDataWrapperSetOptions extends AlterForeignDataW
         }>;
     });
     get requires(): `foreignDataWrapper:${string}`[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }

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

@@ -1,5 +1,6 @@
 import { quoteLiteral } from "../../../base.change.js";
 import { stableId } from "../../../utils.js";
+import { redactOptionValue } from "../../sensitive-options.js";
 import { AlterForeignDataWrapperChange } from "./foreign-data-wrapper.base.js";
 /**
  * ALTER FOREIGN DATA WRAPPER ... OWNER TO ...
@@ -16,7 +17,7 @@ export class AlterForeignDataWrapperChangeOwner extends AlterForeignDataWrapperC
     get requires() {
         return [this.foreignDataWrapper.stableId, stableId.role(this.owner)];
     }
-    serialize() {
+    serialize(_options) {
         return [
             "ALTER FOREIGN DATA WRAPPER",
             this.foreignDataWrapper.name,
@@ -40,14 +41,16 @@ export class AlterForeignDataWrapperSetOptions extends AlterForeignDataWrapperCh
     get requires() {
         return [this.foreignDataWrapper.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/foreign-data-wrapper/changes/foreign-data-wrapper.comment.d.ts

@@ -1,3 +1,4 @@
+import type { SerializeOptions } from "../../../../integrations/serialize/serialize.types.ts";
 import type { ForeignDataWrapper } from "../foreign-data-wrapper.model.ts";
 import { CreateForeignDataWrapperChange, DropForeignDataWrapperChange } from "./foreign-data-wrapper.base.ts";
 /**
@@ -12,7 +13,7 @@ export declare class CreateCommentOnForeignDataWrapper extends CreateForeignData
     });
     get creates(): `comment:${string}`[];
     get requires(): `foreignDataWrapper:${string}`[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }
 export declare class DropCommentOnForeignDataWrapper extends DropForeignDataWrapperChange {
     readonly foreignDataWrapper: ForeignDataWrapper;
@@ -22,5 +23,5 @@ export declare class DropCommentOnForeignDataWrapper extends DropForeignDataWrap
     });
     get drops(): `comment:${string}`[];
     get requires(): (`comment:${string}` | `foreignDataWrapper:${string}`)[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }

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

@@ -14,7 +14,7 @@ export class CreateCommentOnForeignDataWrapper extends CreateForeignDataWrapperC
     get requires() {
         return [this.foreignDataWrapper.stableId];
     }
-    serialize() {
+    serialize(_options) {
         return [
             "COMMENT ON FOREIGN DATA WRAPPER",
             this.foreignDataWrapper.name,
@@ -40,7 +40,7 @@ export class DropCommentOnForeignDataWrapper extends DropForeignDataWrapperChang
             this.foreignDataWrapper.stableId,
         ];
     }
-    serialize() {
+    serialize(_options) {
         return [
             "COMMENT ON FOREIGN DATA WRAPPER",
             this.foreignDataWrapper.name,

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

@@ -1,3 +1,4 @@
+import type { SerializeOptions } from "../../../../integrations/serialize/serialize.types.ts";
 import type { ForeignDataWrapper } from "../foreign-data-wrapper.model.ts";
 import { CreateForeignDataWrapperChange } from "./foreign-data-wrapper.base.ts";
 /**
@@ -21,5 +22,5 @@ export declare class CreateForeignDataWrapper extends CreateForeignDataWrapperCh
     });
     get creates(): `foreignDataWrapper:${string}`[];
     get requires(): string[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }

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

@@ -1,5 +1,6 @@
 import { quoteLiteral } from "../../../base.change.js";
 import { stableId } from "../../../utils.js";
+import { redactOptionValue } from "../../sensitive-options.js";
 import { CreateForeignDataWrapperChange } from "./foreign-data-wrapper.base.js";
 /**
  * Create a foreign data wrapper.
@@ -42,7 +43,7 @@ export class CreateForeignDataWrapper extends CreateForeignDataWrapperChange {
         }
         return Array.from(dependencies);
     }
-    serialize() {
+    serialize(_options) {
         const parts = ["CREATE FOREIGN DATA WRAPPER"];
         // Add FDW name
         parts.push(this.foreignDataWrapper.name);
@@ -65,9 +66,11 @@ export class CreateForeignDataWrapper extends CreateForeignDataWrapperChange {
             this.foreignDataWrapper.options.length > 0) {
             const optionPairs = [];
             for (let i = 0; i < this.foreignDataWrapper.options.length; i += 2) {
-                if (i + 1 < this.foreignDataWrapper.options.length) {
-                    optionPairs.push(`${this.foreignDataWrapper.options[i]} ${quoteLiteral(this.foreignDataWrapper.options[i + 1])}`);
-                }
+                const key = this.foreignDataWrapper.options[i];
+                const value = this.foreignDataWrapper.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/foreign-data-wrapper/changes/foreign-data-wrapper.drop.d.ts

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

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

@@ -22,7 +22,7 @@ export class DropForeignDataWrapper extends DropForeignDataWrapperChange {
     get requires() {
         return [this.foreignDataWrapper.stableId];
     }
-    serialize() {
+    serialize(_options) {
         return ["DROP FOREIGN DATA WRAPPER", this.foreignDataWrapper.name].join(" ");
     }
 }

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

@@ -1,3 +1,4 @@
+import type { SerializeOptions } from "../../../../integrations/serialize/serialize.types.ts";
 import type { ForeignDataWrapper } from "../foreign-data-wrapper.model.ts";
 import { AlterForeignDataWrapperChange } from "./foreign-data-wrapper.base.ts";
 export type ForeignDataWrapperPrivilege = GrantForeignDataWrapperPrivileges | RevokeForeignDataWrapperPrivileges | RevokeGrantOptionForeignDataWrapperPrivileges;
@@ -34,7 +35,7 @@ export declare class GrantForeignDataWrapperPrivileges extends AlterForeignDataW
     });
     get creates(): `acl:${string}::grantee:${string}`[];
     get requires(): (`role:${string}` | `foreignDataWrapper:${string}`)[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }
 /**
  * Revoke privileges on a foreign data wrapper.
@@ -71,7 +72,7 @@ export declare class RevokeForeignDataWrapperPrivileges extends AlterForeignData
     });
     get drops(): `acl:${string}::grantee:${string}`[];
     get requires(): (`acl:${string}::grantee:${string}` | `role:${string}` | `foreignDataWrapper:${string}`)[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }
 /**
  * Revoke grant option for privileges on a foreign data wrapper.
@@ -93,5 +94,5 @@ export declare class RevokeGrantOptionForeignDataWrapperPrivileges extends Alter
         version?: number;
     });
     get requires(): (`acl:${string}::grantee:${string}` | `role:${string}` | `foreignDataWrapper:${string}`)[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }