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

package/dist/core/catalog.model.d.ts

@@ -1,4 +1,4 @@
-import type { Sql } from "postgres";
+import type { Pool } from "pg";
 import { type PgDepend } from "./depend.ts";
 import { type Aggregate } from "./objects/aggregate/aggregate.model.ts";
 import type { TableLikeObject } from "./objects/base.model.ts";
@@ -89,5 +89,5 @@ export declare class Catalog {
     readonly currentUser: CatalogProps["currentUser"];
     constructor(props: CatalogProps);
 }
-export declare function extractCatalog(sql: Sql): Promise<Catalog>;
+export declare function extractCatalog(pool: Pool): Promise<Catalog>;
 export {};

package/dist/core/catalog.model.js

@@ -88,36 +88,36 @@ export class Catalog {
         this.currentUser = props.currentUser;
     }
 }
-export async function extractCatalog(sql) {
+export async function extractCatalog(pool) {
     const [aggregates, collations, compositeTypes, domains, enums, extensions, indexes, materializedViews, subscriptions, publications, procedures, rlsPolicies, roles, schemas, sequences, tables, triggers, eventTriggers, rules, ranges, views, foreignDataWrappers, servers, userMappings, foreignTables, depends, version, currentUser,] = await Promise.all([
-        extractAggregates(sql).then(listToRecord),
-        extractCollations(sql).then(listToRecord),
-        extractCompositeTypes(sql).then(listToRecord),
-        extractDomains(sql).then(listToRecord),
-        extractEnums(sql).then(listToRecord),
-        extractExtensions(sql).then(listToRecord),
-        extractIndexes(sql).then(listToRecord),
-        extractMaterializedViews(sql).then(listToRecord),
-        extractSubscriptions(sql).then(listToRecord),
-        extractPublications(sql).then(listToRecord),
-        extractProcedures(sql).then(listToRecord),
-        extractRlsPolicies(sql).then(listToRecord),
-        extractRoles(sql).then(listToRecord),
-        extractSchemas(sql).then(listToRecord),
-        extractSequences(sql).then(listToRecord),
-        extractTables(sql).then(listToRecord),
-        extractTriggers(sql).then(listToRecord),
-        extractEventTriggers(sql).then(listToRecord),
-        extractRules(sql).then(listToRecord),
-        extractRanges(sql).then(listToRecord),
-        extractViews(sql).then(listToRecord),
-        extractForeignDataWrappers(sql).then(listToRecord),
-        extractServers(sql).then(listToRecord),
-        extractUserMappings(sql).then(listToRecord),
-        extractForeignTables(sql).then(listToRecord),
-        extractDepends(sql),
-        extractVersion(sql),
-        extractCurrentUser(sql),
+        extractAggregates(pool).then(listToRecord),
+        extractCollations(pool).then(listToRecord),
+        extractCompositeTypes(pool).then(listToRecord),
+        extractDomains(pool).then(listToRecord),
+        extractEnums(pool).then(listToRecord),
+        extractExtensions(pool).then(listToRecord),
+        extractIndexes(pool).then(listToRecord),
+        extractMaterializedViews(pool).then(listToRecord),
+        extractSubscriptions(pool).then(listToRecord),
+        extractPublications(pool).then(listToRecord),
+        extractProcedures(pool).then(listToRecord),
+        extractRlsPolicies(pool).then(listToRecord),
+        extractRoles(pool).then(listToRecord),
+        extractSchemas(pool).then(listToRecord),
+        extractSequences(pool).then(listToRecord),
+        extractTables(pool).then(listToRecord),
+        extractTriggers(pool).then(listToRecord),
+        extractEventTriggers(pool).then(listToRecord),
+        extractRules(pool).then(listToRecord),
+        extractRanges(pool).then(listToRecord),
+        extractViews(pool).then(listToRecord),
+        extractForeignDataWrappers(pool).then(listToRecord),
+        extractServers(pool).then(listToRecord),
+        extractUserMappings(pool).then(listToRecord),
+        extractForeignTables(pool).then(listToRecord),
+        extractDepends(pool),
+        extractVersion(pool),
+        extractCurrentUser(pool),
     ]);
     const indexableObjects = {
         ...tables,

package/dist/core/context.d.ts

@@ -1,4 +1,4 @@
-import type { Sql } from "postgres";
+import type { Pool } from "pg";
 import type { Catalog } from "./catalog.model.ts";
 /**
  * Context for diff operations, containing both source and target catalogs.
@@ -7,5 +7,5 @@ export interface DiffContext {
     mainCatalog: Catalog;
     branchCatalog: Catalog;
 }
-export declare function extractVersion(sql: Sql): Promise<number>;
-export declare function extractCurrentUser(sql: Sql): Promise<string>;
+export declare function extractVersion(pool: Pool): Promise<number>;
+export declare function extractCurrentUser(pool: Pool): Promise<string>;

package/dist/core/context.js

@@ -1,12 +1,9 @@
-export async function extractVersion(sql) {
-    const [{ version }] = await sql `
-    select current_setting('server_version_num')::int as version;
-  `;
-    return version;
+import { sql } from "@ts-safeql/sql-tag";
+export async function extractVersion(pool) {
+    const { rows } = await pool.query(sql `select current_setting('server_version_num')::int as version`);
+    return rows[0].version;
 }
-export async function extractCurrentUser(sql) {
-    const [{ current_user }] = await sql `
-    select quote_ident(current_user) as current_user;
-  `;
-    return current_user;
+export async function extractCurrentUser(pool) {
+    const { rows } = await pool.query(sql `select quote_ident(current_user) as current_user`);
+    return rows[0].current_user;
 }

package/dist/core/depend.d.ts

@@ -1,4 +1,4 @@
-import type { Sql } from "postgres";
+import type { Pool } from "pg";
 /**
  * Dependency type as defined in PostgreSQL's pg_depend.deptype.
  * n: normal
@@ -27,5 +27,5 @@ export interface PgDepend {
  * @param params - Object containing arrays of OIDs for filtering (user_oids, user_namespace_oids, etc.)
  * @returns Array of dependency objects with class names.
  */
-export declare function extractDepends(sql: Sql): Promise<PgDepend[]>;
+export declare function extractDepends(pool: Pool): Promise<PgDepend[]>;
 export {};

package/dist/core/depend.js

@@ -1,3 +1,4 @@
+import { sql } from "@ts-safeql/sql-tag";
 /**
  * Extract dependencies for privileges and memberships so that GRANT/REVOKE
  * operations are properly ordered with respect to their target objects/roles.
@@ -13,8 +14,8 @@
  *  - membership:<role>-><member> -> role:<role>
  *  - membership:<role>-><member> -> role:<member>
  */
-async function extractPrivilegeAndMembershipDepends(sql) {
-    const rows = await sql `
+async function extractPrivilegeAndMembershipDepends(pool) {
+    const { rows } = await pool.query(sql `
 with
   -- OBJECT PRIVILEGES (relations)
   extension_rel_oids as (
@@ -468,7 +469,7 @@ where dependent_stable_id <> referenced_stable_id
   and NOT (
     COALESCE(dep_schema, '') LIKE ANY (ARRAY['pg\\_%','information\\_schema'])
   )
-  `;
+  `);
     return rows;
 }
 /**
@@ -477,8 +478,8 @@ where dependent_stable_id <> referenced_stable_id
  * @param params - Object containing arrays of OIDs for filtering (user_oids, user_namespace_oids, etc.)
  * @returns Array of dependency objects with class names.
  */
-export async function extractDepends(sql) {
-    const dependsRows = await sql `
+export async function extractDepends(pool) {
+    const { rows: dependsRows } = await pool.query(sql `
   WITH ids AS (
     -- only the objects that actually show up in dependencies (both sides)
     SELECT DISTINCT classid, objid, objsubid FROM pg_depend WHERE deptype IN ('n','a')
@@ -1823,9 +1824,9 @@ export async function extractDepends(sql) {
       COALESCE(dep_schema, '') LIKE ANY (ARRAY['pg\\_%','information\\_schema'])
     )
   ORDER BY dependent_stable_id, referenced_stable_id;
-  `;
+  `);
     // Extract privilege and membership dependencies
-    const privilegeDepends = await extractPrivilegeAndMembershipDepends(sql);
+    const privilegeDepends = await extractPrivilegeAndMembershipDepends(pool);
     // Combine all dependency sources and remove duplicates
     const allDepends = new Set([...dependsRows, ...privilegeDepends]);
     return Array.from(allDepends).sort((a, b) => a.dependent_stable_id.localeCompare(b.dependent_stable_id) ||

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";
@@ -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
@@ -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/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));
 }

package/dist/core/objects/domain/domain.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";
@@ -99,5 +99,5 @@ export declare class Domain extends BasePgModel {
  * @param sql - The SQL client.
  * @returns A list of domains.
  */
-export declare function extractDomains(sql: Sql): Promise<Domain[]>;
+export declare function extractDomains(pool: Pool): Promise<Domain[]>;
 export {};

package/dist/core/objects/domain/domain.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";
@@ -98,10 +99,8 @@ export class Domain extends BasePgModel {
  * @param sql - The SQL client.
  * @returns A list of domains.
  */
-export async function extractDomains(sql) {
-    return sql.begin(async (sql) => {
-        await sql `set search_path = ''`;
-        const domainRows = await sql `
+export async function extractDomains(pool) {
+    const { rows: domainRows } = await pool.query(sql `
       with extension_oids as (
         select
           objid
@@ -163,10 +162,9 @@ export async function extractDomains(sql) {
         and e.objid is null
         and t.typtype = 'd'
       order by
-        1, 2;
-    `;
-        // Validate and parse each row using the Zod schema
-        const validatedRows = domainRows.map((row) => domainPropsSchema.parse(row));
-        return validatedRows.map((row) => new Domain(row));
-    });
+        1, 2
+  `);
+    // Validate and parse each row using the Zod schema
+    const validatedRows = domainRows.map((row) => domainPropsSchema.parse(row));
+    return validatedRows.map((row) => new Domain(row));
 }

package/dist/core/objects/event-trigger/event-trigger.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";
 declare const eventTriggerPropsSchema: z.ZodObject<{
@@ -41,5 +41,5 @@ export declare class EventTrigger extends BasePgModel {
         comment: string | null;
     };
 }
-export declare function extractEventTriggers(sql: Sql): Promise<EventTrigger[]>;
+export declare function extractEventTriggers(pool: Pool): Promise<EventTrigger[]>;
 export {};

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

@@ -1,3 +1,4 @@
+import { sql } from "@ts-safeql/sql-tag";
 import z from "zod";
 import { BasePgModel } from "../base.model.js";
 const EventTriggerEnabledSchema = z.enum([
@@ -58,10 +59,8 @@ export class EventTrigger extends BasePgModel {
         };
     }
 }
-export async function extractEventTriggers(sql) {
-    return sql.begin(async (sql) => {
-        await sql `set search_path = ''`;
-        const rows = await sql `
+export async function extractEventTriggers(pool) {
+    const { rows } = await pool.query(sql `
 with extension_oids as (
   select objid
   from pg_depend d
@@ -81,9 +80,8 @@ 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
 where e.objid is null
-order by 1;
-    `;
-        const validatedRows = rows.map((row) => eventTriggerPropsSchema.parse(row));
-        return validatedRows.map((row) => new EventTrigger(row));
-    });
+order by 1
+  `);
+    const validatedRows = rows.map((row) => eventTriggerPropsSchema.parse(row));
+    return validatedRows.map((row) => new EventTrigger(row));
 }

package/dist/core/objects/extension/extension.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";
 /**
@@ -48,5 +48,5 @@ export declare class Extension extends BasePgModel {
         comment: string | null;
     };
 }
-export declare function extractExtensions(sql: Sql): Promise<Extension[]>;
+export declare function extractExtensions(pool: Pool): Promise<Extension[]>;
 export {};

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

@@ -1,3 +1,4 @@
+import { sql } from "@ts-safeql/sql-tag";
 import z from "zod";
 import { BasePgModel } from "../base.model.js";
 /**
@@ -65,10 +66,8 @@ export class Extension extends BasePgModel {
     }
 }
 // TODO: fetch extension dependencies so we can determine when to use CASCADE on creation
-export async function extractExtensions(sql) {
-    return sql.begin(async (sql) => {
-        await sql `set search_path = ''`;
-        const extensionRows = await sql `
+export async function extractExtensions(pool) {
+    const { rows: extensionRows } = await pool.query(sql `
   with extension_rows as (
     select
       e.oid,
@@ -259,10 +258,9 @@ export async function extractExtensions(sql) {
     ) as members
   from extension_rows er
   order by
-    er.name;
-  `;
-        // Validate and parse each row using the Zod schema
-        const validatedRows = extensionRows.map((row) => extensionPropsSchema.parse(row));
-        return validatedRows.map((row) => new Extension(row));
-    });
+    er.name
+  `);
+    // Validate and parse each row using the Zod schema
+    const validatedRows = extensionRows.map((row) => extensionPropsSchema.parse(row));
+    return validatedRows.map((row) => new Extension(row));
 }

package/dist/core/objects/foreign-data-wrapper/foreign-data-wrapper/foreign-data-wrapper.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";
@@ -55,5 +55,5 @@ export declare class ForeignDataWrapper extends BasePgModel {
         }[];
     };
 }
-export declare function extractForeignDataWrappers(sql: Sql): Promise<ForeignDataWrapper[]>;
+export declare function extractForeignDataWrappers(pool: Pool): Promise<ForeignDataWrapper[]>;
 export {};

package/dist/core/objects/foreign-data-wrapper/foreign-data-wrapper/foreign-data-wrapper.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";
@@ -59,10 +60,8 @@ export class ForeignDataWrapper extends BasePgModel {
         };
     }
 }
-export async function extractForeignDataWrappers(sql) {
-    return sql.begin(async (sql) => {
-        await sql `set search_path = ''`;
-        const fdwRows = await sql `
+export async function extractForeignDataWrappers(pool) {
+    const { rows: fdwRows } = await pool.query(sql `
       with extension_oids as (
         select objid
         from pg_depend d
@@ -104,25 +103,24 @@ export async function extractForeignDataWrappers(sql) {
         not fdw.fdwname like any(array['pg\\_%'])
         and e.objid is null
       order by
-        fdw.fdwname;
-    `;
-        // Validate and parse each row using the Zod schema
-        const validatedRows = fdwRows.map((row) => {
-            const parsed = foreignDataWrapperPropsSchema.parse(row);
-            // Parse options from PostgreSQL format ['key=value'] to ['key', 'value']
-            if (parsed.options && parsed.options.length > 0) {
-                const parsedOptions = [];
-                for (const opt of parsed.options) {
-                    const eqIndex = opt.indexOf("=");
-                    if (eqIndex > 0) {
-                        parsedOptions.push(opt.substring(0, eqIndex));
-                        parsedOptions.push(opt.substring(eqIndex + 1));
-                    }
+        fdw.fdwname
+  `);
+    // Validate and parse each row using the Zod schema
+    const validatedRows = fdwRows.map((row) => {
+        const parsed = foreignDataWrapperPropsSchema.parse(row);
+        // Parse options from PostgreSQL format ['key=value'] to ['key', 'value']
+        if (parsed.options && parsed.options.length > 0) {
+            const parsedOptions = [];
+            for (const opt of parsed.options) {
+                const eqIndex = opt.indexOf("=");
+                if (eqIndex > 0) {
+                    parsedOptions.push(opt.substring(0, eqIndex));
+                    parsedOptions.push(opt.substring(eqIndex + 1));
                 }
-                parsed.options = parsedOptions.length > 0 ? parsedOptions : null;
             }
-            return parsed;
-        });
-        return validatedRows.map((row) => new ForeignDataWrapper(row));
+            parsed.options = parsedOptions.length > 0 ? parsedOptions : null;
+        }
+        return parsed;
     });
+    return validatedRows.map((row) => new ForeignDataWrapper(row));
 }

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

@@ -1,4 +1,4 @@
-import type { Sql } from "postgres";
+import type { Pool } from "pg";
 import z from "zod";
 import { BasePgModel, type TableLikeObject } from "../../base.model.ts";
 import { type PrivilegeProps } from "../../base.privilege-diff.ts";
@@ -113,5 +113,5 @@ export declare class ForeignTable extends BasePgModel implements TableLikeObject
         };
     };
 }
-export declare function extractForeignTables(sql: Sql): Promise<ForeignTable[]>;
+export declare function extractForeignTables(pool: Pool): Promise<ForeignTable[]>;
 export {};

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

@@ -1,3 +1,4 @@
+import { sql } from "@ts-safeql/sql-tag";
 import z from "zod";
 import { BasePgModel, columnPropsSchema, } from "../../base.model.js";
 import { privilegePropsSchema, } from "../../base.privilege-diff.js";
@@ -82,10 +83,8 @@ export class ForeignTable extends BasePgModel {
         };
     }
 }
-export async function extractForeignTables(sql) {
-    return sql.begin(async (sql) => {
-        await sql `set search_path = ''`;
-        const tableRows = await sql `
+export async function extractForeignTables(pool) {
+    const { rows: tableRows } = await pool.query(sql `
       with extension_oids as (
         select objid
         from pg_depend d
@@ -191,25 +190,24 @@ export async function extractForeignTables(sql) {
       group by
         ft.oid, ft.schema, ft.name, ft.owner, ft.server, ft.options
       order by
-        ft.schema, ft.name;
-    `;
-        // Validate and parse each row using the Zod schema
-        const validatedRows = tableRows.map((row) => {
-            const parsed = foreignTablePropsSchema.parse(row);
-            // Parse options from PostgreSQL format ['key=value'] to ['key', 'value']
-            if (parsed.options && parsed.options.length > 0) {
-                const parsedOptions = [];
-                for (const opt of parsed.options) {
-                    const eqIndex = opt.indexOf("=");
-                    if (eqIndex > 0) {
-                        parsedOptions.push(opt.substring(0, eqIndex));
-                        parsedOptions.push(opt.substring(eqIndex + 1));
-                    }
+        ft.schema, ft.name
+  `);
+    // Validate and parse each row using the Zod schema
+    const validatedRows = tableRows.map((row) => {
+        const parsed = foreignTablePropsSchema.parse(row);
+        // Parse options from PostgreSQL format ['key=value'] to ['key', 'value']
+        if (parsed.options && parsed.options.length > 0) {
+            const parsedOptions = [];
+            for (const opt of parsed.options) {
+                const eqIndex = opt.indexOf("=");
+                if (eqIndex > 0) {
+                    parsedOptions.push(opt.substring(0, eqIndex));
+                    parsedOptions.push(opt.substring(eqIndex + 1));
                 }
-                parsed.options = parsedOptions.length > 0 ? parsedOptions : null;
             }
-            return parsed;
-        });
-        return validatedRows.map((row) => new ForeignTable(row));
+            parsed.options = parsedOptions.length > 0 ? parsedOptions : null;
+        }
+        return parsed;
     });
+    return validatedRows.map((row) => new ForeignTable(row));
 }

package/dist/core/objects/foreign-data-wrapper/server/server.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";
@@ -58,5 +58,5 @@ export declare class Server extends BasePgModel {
         }[];
     };
 }
-export declare function extractServers(sql: Sql): Promise<Server[]>;
+export declare function extractServers(pool: Pool): Promise<Server[]>;
 export {};