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

package/dist/core/objects/materialized-view/materialized-view.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";
@@ -14,10 +14,10 @@ declare const materializedViewPropsSchema: z.ZodObject<{
     has_subclasses: z.ZodBoolean;
     is_populated: z.ZodBoolean;
     replica_identity: z.ZodEnum<{
+        f: "f";
         n: "n";
         i: "i";
         d: "d";
-        f: "f";
     }>;
     is_partition: z.ZodBoolean;
     options: z.ZodNullable<z.ZodArray<z.ZodString>>;
@@ -85,7 +85,7 @@ export declare class MaterializedView extends BasePgModel implements TableLikeOb
         has_triggers: boolean;
         has_subclasses: boolean;
         is_populated: boolean;
-        replica_identity: "n" | "i" | "d" | "f";
+        replica_identity: "f" | "n" | "i" | "d";
         is_partition: boolean;
         options: string[] | null;
         partition_bound: string | null;
@@ -133,7 +133,7 @@ export declare class MaterializedView extends BasePgModel implements TableLikeOb
             has_triggers: boolean;
             has_subclasses: boolean;
             is_populated: boolean;
-            replica_identity: "n" | "i" | "d" | "f";
+            replica_identity: "f" | "n" | "i" | "d";
             is_partition: boolean;
             options: string[] | null;
             partition_bound: string | null;
@@ -148,5 +148,5 @@ export declare class MaterializedView extends BasePgModel implements TableLikeOb
         };
     };
 }
-export declare function extractMaterializedViews(sql: Sql): Promise<MaterializedView[]>;
+export declare function extractMaterializedViews(pool: Pool): Promise<MaterializedView[]>;
 export {};

package/dist/core/objects/materialized-view/materialized-view.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";
@@ -113,10 +114,8 @@ export class MaterializedView extends BasePgModel {
         };
     }
 }
-export async function extractMaterializedViews(sql) {
-    return sql.begin(async (sql) => {
-        await sql `set search_path = ''`;
-        const mvRows = await sql `
+export async function extractMaterializedViews(pool) {
+    const { rows: mvRows } = await pool.query(sql `
 with extension_oids as (
   select
     objid
@@ -219,10 +218,9 @@ where not c.relnamespace::regnamespace::text like any(array['pg\\_%', 'informati
 group by
   c.oid, c.relnamespace, c.relname, pg_get_viewdef(c.oid), c.relrowsecurity, c.relforcerowsecurity, c.relhasindex, c.relhasrules, c.relhastriggers, c.relhassubclass, c.relispopulated, c.relreplident, c.relispartition, c.reloptions, pg_get_expr(c.relpartbound, c.oid), c.relowner
 order by
-  c.relnamespace::regnamespace, c.relname;
-    `;
-        // Validate and parse each row using the Zod schema
-        const validatedRows = mvRows.map((row) => materializedViewPropsSchema.parse(row));
-        return validatedRows.map((row) => new MaterializedView(row));
-    });
+  c.relnamespace::regnamespace, c.relname
+  `);
+    // Validate and parse each row using the Zod schema
+    const validatedRows = mvRows.map((row) => materializedViewPropsSchema.parse(row));
+    return validatedRows.map((row) => new MaterializedView(row));
 }

package/dist/core/objects/procedure/procedure.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";
@@ -6,24 +6,24 @@ declare const procedurePropsSchema: z.ZodObject<{
     schema: z.ZodString;
     name: z.ZodString;
     kind: z.ZodEnum<{
-        a: "a";
+        f: "f";
         w: "w";
+        a: "a";
         p: "p";
-        f: "f";
     }>;
     return_type: z.ZodString;
     return_type_schema: z.ZodString;
     language: z.ZodString;
     security_definer: z.ZodBoolean;
     volatility: z.ZodEnum<{
-        i: "i";
         s: "s";
+        i: "i";
         v: "v";
     }>;
     parallel_safety: z.ZodEnum<{
+        r: "r";
         u: "u";
         s: "s";
-        r: "r";
     }>;
     execution_cost: z.ZodNumber;
     result_rows: z.ZodNumber;
@@ -36,8 +36,8 @@ declare const procedurePropsSchema: 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<{
-        i: "i";
         o: "o";
+        i: "i";
         b: "b";
         v: "v";
         t: "t";
@@ -96,13 +96,13 @@ export declare class Procedure extends BasePgModel {
         name: string;
     };
     get dataFields(): {
-        kind: "a" | "w" | "p" | "f";
+        kind: "f" | "w" | "a" | "p";
         return_type: string;
         return_type_schema: string;
         language: string;
         security_definer: boolean;
-        volatility: "i" | "s" | "v";
-        parallel_safety: "u" | "s" | "r";
+        volatility: "s" | "i" | "v";
+        parallel_safety: "r" | "u" | "s";
         is_strict: boolean;
         leakproof: boolean;
         returns_set: boolean;
@@ -111,7 +111,7 @@ export declare class Procedure extends BasePgModel {
         argument_names: string[] | null;
         argument_types: string[] | null;
         all_argument_types: string[] | null;
-        argument_modes: ("i" | "o" | "b" | "v" | "t")[] | null;
+        argument_modes: ("o" | "i" | "b" | "v" | "t")[] | null;
         argument_defaults: string | null;
         source_code: string | null;
         binary_path: string | null;
@@ -128,5 +128,5 @@ export declare class Procedure extends BasePgModel {
         }[];
     };
 }
-export declare function extractProcedures(sql: Sql): Promise<Procedure[]>;
+export declare function extractProcedures(pool: Pool): Promise<Procedure[]>;
 export {};

package/dist/core/objects/procedure/procedure.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";
@@ -162,10 +163,8 @@ export class Procedure extends BasePgModel {
         };
     }
 }
-export async function extractProcedures(sql) {
-    return sql.begin(async (sql) => {
-        await sql `set search_path = ''`;
-        const procedureRows = await sql `
+export async function extractProcedures(pool) {
+    const { rows: procedureRows } = await pool.query(sql `
 with extension_oids as (
   select
     objid
@@ -235,10 +234,9 @@ from
   and e.objid is null
   and l.lanname not in ('c', 'internal')
 order by
-  1, 2;
-    `;
-        // Validate and parse each row using the Zod schema
-        const validatedRows = procedureRows.map((row) => procedurePropsSchema.parse(row));
-        return validatedRows.map((row) => new Procedure(row));
-    });
+  1, 2
+  `);
+    // Validate and parse each row using the Zod schema
+    const validatedRows = procedureRows.map((row) => procedurePropsSchema.parse(row));
+    return validatedRows.map((row) => new Procedure(row));
 }

package/dist/core/objects/publication/publication.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 publicationTablePropsSchema: z.ZodObject<{
@@ -92,5 +92,5 @@ export declare class Publication extends BasePgModel {
 /**
  * Extract all logical replication publications from the database.
  */
-export declare function extractPublications(sql: Sql): Promise<Publication[]>;
+export declare function extractPublications(pool: Pool): Promise<Publication[]>;
 export {};

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

@@ -1,3 +1,4 @@
+import { sql } from "@ts-safeql/sql-tag";
 import z from "zod";
 import { BasePgModel } from "../base.model.js";
 const publicationTablePropsSchema = z.object({
@@ -104,10 +105,8 @@ export class Publication extends BasePgModel {
 /**
  * Extract all logical replication publications from the database.
  */
-export async function extractPublications(sql) {
-    return sql.begin(async (tx) => {
-        await tx `set search_path = ''`;
-        const rows = await tx `
+export async function extractPublications(pool) {
+    const { rows } = await pool.query(sql `
       with extension_oids as (
         select objid
         from pg_depend d
@@ -178,9 +177,8 @@ export async function extractPublications(sql) {
       from pg_publication p
       left join extension_oids e on e.objid = p.oid
       where e.objid is null
-      order by 1;
-    `;
-        const validated = rows.map((row) => publicationPropsSchema.parse(row));
-        return validated.map((row) => new Publication(row));
-    });
+      order by 1
+  `);
+    const validated = rows.map((row) => publicationPropsSchema.parse(row));
+    return validated.map((row) => new Publication(row));
 }

package/dist/core/objects/rls-policy/rls-policy.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 rlsPolicyPropsSchema: z.ZodObject<{
@@ -6,9 +6,9 @@ declare const rlsPolicyPropsSchema: z.ZodObject<{
     name: z.ZodString;
     table_name: z.ZodString;
     command: z.ZodEnum<{
-        a: "a";
         r: "r";
         w: "w";
+        a: "a";
         d: "d";
         "*": "*";
     }>;
@@ -39,7 +39,7 @@ export declare class RlsPolicy extends BasePgModel {
         name: string;
     };
     get dataFields(): {
-        command: "a" | "r" | "w" | "d" | "*";
+        command: "r" | "w" | "a" | "d" | "*";
         permissive: boolean;
         roles: string[];
         using_expression: string | null;
@@ -48,5 +48,5 @@ export declare class RlsPolicy extends BasePgModel {
         comment: string | null;
     };
 }
-export declare function extractRlsPolicies(sql: Sql): Promise<RlsPolicy[]>;
+export declare function extractRlsPolicies(pool: Pool): Promise<RlsPolicy[]>;
 export {};

package/dist/core/objects/rls-policy/rls-policy.model.js

@@ -1,3 +1,4 @@
+import { sql } from "@ts-safeql/sql-tag";
 import z from "zod";
 import { BasePgModel } from "../base.model.js";
 const RlsPolicyCommandSchema = z.enum([
@@ -67,10 +68,8 @@ export class RlsPolicy extends BasePgModel {
         };
     }
 }
-export async function extractRlsPolicies(sql) {
-    return sql.begin(async (sql) => {
-        await sql `set search_path = ''`;
-        const policyRows = await sql `
+export async function extractRlsPolicies(pool) {
+    const { rows: policyRows } = await pool.query(sql `
 with extension_policy_oids as (
   select
     objid
@@ -118,10 +117,9 @@ from
   and e_policy.objid is null
   and e_table.objid is null
 order by
-  1, 2;
-    `;
-        // Validate and parse each row using the Zod schema
-        const validatedRows = policyRows.map((row) => rlsPolicyPropsSchema.parse(row));
-        return validatedRows.map((row) => new RlsPolicy(row));
-    });
+  1, 2
+  `);
+    // Validate and parse each row using the Zod schema
+    const validatedRows = policyRows.map((row) => rlsPolicyPropsSchema.parse(row));
+    return validatedRows.map((row) => new RlsPolicy(row));
 }

package/dist/core/objects/role/role.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 rolePropsSchema: z.ZodObject<{
@@ -23,11 +23,11 @@ declare const rolePropsSchema: z.ZodObject<{
     default_privileges: z.ZodArray<z.ZodObject<{
         in_schema: z.ZodNullable<z.ZodString>;
         objtype: z.ZodEnum<{
-            n: "n";
             r: "r";
-            f: "f";
             S: "S";
+            f: "f";
             T: "T";
+            n: "n";
         }>;
         grantee: z.ZodString;
         privileges: z.ZodArray<z.ZodObject<{
@@ -80,10 +80,10 @@ export declare class Role extends BasePgModel {
                 grantable: boolean;
             }[];
             in_schema: string | null;
-            objtype: "n" | "r" | "f" | "S" | "T";
+            objtype: "r" | "S" | "f" | "T" | "n";
             grantee: string;
         }[];
     };
 }
-export declare function extractRoles(sql: Sql): Promise<Role[]>;
+export declare function extractRoles(pool: Pool): Promise<Role[]>;
 export {};

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

@@ -1,3 +1,4 @@
+import { sql } from "@ts-safeql/sql-tag";
 import z from "zod";
 import { BasePgModel } from "../base.model.js";
 const membershipInfoSchema = z.object({
@@ -104,11 +105,9 @@ export class Role extends BasePgModel {
         };
     }
 }
-export async function extractRoles(sql) {
-    return sql.begin(async (sql) => {
-        await sql `set search_path = ''`;
-        // Check PostgreSQL version capabilities for membership options
-        const [capabilities] = await sql `
+export async function extractRoles(pool) {
+    // Check PostgreSQL version capabilities for membership options
+    const { rows: capabilitiesRows } = await pool.query(sql `
       select
         exists (
           select 1
@@ -122,23 +121,25 @@ export async function extractRoles(sql) {
           where attrelid = 'pg_auth_members'::regclass
             and attname = 'set_option'
         ) as has_set
-    `;
-        const roleRows = capabilities?.has_inherit && capabilities?.has_set
-            ? await sql `
+  `);
+    const capabilities = capabilitiesRows[0];
+    let roleRows;
+    if (capabilities?.has_inherit && capabilities?.has_set) {
+        const result = await pool.query(sql `
           WITH role_memberships AS (
-            SELECT 
+            SELECT
               r.rolname AS role_name,
               json_agg(
                 json_build_object(
                   'member',   m.rolname,
                   'grantor',  g.rolname,
                   'admin_option',   am.admin_option,
-                  'inherit_option', am.inherit_option,   -- PG16+
-                  'set_option',     am.set_option        -- PG16+
+                  'inherit_option', am.inherit_option,
+                  'set_option',     am.set_option
                 )
               ) FILTER (WHERE m.rolname IS NOT NULL) AS members
             FROM pg_catalog.pg_roles r
-            LEFT JOIN pg_auth_members am ON am.roleid = r.oid       -- roles that are members of this role
+            LEFT JOIN pg_auth_members am ON am.roleid = r.oid
             LEFT JOIN pg_roles m          ON m.oid = am.member
             LEFT JOIN pg_roles g          ON g.oid = am.grantor
             GROUP BY r.rolname
@@ -201,9 +202,7 @@ export async function extractRoles(sql) {
           FROM pg_catalog.pg_roles r
           LEFT JOIN role_memberships rm ON rm.role_name = r.rolname
           WHERE
-            -- 1) drop built-in/internal roles (anything starting with pg_)
             r.rolname !~ '^pg_'
-            -- 2) drop roles directly tracked as extension members in pg_shdepend (if any)
             AND NOT EXISTS (
               SELECT 1
               FROM pg_catalog.pg_shdepend d
@@ -212,24 +211,26 @@ export async function extractRoles(sql) {
                 AND d.refclassid  = 'pg_extension'::regclass
                 AND d.deptype     IN ('e','x')
             )
-          ORDER BY 1;
-      `
-            : await sql `
+          ORDER BY 1
+    `);
+        roleRows = result.rows;
+    }
+    else {
+        const result = await pool.query(sql `
           WITH role_memberships AS (
-            SELECT 
+            SELECT
               r.rolname AS role_name,
               json_agg(
                 json_build_object(
                   'member',         m.rolname,
                   'grantor',        g.rolname,
                   'admin_option',   am.admin_option,
-                  -- PG15: these columns don't exist; emit them as nulls
                   'inherit_option', NULL,
                   'set_option',     NULL
                 )
               ) FILTER (WHERE m.rolname IS NOT NULL) AS members
             FROM pg_catalog.pg_roles r
-            LEFT JOIN pg_auth_members am ON am.roleid = r.oid       -- roles that are members of this role
+            LEFT JOIN pg_auth_members am ON am.roleid = r.oid
             LEFT JOIN pg_roles m          ON m.oid = am.member
             LEFT JOIN pg_roles g          ON g.oid = am.grantor
             GROUP BY r.rolname
@@ -292,9 +293,7 @@ export async function extractRoles(sql) {
           FROM pg_catalog.pg_roles r
           LEFT JOIN role_memberships rm ON rm.role_name = r.rolname
           WHERE
-            -- drop built-in/internal roles
             r.rolname !~ '^pg_'
-            -- drop roles directly tracked as extension members in pg_shdepend (if any)
             AND NOT EXISTS (
               SELECT 1
               FROM pg_catalog.pg_shdepend d
@@ -303,10 +302,11 @@ export async function extractRoles(sql) {
                 AND d.refclassid  = 'pg_extension'::regclass
                 AND d.deptype     IN ('e','x')
             )
-          ORDER BY 1;
-      `;
-        // Validate and parse each row using the Zod schema
-        const validatedRows = roleRows.map((row) => rolePropsSchema.parse(row));
-        return validatedRows.map((row) => new Role(row));
-    });
+          ORDER BY 1
+    `);
+        roleRows = result.rows;
+    }
+    // Validate and parse each row using the Zod schema
+    const validatedRows = roleRows.map((row) => rolePropsSchema.parse(row));
+    return validatedRows.map((row) => new Role(row));
 }

package/dist/core/objects/rule/rule.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 RuleEnabledStateSchema: z.ZodEnum<{
@@ -13,10 +13,10 @@ declare const rulePropsSchema: z.ZodObject<{
     table_name: z.ZodString;
     relation_kind: z.ZodEnum<{
         r: "r";
+        f: "f";
         v: "v";
         m: "m";
         p: "p";
-        f: "f";
     }>;
     event: z.ZodEnum<{
         DELETE: "DELETE";
@@ -68,5 +68,5 @@ export declare class Rule extends BasePgModel {
     };
     get relationStableId(): string;
 }
-export declare function extractRules(sql: Sql): Promise<Rule[]>;
+export declare function extractRules(pool: Pool): Promise<Rule[]>;
 export {};

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

@@ -1,3 +1,4 @@
+import { sql } from "@ts-safeql/sql-tag";
 import z from "zod";
 import { BasePgModel } from "../base.model.js";
 import { stableId } from "../utils.js";
@@ -81,10 +82,8 @@ export class Rule extends BasePgModel {
         }
     }
 }
-export async function extractRules(sql) {
-    return sql.begin(async (sql) => {
-        await sql `set search_path = ''`;
-        const ruleRows = await sql `
+export async function extractRules(pool) {
+    const { rows: ruleRows } = await pool.query(sql `
       WITH extension_rule_oids AS (
         SELECT
           objid
@@ -148,9 +147,8 @@ export async function extractRules(sql) {
         AND e_rel.objid IS NULL
         AND r.rulename <> '_RETURN'
       ORDER BY
-        1, 3, 2;
-    `;
-        const validatedRows = ruleRows.map((row) => rulePropsSchema.parse(row));
-        return validatedRows.map((row) => new Rule(row));
-    });
+        1, 3, 2
+  `);
+    const validatedRows = ruleRows.map((row) => rulePropsSchema.parse(row));
+    return validatedRows.map((row) => new Rule(row));
 }

package/dist/core/objects/schema/schema.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";
@@ -43,5 +43,5 @@ export declare class Schema extends BasePgModel {
         }[];
     };
 }
-export declare function extractSchemas(sql: Sql): Promise<Schema[]>;
+export declare function extractSchemas(pool: Pool): Promise<Schema[]>;
 export {};

package/dist/core/objects/schema/schema.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";
@@ -44,10 +45,8 @@ export class Schema extends BasePgModel {
         };
     }
 }
-export async function extractSchemas(sql) {
-    return sql.begin(async (sql) => {
-        await sql `set search_path = ''`;
-        const schemaRows = await sql `
+export async function extractSchemas(pool) {
+    const { rows: schemaRows } = await pool.query(sql `
     with extension_oids as (
       select
         objid
@@ -82,10 +81,9 @@ export async function extractSchemas(sql) {
       and e.objid is null
       -- </EXCLUDE_INTERNAL>
     order by
-      1;
-  `;
-        // Validate and parse each row using the Zod schema
-        const validatedRows = schemaRows.map((row) => schemaPropsSchema.parse(row));
-        return validatedRows.map((row) => new Schema(row));
-    });
+      1
+  `);
+    // Validate and parse each row using the Zod schema
+    const validatedRows = schemaRows.map((row) => schemaPropsSchema.parse(row));
+    return validatedRows.map((row) => new Schema(row));
 }

package/dist/core/objects/sequence/sequence.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";
@@ -72,5 +72,5 @@ export declare class Sequence extends BasePgModel {
         owner: string;
     };
 }
-export declare function extractSequences(sql: Sql): Promise<Sequence[]>;
+export declare function extractSequences(pool: Pool): Promise<Sequence[]>;
 export {};

package/dist/core/objects/sequence/sequence.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";
@@ -85,10 +86,8 @@ export class Sequence extends BasePgModel {
         };
     }
 }
-export async function extractSequences(sql) {
-    return sql.begin(async (sql) => {
-        await sql `set search_path = ''`;
-        const sequenceRows = await sql `
+export async function extractSequences(pool) {
+    const { rows: sequenceRows } = await pool.query(sql `
 with extension_sequence_oids as (
   select
     objid
@@ -160,10 +159,9 @@ from
       and di.deptype = 'i'
   )
 order by
-  1, 2;
-  `;
-        // Validate and parse each row using the Zod schema
-        const validatedRows = sequenceRows.map((row) => sequencePropsSchema.parse(row));
-        return validatedRows.map((row) => new Sequence(row));
-    });
+  1, 2
+  `);
+    // Validate and parse each row using the Zod schema
+    const validatedRows = sequenceRows.map((row) => sequencePropsSchema.parse(row));
+    return validatedRows.map((row) => new Sequence(row));
 }

package/dist/core/objects/subscription/subscription.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 subscriptionPropsSchema: z.ZodObject<{
@@ -76,5 +76,5 @@ export declare class Subscription extends BasePgModel {
         origin: "any" | "none";
     };
 }
-export declare function extractSubscriptions(sql: Sql): Promise<Subscription[]>;
+export declare function extractSubscriptions(pool: Pool): Promise<Subscription[]>;
 export {};