@typed-sql/postgres 2.0.0 → 2.1.0

package/dist/packages/postgres/src/prepared.d.ts

@@ -1,20 +1,22 @@
-import { type Query, type QueryRenderSkeleton, type RenderedQuery, type SqlRenderer } from "@typed-sql/core";
+import { PreparedQueryRenderCache, type Query, type RenderedQuery, type SqlRenderer } from "@typed-sql/core";
 export interface PostgresPreparedQueryFactory<Arguments extends readonly unknown[], Row, Params extends readonly unknown[]> {
     (...args: Arguments): Query<Row, Params>;
     readonly statementName: string;
 }
 export interface PostgresPreparedQueryMetadata {
+    readonly logicalStatementName: string;
     readonly statementName: string;
     readonly rendered: RenderedQuery;
 }
 interface PreparedStatement {
-    skeleton: QueryRenderSkeleton | undefined;
+    readonly variants: PreparedQueryRenderCache;
 }
 export interface PostgresPreparedQueryState {
+    readonly variantCapacity: number;
     readonly statements: Map<string, PreparedStatement>;
     readonly queries: WeakMap<object, PostgresPreparedQueryMetadata>;
 }
-export declare function createPostgresPreparedQueryState(): PostgresPreparedQueryState;
+export declare function createPostgresPreparedQueryState(variantCapacity?: number): PostgresPreparedQueryState;
 export declare function preparePostgresQuery<Arguments extends readonly unknown[], Row, Params extends readonly unknown[]>(state: PostgresPreparedQueryState, renderer: SqlRenderer, statementName: string, factory: (...args: Arguments) => Query<Row, Params>): PostgresPreparedQueryFactory<Arguments, Row, Params>;
 export {};
 //# sourceMappingURL=prepared.d.ts.map

package/dist/packages/postgres/src/prepared.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prepared.d.ts","sourceRoot":"","sources":["../../../../src/prepared.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,KAAK,EACV,KAAK,mBAAmB,EACxB,KAAK,aAAa,EAClB,KAAK,WAAW,EACjB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,WAAW,4BAA4B,CAC3C,SAAS,SAAS,SAAS,OAAO,EAAE,EACpC,GAAG,EACH,MAAM,SAAS,SAAS,OAAO,EAAE;IAEjC,CAAC,GAAG,IAAI,EAAE,SAAS,GAAG,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACzC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;CAChC;AAED,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,QAAQ,EAAE,aAAa,CAAC;CAClC;AAED,UAAU,iBAAiB;IACzB,QAAQ,EAAE,mBAAmB,GAAG,SAAS,CAAC;CAC3C;AAED,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IACpD,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,EAAE,6BAA6B,CAAC,CAAC;CAClE;AAED,wBAAgB,gCAAgC,IAAI,0BAA0B,CAK7E;AAQD,wBAAgB,oBAAoB,CAAC,SAAS,SAAS,SAAS,OAAO,EAAE,EAAE,GAAG,EAAE,MAAM,SAAS,SAAS,OAAO,EAAE,EAC/G,KAAK,EAAE,0BAA0B,EACjC,QAAQ,EAAE,WAAW,EACrB,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,SAAS,KAAK,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,GAClD,4BAA4B,CAAC,SAAS,EAAE,GAAG,EAAE,MAAM,CAAC,CAwCtD"}
+{"version":3,"file":"prepared.d.ts","sourceRoot":"","sources":["../../../../src/prepared.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,wBAAwB,EACxB,KAAK,KAAK,EACV,KAAK,aAAa,EAClB,KAAK,WAAW,EACjB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,WAAW,4BAA4B,CAC3C,SAAS,SAAS,SAAS,OAAO,EAAE,EACpC,GAAG,EACH,MAAM,SAAS,SAAS,OAAO,EAAE;IAEjC,CAAC,GAAG,IAAI,EAAE,SAAS,GAAG,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACzC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;CAChC;AAED,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACtC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,QAAQ,EAAE,aAAa,CAAC;CAClC;AAED,UAAU,iBAAiB;IACzB,QAAQ,CAAC,QAAQ,EAAE,wBAAwB,CAAC;CAC7C;AAED,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IACpD,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,EAAE,6BAA6B,CAAC,CAAC;CAClE;AAED,wBAAgB,gCAAgC,CAC9C,eAAe,SAA4C,GAC1D,0BAA0B,CAQ5B;AAcD,wBAAgB,oBAAoB,CAAC,SAAS,SAAS,SAAS,OAAO,EAAE,EAAE,GAAG,EAAE,MAAM,SAAS,SAAS,OAAO,EAAE,EAC/G,KAAK,EAAE,0BAA0B,EACjC,QAAQ,EAAE,WAAW,EACrB,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,SAAS,KAAK,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,GAClD,4BAA4B,CAAC,SAAS,EAAE,GAAG,EAAE,MAAM,CAAC,CAwCtD"}

package/dist/packages/postgres/src/prepared.js

@@ -1,10 +1,20 @@
-import { bindQueryRenderSkeleton, compileQueryRenderSkeleton, } from "@typed-sql/core";
-export function createPostgresPreparedQueryState() {
+import { createHash } from "node:crypto";
+import { DEFAULT_MAX_PREPARED_CARDINALITY_VARIANTS, PreparedQueryRenderCache, } from "@typed-sql/core";
+export function createPostgresPreparedQueryState(variantCapacity = DEFAULT_MAX_PREPARED_CARDINALITY_VARIANTS) {
+    // Validate eagerly even when no prepared factory is registered.
+    new PreparedQueryRenderCache(variantCapacity);
     return {
+        variantCapacity,
         statements: new Map(),
         queries: new WeakMap(),
     };
 }
+function physicalStatementName(statementName, text, primary) {
+    if (primary)
+        return statementName;
+    const fingerprint = createHash("sha256").update(`${statementName}\0${text}`).digest("hex").slice(0, 56);
+    return `tsqlv_${fingerprint}`;
+}
 function validateStatementName(statementName) {
     if (typeof statementName !== "string" || statementName.length === 0 || statementName.includes("\0")) {
         throw new TypeError("Prepared statement names must be non-empty and cannot contain NUL");
@@ -15,31 +25,29 @@ export function preparePostgresQuery(state, renderer, statementName, factory) {
     if (state.statements.has(statementName)) {
         throw new TypeError(`Prepared statement name ${JSON.stringify(statementName)} is already registered`);
     }
-    const statement = { skeleton: undefined };
+    const statement = { variants: new PreparedQueryRenderCache(state.variantCapacity) };
     state.statements.set(statementName, statement);
     const prepared = (...args) => {
         const query = factory(...args);
         const existing = state.queries.get(query);
-        if (existing !== undefined && existing.statementName !== statementName) {
+        if (existing !== undefined && existing.logicalStatementName !== statementName) {
             throw new TypeError(`A query cannot use both prepared statement ${JSON.stringify(existing.statementName)} and ${JSON.stringify(statementName)}`);
         }
         let rendered = existing?.rendered;
-        const skeleton = statement.skeleton;
+        let physicalName = existing?.statementName;
         if (rendered === undefined) {
-            if (skeleton === undefined) {
-                const compiled = compileQueryRenderSkeleton(query, renderer);
-                statement.skeleton = compiled.skeleton;
-                rendered = compiled.rendered;
-            }
-            else {
-                rendered = bindQueryRenderSkeleton(query, skeleton);
+            const variant = statement.variants.bind(query, renderer);
+            rendered = variant?.rendered;
+            if (variant !== undefined) {
+                physicalName = physicalStatementName(statementName, variant.rendered.text, variant.primary);
             }
         }
-        if (rendered === undefined) {
+        if (rendered === undefined || physicalName === undefined) {
             throw new TypeError(`Prepared statement ${JSON.stringify(statementName)} must always render the same SQL text and structure`);
         }
-        if (existing === undefined)
-            state.queries.set(query, { statementName, rendered });
+        if (existing === undefined) {
+            state.queries.set(query, { logicalStatementName: statementName, statementName: physicalName, rendered });
+        }
         return query;
     };
     return Object.freeze(Object.assign(prepared, { statementName }));

package/dist/packages/postgres/src/prepared.js.map

@@ -1 +1 @@
-{"version":3,"file":"prepared.js","sourceRoot":"","sources":["../../../../src/prepared.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EACvB,0BAA0B,GAK3B,MAAM,iBAAiB,CAAC;AAyBzB,MAAM,UAAU,gCAAgC;IAC9C,OAAO;QACL,UAAU,EAAE,IAAI,GAAG,EAAE;QACrB,OAAO,EAAE,IAAI,OAAO,EAAE;KACvB,CAAC;AACJ,CAAC;AAED,SAAS,qBAAqB,CAAC,aAAqB;IAClD,IAAI,OAAO,aAAa,KAAK,QAAQ,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,IAAI,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACpG,MAAM,IAAI,SAAS,CAAC,mEAAmE,CAAC,CAAC;IAC3F,CAAC;AACH,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,KAAiC,EACjC,QAAqB,EACrB,aAAqB,EACrB,OAAmD;IAEnD,qBAAqB,CAAC,aAAa,CAAC,CAAC;IACrC,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;QACxC,MAAM,IAAI,SAAS,CAAC,2BAA2B,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,wBAAwB,CAAC,CAAC;IACxG,CAAC;IAED,MAAM,SAAS,GAAsB,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;IAC7D,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;IAE/C,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAe,EAAsB,EAAE;QAC1D,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;QAC/B,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC1C,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,CAAC,aAAa,KAAK,aAAa,EAAE,CAAC;YACvE,MAAM,IAAI,SAAS,CACjB,8CAA8C,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,CAC5H,CAAC;QACJ,CAAC;QAED,IAAI,QAAQ,GAAG,QAAQ,EAAE,QAAQ,CAAC;QAClC,MAAM,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC;QACpC,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;gBAC3B,MAAM,QAAQ,GAAG,0BAA0B,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;gBAC7D,SAAS,CAAC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;gBACvC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;YAC/B,CAAC;iBAAM,CAAC;gBACN,QAAQ,GAAG,uBAAuB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YACtD,CAAC;QACH,CAAC;QACD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,MAAM,IAAI,SAAS,CACjB,sBAAsB,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,qDAAqD,CACzG,CAAC;QACJ,CAAC;QAED,IAAI,QAAQ,KAAK,SAAS;YAAE,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,aAAa,EAAE,QAAQ,EAAE,CAAC,CAAC;QAClF,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;IAEF,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC;AACnE,CAAC"}
+{"version":3,"file":"prepared.js","sourceRoot":"","sources":["../../../../src/prepared.ts"],"names":[],"mappings":"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"}

package/dist/packages/postgres/src/provider.d.ts

@@ -1,4 +1,5 @@
-import type { SchemaInput, SchemaProvider, SchemaSnapshot } from "@typed-sql/schema";
+import type { SchemaInput, SchemaProvider, SchemaSnapshotV2 } from "@typed-sql/schema";
+import { type PostgresExtensionManifest } from "./extensions.js";
 import { type PostgresTypePolicy } from "./type-policy.js";
 export interface PostgresQueryResult<Row> {
     readonly rows: readonly Row[];
@@ -24,23 +25,60 @@ export interface PostgresSchemaProviderOptions {
     readonly pool?: PostgresIntrospectionPool;
     readonly includeSchemas?: readonly string[];
     readonly typePolicy?: PostgresTypePolicy;
+    readonly extensionManifests?: readonly PostgresExtensionManifest[];
 }
 export declare const postgresCatalogQueries: {
-    readonly version: "SELECT current_setting('server_version') AS server_version";
+    readonly version: `
+    SELECT current_setting('server_version') AS server_version,
+           current_setting('standard_conforming_strings') AS standard_conforming_strings,
+           current_setting('search_path') AS search_path,
+           ARRAY(SELECT extname || ':' || extversion FROM pg_catalog.pg_extension ORDER BY extname) AS extensions
+  `;
+    readonly relations: `
+    SELECT
+      n.nspname AS schema_name,
+      c.relname AS table_name,
+      c.relkind AS relation_kind,
+      c.relispartition AS is_partition,
+      pn.nspname AS partition_parent_schema,
+      pc.relname AS partition_parent_table,
+      pt.partstrat AS partition_strategy
+    FROM pg_catalog.pg_class AS c
+    JOIN pg_catalog.pg_namespace AS n ON n.oid = c.relnamespace
+    LEFT JOIN pg_catalog.pg_inherits AS inh ON inh.inhrelid = c.oid AND c.relispartition
+    LEFT JOIN pg_catalog.pg_class AS pc ON pc.oid = inh.inhparent
+    LEFT JOIN pg_catalog.pg_namespace AS pn ON pn.oid = pc.relnamespace
+    LEFT JOIN pg_catalog.pg_partitioned_table AS pt ON pt.partrelid = c.oid
+    WHERE c.relkind IN ('r', 'p', 'v', 'm', 'f')
+      AND n.nspname NOT IN ('pg_catalog', 'information_schema')
+      AND n.nspname NOT LIKE 'pg_toast%'
+      AND ($1::text[] IS NULL OR n.nspname = ANY($1::text[]))
+    ORDER BY n.nspname, c.relname
+  `;
     readonly columns: `
     SELECT
       n.nspname AS schema_name,
       c.relname AS table_name,
       a.attname AS column_name,
+      (a.attnum - 1) AS column_position,
+      c.relkind AS relation_kind,
       format_type(a.atttypid, a.atttypmod) AS database_type,
+      'pg:' || a.atttypid::text AS type_identity,
       a.attnotnull AS not_null,
       (t.typcategory = 'A') AS is_array,
-      pg_get_expr(ad.adbin, ad.adrelid) AS default_expression
+      pg_get_expr(ad.adbin, ad.adrelid) AS default_expression,
+      a.attgenerated AS generated_kind,
+      a.attidentity AS identity_kind,
+      CASE WHEN a.attcollation = 0 THEN NULL ELSE quote_ident(cn.nspname) || '.' || quote_ident(coll.collname) END AS collation_name,
+      ((pg_relation_is_updatable(c.oid, true) & 8) = 8 AND a.attgenerated = '') AS insertable,
+      ((pg_relation_is_updatable(c.oid, true) & 4) = 4 AND a.attgenerated = '') AS updatable
     FROM pg_catalog.pg_attribute AS a
     JOIN pg_catalog.pg_class AS c ON c.oid = a.attrelid
     JOIN pg_catalog.pg_namespace AS n ON n.oid = c.relnamespace
     JOIN pg_catalog.pg_type AS t ON t.oid = a.atttypid
     LEFT JOIN pg_catalog.pg_attrdef AS ad ON ad.adrelid = a.attrelid AND ad.adnum = a.attnum
+    LEFT JOIN pg_catalog.pg_collation AS coll ON coll.oid = a.attcollation
+    LEFT JOIN pg_catalog.pg_namespace AS cn ON cn.oid = coll.collnamespace
     WHERE a.attnum > 0
       AND NOT a.attisdropped
       AND c.relkind IN ('r', 'p', 'v', 'm', 'f')
@@ -50,7 +88,8 @@ export declare const postgresCatalogQueries: {
     ORDER BY n.nspname, c.relname, a.attnum
   `;
     readonly enums: `
-    SELECT n.nspname AS schema_name, t.typname AS type_name, e.enumlabel AS enum_label
+    SELECT n.nspname AS schema_name, t.typname AS type_name, e.enumlabel AS enum_label,
+           e.enumsortorder::double precision AS enum_position
     FROM pg_catalog.pg_type AS t
     JOIN pg_catalog.pg_namespace AS n ON n.oid = t.typnamespace
     JOIN pg_catalog.pg_enum AS e ON e.enumtypid = t.oid
@@ -62,8 +101,15 @@ export declare const postgresCatalogQueries: {
     SELECT
       n.nspname AS schema_name,
       t.typname AS domain_name,
+      'pg:' || t.oid::text AS type_identity,
       format_type(t.typbasetype, t.typtypmod) AS database_type,
-      t.typnotnull AS not_null
+      t.typnotnull AS not_null,
+      ARRAY(
+        SELECT pg_get_constraintdef(con.oid, true)
+        FROM pg_catalog.pg_constraint AS con
+        WHERE con.contypid = t.oid
+        ORDER BY con.conname
+      ) AS check_expressions
     FROM pg_catalog.pg_type AS t
     JOIN pg_catalog.pg_namespace AS n ON n.oid = t.typnamespace
     WHERE t.typtype = 'd'
@@ -75,27 +121,119 @@ export declare const postgresCatalogQueries: {
     SELECT
       n.nspname AS schema_name,
       p.proname AS function_name,
+      'pg:' || p.oid::text AS routine_identity,
+      p.prokind AS routine_kind,
       ARRAY(
         SELECT format_type(argument_oid, NULL)
-        FROM unnest(p.proargtypes::oid[]) WITH ORDINALITY AS arguments(argument_oid, position)
+        FROM unnest(COALESCE(p.proallargtypes, p.proargtypes::oid[])) WITH ORDINALITY AS arguments(argument_oid, position)
         ORDER BY position
       ) AS argument_types,
+      COALESCE(p.proargnames, ARRAY[]::text[]) AS argument_names,
+      ARRAY(
+        SELECT mode::text
+        FROM unnest(COALESCE(p.proargmodes, ARRAY[]::"char"[])) WITH ORDINALITY AS modes(mode, position)
+        ORDER BY position
+      ) AS argument_modes,
+      p.pronargdefaults AS argument_defaults,
       format_type(p.prorettype, NULL) AS database_return_type,
       p.proretset AS set_returning,
-      p.provolatile AS volatility
+      p.provolatile AS volatility,
+      p.proisstrict AS strict,
+      p.proparallel AS parallel_safety
     FROM pg_catalog.pg_proc AS p
     JOIN pg_catalog.pg_namespace AS n ON n.oid = p.pronamespace
-    WHERE p.prokind = 'f'
+    WHERE p.prokind IN ('f', 'p', 'a', 'w')
       AND n.nspname NOT IN ('pg_catalog', 'information_schema')
       AND ($1::text[] IS NULL OR n.nspname = ANY($1::text[]))
     ORDER BY n.nspname, p.proname, p.oid
   `;
+    readonly constraints: (serverMajor: number) => string;
+    readonly indexes: `
+    SELECT
+      n.nspname AS schema_name,
+      c.relname AS table_name,
+      ic.relname AS index_name,
+      i.indisunique AS unique,
+      am.amname AS method,
+      ARRAY(
+        SELECT CASE WHEN keys.attnum = 0 THEN NULL ELSE a.attname::text END
+        FROM unnest(i.indkey::smallint[]) WITH ORDINALITY AS keys(attnum, position)
+        LEFT JOIN pg_catalog.pg_attribute AS a ON a.attrelid = i.indrelid AND a.attnum = keys.attnum
+        WHERE keys.position <= i.indnkeyatts ORDER BY keys.position
+      ) AS key_columns,
+      ARRAY(
+        SELECT CASE WHEN keys.attnum = 0 THEN pg_get_indexdef(i.indexrelid, keys.position::int, true) ELSE NULL END
+        FROM unnest(i.indkey::smallint[]) WITH ORDINALITY AS keys(attnum, position)
+        WHERE keys.position <= i.indnkeyatts ORDER BY keys.position
+      ) AS key_expressions,
+      ARRAY(SELECT ((i.indoption[position - 1] & 1) = 1) FROM generate_series(1, i.indnkeyatts) AS position)
+        AS descending,
+      ARRAY(SELECT ((i.indoption[position - 1] & 2) = 2) FROM generate_series(1, i.indnkeyatts) AS position)
+        AS nulls_first,
+      ARRAY(
+        SELECT opc.opcname::text FROM unnest(i.indclass::oid[]) WITH ORDINALITY AS classes(oid, position)
+        JOIN pg_catalog.pg_opclass AS opc ON opc.oid = classes.oid ORDER BY classes.position
+      ) AS operator_classes,
+      ARRAY(
+        SELECT CASE WHEN collations.oid = 0 THEN NULL ELSE coll.collname::text END
+        FROM unnest(i.indcollation::oid[]) WITH ORDINALITY AS collations(oid, position)
+        LEFT JOIN pg_catalog.pg_collation AS coll ON coll.oid = collations.oid ORDER BY collations.position
+      ) AS collations,
+      ARRAY(
+        SELECT a.attname::text FROM unnest(i.indkey::smallint[]) WITH ORDINALITY AS keys(attnum, position)
+        JOIN pg_catalog.pg_attribute AS a ON a.attrelid = i.indrelid AND a.attnum = keys.attnum
+        WHERE keys.position > i.indnkeyatts ORDER BY keys.position
+      ) AS included_columns,
+      pg_get_expr(i.indpred, i.indrelid) AS predicate_expression,
+      i.indisvalid AS valid
+    FROM pg_catalog.pg_index AS i
+    JOIN pg_catalog.pg_class AS c ON c.oid = i.indrelid
+    JOIN pg_catalog.pg_namespace AS n ON n.oid = c.relnamespace
+    JOIN pg_catalog.pg_class AS ic ON ic.oid = i.indexrelid
+    JOIN pg_catalog.pg_am AS am ON am.oid = ic.relam
+    WHERE n.nspname NOT IN ('pg_catalog', 'information_schema')
+      AND ($1::text[] IS NULL OR n.nspname = ANY($1::text[]))
+    ORDER BY n.nspname, c.relname, ic.relname
+  `;
+    readonly composites: `
+    SELECT n.nspname AS schema_name, t.typname AS type_name, 'pg:' || t.oid::text AS type_identity,
+           a.attname AS field_name, 'pg:' || a.atttypid::text AS field_type_identity,
+           format_type(a.atttypid, a.atttypmod) AS field_database_type, a.attnotnull AS field_not_null,
+           a.attnum AS field_position
+    FROM pg_catalog.pg_type AS t
+    JOIN pg_catalog.pg_namespace AS n ON n.oid = t.typnamespace
+    JOIN pg_catalog.pg_class AS c ON c.oid = t.typrelid
+    JOIN pg_catalog.pg_attribute AS a ON a.attrelid = c.oid AND a.attnum > 0 AND NOT a.attisdropped
+    WHERE t.typtype = 'c' AND c.relkind = 'c'
+      AND n.nspname NOT IN ('pg_catalog', 'information_schema')
+      AND ($1::text[] IS NULL OR n.nspname = ANY($1::text[]))
+    ORDER BY n.nspname, t.typname, a.attnum
+  `;
+    readonly ranges: `
+    SELECT n.nspname AS schema_name, t.typname AS type_name, 'pg:' || t.oid::text AS type_identity,
+           format_type(t.oid, NULL) AS database_type, 'pg:' || r.rngsubtype::text AS subtype_identity, false AS multirange
+    FROM pg_catalog.pg_range AS r
+    JOIN pg_catalog.pg_type AS t ON t.oid = r.rngtypid
+    JOIN pg_catalog.pg_namespace AS n ON n.oid = t.typnamespace
+    WHERE n.nspname NOT IN ('pg_catalog', 'information_schema')
+      AND ($1::text[] IS NULL OR n.nspname = ANY($1::text[]))
+    UNION ALL
+    SELECT n.nspname AS schema_name, t.typname AS type_name, 'pg:' || t.oid::text AS type_identity,
+           format_type(t.oid, NULL) AS database_type, 'pg:' || r.rngsubtype::text AS subtype_identity, true AS multirange
+    FROM pg_catalog.pg_range AS r
+    JOIN pg_catalog.pg_type AS t ON t.oid = r.rngmultitypid
+    JOIN pg_catalog.pg_namespace AS n ON n.oid = t.typnamespace
+    WHERE r.rngmultitypid <> 0
+      AND n.nspname NOT IN ('pg_catalog', 'information_schema')
+      AND ($1::text[] IS NULL OR n.nspname = ANY($1::text[]))
+    ORDER BY schema_name, type_name
+  `;
 };
 export declare function loadPostgresDriver(importer?: PostgresDriverImporter): Promise<PostgresDriverModule>;
-export declare class PostgresSchemaProvider implements SchemaProvider {
+export declare class PostgresSchemaProvider implements SchemaProvider<SchemaSnapshotV2> {
     #private;
     constructor(options?: PostgresSchemaProviderOptions);
-    introspect(input: SchemaInput): Promise<SchemaSnapshot>;
+    introspect(input: SchemaInput): Promise<SchemaSnapshotV2>;
 }
-export declare function introspectPostgres(input: SchemaInput, options?: PostgresSchemaProviderOptions): Promise<SchemaSnapshot>;
+export declare function introspectPostgres(input: SchemaInput, options?: PostgresSchemaProviderOptions): Promise<SchemaSnapshotV2>;
 //# sourceMappingURL=provider.d.ts.map

package/dist/packages/postgres/src/provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../../../src/provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAIV,WAAW,EACX,cAAc,EACd,cAAc,EAEf,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAA8C,KAAK,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAEvG,MAAM,WAAW,mBAAmB,CAAC,GAAG;IACtC,QAAQ,CAAC,IAAI,EAAE,SAAS,GAAG,EAAE,CAAC;CAC/B;AAED,MAAM,WAAW,iBAAiB;IAChC,KAAK,CAAC,GAAG,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACvC,IAAI,EAAE,MAAM,EACZ,MAAM,CAAC,EAAE,SAAS,OAAO,EAAE,GAC1B,OAAO,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC;CACtC;AAED,MAAM,WAAW,2BAA4B,SAAQ,iBAAiB;IACpE,OAAO,IAAI,IAAI,CAAC;CACjB;AAED,MAAM,WAAW,yBAAyB;IACxC,OAAO,IAAI,OAAO,CAAC,2BAA2B,CAAC,CAAC;IAChD,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACtB;AAED,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,IAAI,EAAE,KAAK,MAAM,EAAE;QAAE,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAA;KAAE,KAAK,yBAAyB,CAAC;CACjG;AAED,MAAM,MAAM,sBAAsB,GAAG,MAAM,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAEzE,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,CAAC,MAAM,CAAC,EAAE,iBAAiB,CAAC;IACpC,QAAQ,CAAC,IAAI,CAAC,EAAE,yBAAyB,CAAC;IAC1C,QAAQ,CAAC,cAAc,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5C,QAAQ,CAAC,UAAU,CAAC,EAAE,kBAAkB,CAAC;CAC1C;AAsCD,eAAO,MAAM,sBAAsB;aACjC,OAAO,EAAE,4DAA4D;aACrE,OAAO,EAAE;;;;;;;;;;;;;;;;;;;;;GAqBR;aACD,KAAK,EAAE;;;;;;;;GAQN;aACD,OAAO,EAAE;;;;;;;;;;;;GAYR;aACD,SAAS,EAAE;;;;;;;;;;;;;;;;;;GAkBV;CACO,CAAC;AAWX,wBAAsB,kBAAkB,CACtC,QAAQ,GAAE,sBAA4F,GACrG,OAAO,CAAC,oBAAoB,CAAC,CAY/B;AA0CD,qBAAa,sBAAuB,YAAW,cAAc;;IAG3D,YAAY,OAAO,GAAE,6BAAkC,EAEtD;IAEK,UAAU,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,cAAc,CAAC,CA8E5D;CACF;AAED,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,WAAW,EAClB,OAAO,GAAE,6BAAkC,GAC1C,OAAO,CAAC,cAAc,CAAC,CAEzB"}
+{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../../../src/provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAOV,WAAW,EACX,cAAc,EAEd,gBAAgB,EAEjB,MAAM,mBAAmB,CAAC;AAK3B,OAAO,EAAwC,KAAK,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AACvG,OAAO,EAA8C,KAAK,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAGvG,MAAM,WAAW,mBAAmB,CAAC,GAAG;IACtC,QAAQ,CAAC,IAAI,EAAE,SAAS,GAAG,EAAE,CAAC;CAC/B;AAED,MAAM,WAAW,iBAAiB;IAChC,KAAK,CAAC,GAAG,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACvC,IAAI,EAAE,MAAM,EACZ,MAAM,CAAC,EAAE,SAAS,OAAO,EAAE,GAC1B,OAAO,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC;CACtC;AAED,MAAM,WAAW,2BAA4B,SAAQ,iBAAiB;IACpE,OAAO,IAAI,IAAI,CAAC;CACjB;AAED,MAAM,WAAW,yBAAyB;IACxC,OAAO,IAAI,OAAO,CAAC,2BAA2B,CAAC,CAAC;IAChD,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACtB;AAED,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,IAAI,EAAE,KAAK,MAAM,EAAE;QAAE,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAA;KAAE,KAAK,yBAAyB,CAAC;CACjG;AAED,MAAM,MAAM,sBAAsB,GAAG,MAAM,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAEzE,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,CAAC,MAAM,CAAC,EAAE,iBAAiB,CAAC;IACpC,QAAQ,CAAC,IAAI,CAAC,EAAE,yBAAyB,CAAC;IAC1C,QAAQ,CAAC,cAAc,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5C,QAAQ,CAAC,UAAU,CAAC,EAAE,kBAAkB,CAAC;IACzC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,SAAS,yBAAyB,EAAE,CAAC;CACpE;AA8HD,eAAO,MAAM,sBAAsB;aACjC,OAAO,EAAE;;;;;GAKR;aACD,SAAS,EAAE;;;;;;;;;;;;;;;;;;;;GAoBV;aACD,OAAO,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BR;aACD,KAAK,EAAE;;;;;;;;;GASN;aACD,OAAO,EAAE;;;;;;;;;;;;;;;;;;;GAmBR;aACD,SAAS,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BV;aACD,WAAW,gBAAc,MAAM,KAAG,MAAM;aA8CxC,OAAO,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8CR;aACD,UAAU,EAAE;;;;;;;;;;;;;GAaX;aACD,MAAM,EAAE;;;;;;;;;;;;;;;;;;GAkBP;CACO,CAAC;AA6DX,wBAAsB,kBAAkB,CACtC,QAAQ,GAAE,sBAA4F,GACrG,OAAO,CAAC,oBAAoB,CAAC,CAY/B;AA0CD,qBAAa,sBAAuB,YAAW,cAAc,CAAC,gBAAgB,CAAC;;IAG7E,YAAY,OAAO,GAAE,6BAAkC,EAEtD;IAEK,UAAU,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAmc9D;CACF;AAED,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,WAAW,EAClB,OAAO,GAAE,6BAAkC,GAC1C,OAAO,CAAC,gBAAgB,CAAC,CAE3B"}