@prisma-next/adapter-postgres 0.14.0-dev.39 → 0.14.0-dev.40

package/dist/control.d.mts

@@ -1,16 +1,14 @@
-import { SchemaDiffIssue } from "@prisma-next/framework-components/control";
 import { AnyQueryAst, DdlNode, LoweredStatement, LowererContext, MarkerReadResult, SqlExecuteRequest } from "@prisma-next/sql-relational-core/ast";
 import { parsePostgresDefault, parsePostgresDefault as parsePostgresDefault$1 } from "@prisma-next/target-postgres/default-normalizer";
 import { normalizeSchemaNativeType, normalizeSchemaNativeType as normalizeSchemaNativeType$1 } from "@prisma-next/target-postgres/native-type-normalizer";
 import { SqlEscapeError, escapeLiteral, qualifyName, quoteIdentifier } from "@prisma-next/target-postgres/sql-utils";
-import { PostgresSchemaIR } from "@prisma-next/target-postgres/types";
+import { PostgresDatabaseSchemaNode } from "@prisma-next/target-postgres/types";
 import { SqlControlAdapterDescriptor } from "@prisma-next/family-sql/control";
 import { PostgresDdlNode } from "@prisma-next/target-postgres/ddl";
 import { CodecRegistry } from "@prisma-next/framework-components/codec";
-import { SqlControlDriverInstance, SqlStorage } from "@prisma-next/sql-contract/types";
-import { Contract, ContractMarkerRecord, LedgerEntryRecord } from "@prisma-next/contract/types";
+import { SqlControlDriverInstance } from "@prisma-next/sql-contract/types";
+import { ContractMarkerRecord, LedgerEntryRecord } from "@prisma-next/contract/types";
 import { SqlControlAdapter } from "@prisma-next/family-sql/control-adapter";
-import { SqlSchemaIR } from "@prisma-next/sql-schema-ir/types";
 
 //#region src/core/codec-lookup.d.ts
 /**
@@ -43,7 +41,6 @@ declare class PostgresControlAdapter implements SqlControlAdapter<'postgres'> {
    * before comparison with contract native types.
    */
   readonly normalizeNativeType: typeof normalizeSchemaNativeType$1;
-  collectSchemaDiffIssues(contract: Contract<SqlStorage>, schema: SqlSchemaIR): readonly SchemaDiffIssue[];
   bootstrapControlTableQueries(): readonly DdlNode[];
   bootstrapSignMarkerQueries(): readonly DdlNode[];
   /**
@@ -151,7 +148,12 @@ declare class PostgresControlAdapter implements SqlControlAdapter<'postgres'> {
    * @param schema - Schema name to introspect when no contract is provided (defaults to 'public')
    * @returns Promise resolving to SqlSchemaIR representing the live database schema
    */
-  introspect(driver: SqlControlDriverInstance<'postgres'>, contract?: unknown, schema?: string): Promise<PostgresSchemaIR>;
+  introspect(driver: SqlControlDriverInstance<'postgres'>, contract?: unknown, schema?: string): Promise<PostgresDatabaseSchemaNode>;
+  /**
+   * Reads cluster-scoped database roles. Roles are not schema-qualified, so
+   * this is queried once for the whole database rather than per namespace.
+   */
+  private introspectRoles;
   /**
    * Lists every non-system schema present in the connected database.
    * The introspection consumer (`verifyPostgresNamespacePresence`)
@@ -162,16 +164,17 @@ declare class PostgresControlAdapter implements SqlControlAdapter<'postgres'> {
    */
   private listExistingSchemas;
   /**
-   * Walks every declared namespace, resolving `UNBOUND_NAMESPACE_ID` to
-   * the connection's `current_schema()`, and merges the per-schema results
-   * into a single `SqlSchemaIR`. The merged `tables` map is flat (keyed by
-   * table name) so callers that look up by `tableName` see every contract
-   * table regardless of which namespace it lives in.
+   * Resolves the declared namespace ids to their live DDL schema names,
+   * mapping `UNBOUND_NAMESPACE_ID` to the connection's `current_schema()`
+   * and de-duplicating. The caller introspects one namespace node per
+   * resolved schema — there is no flat cross-schema merge, so two schemas
+   * holding a same-named table no longer collide.
    */
-  private introspectNamespaces;
+  private resolveNamespaceSchemas;
   /**
-   * Introspects a single Postgres schema and returns a raw SqlSchemaIR
-   * containing only the tables in that schema. Used by `introspect` as
+   * Introspects a single Postgres schema and returns the namespace node for
+   * that schema (its tables, their policies, and its native enum type names),
+   * alongside the cluster-scoped Postgres version. Used by `introspect` as
    * the per-namespace walk.
    */
   private introspectSchema;

package/dist/control.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"control.d.mts","names":[],"sources":["../src/core/codec-lookup.ts","../src/core/control-adapter.ts","../src/exports/control.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;;;iBAWgB,gCAAA,IAAoC,aAAa;;;;;;;cCgGpD,sBAAA,YAAkC,iBAAA;EAAA,SACpC,QAAA;EAAA,SACA,QAAA;EAAA,iBAEQ,aAAA;cAEL,aAAA,EAAe,aAAA;;;;AAN7B;WAcW,gBAAA,SAAgB,sBAAA;;;;;;WAOhB,mBAAA,SAAmB,2BAAA;EAE5B,uBAAA,CACE,QAAA,EAAU,QAAA,CAAS,UAAA,GACnB,MAAA,EAAQ,WAAA,YACE,eAAA;EAsBZ,4BAAA,aAAyC,OAAA;EAIzC,0BAAA,aAAuC,OAAA;EAAA;;;;;;;;EAYvC,KAAA,CAAM,GAAA,EAAK,WAAA,GAAc,eAAA,EAAiB,OAAA,EAAS,cAAA,YAA0B,gBAAA;EAyB1E;;;;;;;EAHG,qBAAA,CACJ,GAAA,EAAK,WAAA,GAAc,eAAA,EACnB,OAAA,GAAU,cAAA,YACT,OAAA,CAAQ,iBAAA;EAmDoB;;;;;;;;EAxBzB,UAAA,CACJ,MAAA,EAAQ,wBAAA,cACR,KAAA,WACC,OAAA,CAAQ,oBAAA;EAKL,uBAAA,CACJ,MAAA,EAAQ,wBAAA,cACR,KAAA,WACC,OAAA,CAAQ,gBAAA;EA+MD;;;;;;EApMJ,cAAA,CACJ,MAAA,EAAQ,wBAAA,eACP,OAAA,CAAQ,WAAA,SAAoB,oBAAA;EAAA,QAKjB,oBAAA;EAjJgD;;;;;;EA0MxD,UAAA,CACJ,MAAA,EAAQ,wBAAA,cACR,KAAA,YACC,OAAA,UAAiB,iBAAA;EAAA,QAKN,gBAAA;EA5MF;;;;;EAgQN,YAAA,CACJ,MAAA,EAAQ,wBAAA,cACR,KAAA,UACA,WAAA;IAAA,SACW,WAAA;IAAA,SACA,WAAA;IAAA,SACA,UAAA;EAAA,IAEV,OAAA;EAoBG,UAAA,CACJ,MAAA,EAAQ,wBAAA,cACR,KAAA,UACA,WAAA;IAAA,SACW,WAAA;IAAA,SACA,WAAA;IAAA,SACA,UAAA;EAAA,IAEV,OAAA;EAtPoC;;;;EAyRjC,YAAA,CACJ,MAAA,EAAQ,wBAAA,cACR,KAAA,UACA,YAAA,UACA,WAAA;IAAA,SACW,WAAA;IAAA,SACA,WAAA;IAAA,SACA,UAAA;EAAA,IAEV,OAAA;EA/PI;;;;EA6RD,gBAAA,CACJ,MAAA,EAAQ,wBAAA,cACR,KAAA,UACA,KAAA;IAAA,SACW,MAAA;IAAA,SACA,IAAA;IAAA,SACA,EAAA;IAAA,SACA,aAAA;IAAA,SACA,aAAA;IAAA,SACA,UAAA;EAAA,IAEV,OAAA;EAAA,QAiBW,+BAAA;EAAA,QA0BA,gBAAA;EA7SJ;;;;;;;;;;;;;;;;;;;;;;;;EAuWJ,UAAA,CACJ,MAAA,EAAQ,wBAAA,cACR,QAAA,YACA,MAAA,YACC,OAAA,CAAQ,gBAAA;EA5NE;;;;;;;;EAAA,QAqPC,mBAAA;EAzND;;;;;;;EAAA,QA8OC,oBAAA;EApMD;;;;;EAAA,QAsPC,gBAAA;EAnNJ;;;EAAA,QA0uBI,kBAAA;AAAA;;;cC1rCV,yBAAA,EAA2B,2BAA2B"}
+{"version":3,"file":"control.d.mts","names":[],"sources":["../src/core/codec-lookup.ts","../src/core/control-adapter.ts","../src/exports/control.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;iBAWgB,gCAAA,IAAoC,aAAa;;;;;;;cCqFpD,sBAAA,YAAkC,iBAAA;EAAA,SACpC,QAAA;EAAA,SACA,QAAA;EAAA,iBAEQ,aAAA;cAEL,aAAA,EAAe,aAAA;;;;AAN7B;WAcW,gBAAA,SAAgB,sBAAA;;;;;;WAOhB,mBAAA,SAAmB,2BAAA;EAE5B,4BAAA,aAAyC,OAAA;EAIzC,0BAAA,aAAuC,OAAA;EAYY;;;;;;;;EAAnD,KAAA,CAAM,GAAA,EAAK,WAAA,GAAc,eAAA,EAAiB,OAAA,EAAS,cAAA,YAA0B,gBAAA;EAuD1E;;;;;;;EAjCG,qBAAA,CACJ,GAAA,EAAK,WAAA,GAAc,eAAA,EACnB,OAAA,GAAU,cAAA,YACT,OAAA,CAAQ,iBAAA;EAkHD;;;;;;;;EAvFJ,UAAA,CACJ,MAAA,EAAQ,wBAAA,cACR,KAAA,WACC,OAAA,CAAQ,oBAAA;EAKL,uBAAA,CACJ,MAAA,EAAQ,wBAAA,cACR,KAAA,WACC,OAAA,CAAQ,gBAAA;EAgQR;;;;;;EArPG,cAAA,CACJ,MAAA,EAAQ,wBAAA,eACP,OAAA,CAAQ,WAAA,SAAoB,oBAAA;EAAA,QAKjB,oBAAA;EAvHL;;;;;;EAgLH,UAAA,CACJ,MAAA,EAAQ,wBAAA,cACR,KAAA,YACC,OAAA,UAAiB,iBAAA;EAAA,QAKN,gBAAA;EApKL;;;;;EAwNH,YAAA,CACJ,MAAA,EAAQ,wBAAA,cACR,KAAA,UACA,WAAA;IAAA,SACW,WAAA;IAAA,SACA,WAAA;IAAA,SACA,UAAA;EAAA,IAEV,OAAA;EAoBG,UAAA,CACJ,MAAA,EAAQ,wBAAA,cACR,KAAA,UACA,WAAA;IAAA,SACW,WAAA;IAAA,SACA,WAAA;IAAA,SACA,UAAA;EAAA,IAEV,OAAA;EAnNkB;;;;EAsPf,YAAA,CACJ,MAAA,EAAQ,wBAAA,cACR,KAAA,UACA,YAAA,UACA,WAAA;IAAA,SACW,WAAA;IAAA,SACA,WAAA;IAAA,SACA,UAAA;EAAA,IAEV,OAAA;EAhOD;;;;EA8PI,gBAAA,CACJ,MAAA,EAAQ,wBAAA,cACR,KAAA,UACA,KAAA;IAAA,SACW,MAAA;IAAA,SACA,IAAA;IAAA,SACA,EAAA;IAAA,SACA,aAAA;IAAA,SACA,aAAA;IAAA,SACA,UAAA;EAAA,IAEV,OAAA;EAAA,QAiBW,+BAAA;EAAA,QA0BA,gBAAA;EA9RiB;;;;;;;;;;;;;;;;;;;;;;;;EAwVzB,UAAA,CACJ,MAAA,EAAQ,wBAAA,cACR,QAAA,YACA,MAAA,YACC,OAAA,CAAQ,0BAAA;EAnMT;;;;EAAA,QAmOY,eAAA;EAzLZ;;;;;;;;EAAA,QAgNY,mBAAA;EA1KZ;;;;;;;EAAA,QA+LY,uBAAA;EA7LZ;;;;;;EAAA,QAqNY,gBAAA;EAtGZ;;;EAAA,QAgnBY,kBAAA;AAAA;;;cC7oCV,yBAAA,EAA2B,2BAA2B"}

package/dist/control.mjs

@@ -1,4 +1,4 @@
-import { r as createPostgresBuiltinCodecLookup, t as PostgresControlAdapter } from "./control-adapter-BdWK3EV1.mjs";
+import { r as createPostgresBuiltinCodecLookup, t as PostgresControlAdapter } from "./control-adapter-D5hAI05c.mjs";
 import { t as postgresAdapterDescriptorMeta } from "./descriptor-meta-DnWlLrI6.mjs";
 import { parsePostgresDefault } from "@prisma-next/target-postgres/default-normalizer";
 import { normalizeSchemaNativeType } from "@prisma-next/target-postgres/native-type-normalizer";

package/dist/runtime.mjs

@@ -1,4 +1,4 @@
-import { n as postgresRawCodecInferer, t as createPostgresAdapter } from "./adapter-i3d2XWIq.mjs";
+import { n as postgresRawCodecInferer, t as createPostgresAdapter } from "./adapter-DX2HrqGc.mjs";
 import { n as postgresQueryOperations, t as postgresAdapterDescriptorMeta } from "./descriptor-meta-DnWlLrI6.mjs";
 import { extractCodecLookup } from "@prisma-next/framework-components/control";
 import { postgresCodecRegistry } from "@prisma-next/target-postgres/codecs";

package/package.json

@@ -1,35 +1,35 @@
 {
   "name": "@prisma-next/adapter-postgres",
-  "version": "0.14.0-dev.39",
+  "version": "0.14.0-dev.40",
   "license": "Apache-2.0",
   "type": "module",
   "sideEffects": false,
   "dependencies": {
-    "@prisma-next/contract": "0.14.0-dev.39",
-    "@prisma-next/contract-authoring": "0.14.0-dev.39",
-    "@prisma-next/errors": "0.14.0-dev.39",
-    "@prisma-next/family-sql": "0.14.0-dev.39",
-    "@prisma-next/framework-components": "0.14.0-dev.39",
-    "@prisma-next/ids": "0.14.0-dev.39",
-    "@prisma-next/sql-contract": "0.14.0-dev.39",
-    "@prisma-next/sql-contract-psl": "0.14.0-dev.39",
-    "@prisma-next/sql-contract-ts": "0.14.0-dev.39",
-    "@prisma-next/sql-operations": "0.14.0-dev.39",
-    "@prisma-next/sql-relational-core": "0.14.0-dev.39",
-    "@prisma-next/sql-runtime": "0.14.0-dev.39",
-    "@prisma-next/sql-schema-ir": "0.14.0-dev.39",
-    "@prisma-next/target-postgres": "0.14.0-dev.39",
-    "@prisma-next/utils": "0.14.0-dev.39",
+    "@prisma-next/contract": "0.14.0-dev.40",
+    "@prisma-next/contract-authoring": "0.14.0-dev.40",
+    "@prisma-next/errors": "0.14.0-dev.40",
+    "@prisma-next/family-sql": "0.14.0-dev.40",
+    "@prisma-next/framework-components": "0.14.0-dev.40",
+    "@prisma-next/ids": "0.14.0-dev.40",
+    "@prisma-next/sql-contract": "0.14.0-dev.40",
+    "@prisma-next/sql-contract-psl": "0.14.0-dev.40",
+    "@prisma-next/sql-contract-ts": "0.14.0-dev.40",
+    "@prisma-next/sql-operations": "0.14.0-dev.40",
+    "@prisma-next/sql-relational-core": "0.14.0-dev.40",
+    "@prisma-next/sql-runtime": "0.14.0-dev.40",
+    "@prisma-next/sql-schema-ir": "0.14.0-dev.40",
+    "@prisma-next/target-postgres": "0.14.0-dev.40",
+    "@prisma-next/utils": "0.14.0-dev.40",
     "arktype": "^2.2.0"
   },
   "devDependencies": {
-    "@prisma-next/cli": "0.14.0-dev.39",
-    "@prisma-next/driver-postgres": "0.14.0-dev.39",
-    "@prisma-next/migration-tools": "0.14.0-dev.39",
-    "@prisma-next/psl-parser": "0.14.0-dev.39",
-    "@prisma-next/test-utils": "0.14.0-dev.39",
-    "@prisma-next/tsconfig": "0.14.0-dev.39",
-    "@prisma-next/tsdown": "0.14.0-dev.39",
+    "@prisma-next/cli": "0.14.0-dev.40",
+    "@prisma-next/driver-postgres": "0.14.0-dev.40",
+    "@prisma-next/migration-tools": "0.14.0-dev.40",
+    "@prisma-next/psl-parser": "0.14.0-dev.40",
+    "@prisma-next/test-utils": "0.14.0-dev.40",
+    "@prisma-next/tsconfig": "0.14.0-dev.40",
+    "@prisma-next/tsdown": "0.14.0-dev.40",
     "pathe": "^2.0.3",
     "tsdown": "0.22.1",
     "typescript": "5.9.3",

package/src/core/control-adapter.ts

@@ -1,8 +1,4 @@
-import type {
-  Contract,
-  ContractMarkerRecord,
-  LedgerEntryRecord,
-} from '@prisma-next/contract/types';
+import type { ContractMarkerRecord, LedgerEntryRecord } from '@prisma-next/contract/types';
 import {
   parseMarkerRowSafely,
   rethrowMarkerReadError,
@@ -11,11 +7,11 @@ import {
 import type { SqlControlAdapter } from '@prisma-next/family-sql/control-adapter';
 import { parseContractMarkerRow } from '@prisma-next/family-sql/verify';
 import type { CodecLookup, CodecRegistry } from '@prisma-next/framework-components/codec';
-import { APP_SPACE_ID, type SchemaDiffIssue } from '@prisma-next/framework-components/control';
+import { APP_SPACE_ID } from '@prisma-next/framework-components/control';
 import { UNBOUND_NAMESPACE_ID } from '@prisma-next/framework-components/ir';
 import { ledgerOriginFromStored } from '@prisma-next/migration-tools/ledger-origin';
 import { REFERENTIAL_ACTION_SQL } from '@prisma-next/sql-contract/referential-action-sql';
-import type { SqlControlDriverInstance, SqlStorage } from '@prisma-next/sql-contract/types';
+import type { SqlControlDriverInstance } from '@prisma-next/sql-contract/types';
 import type {
   AnyQueryAst,
   CodecRef,
@@ -38,7 +34,6 @@ import type {
   SqlForeignKeyIR,
   SqlIndexIR,
   SqlReferentialAction,
-  SqlSchemaIR,
   SqlUniqueIR,
 } from '@prisma-next/sql-schema-ir/types';
 import {
@@ -59,19 +54,13 @@ import type {
 } from '@prisma-next/target-postgres/ddl';
 import { parsePostgresDefault } from '@prisma-next/target-postgres/default-normalizer';
 import { normalizeSchemaNativeType } from '@prisma-next/target-postgres/native-type-normalizer';
-import {
-  contractToPostgresSchemaIR,
-  diffPostgresSchema,
-  filterIssuesByOwnership,
-} from '@prisma-next/target-postgres/planner';
 import { escapeLiteral, quoteIdentifier } from '@prisma-next/target-postgres/sql-utils';
 import {
-  ensurePostgresSchemaIR,
-  isPostgresSchemaIR,
-  PostgresRlsPolicy,
-  PostgresRole,
-  PostgresSchemaIR,
-  PostgresTableIR,
+  PostgresDatabaseSchemaNode,
+  PostgresNamespaceSchemaNode,
+  PostgresPolicySchemaNode,
+  PostgresRoleSchemaNode,
+  PostgresTableSchemaNode,
 } from '@prisma-next/target-postgres/types';
 import { blindCast } from '@prisma-next/utils/casts';
 import { ifDefined } from '@prisma-next/utils/defined';
@@ -128,31 +117,6 @@ export class PostgresControlAdapter implements SqlControlAdapter<'postgres'> {
    */
   readonly normalizeNativeType = normalizeSchemaNativeType;
 
-  collectSchemaDiffIssues(
-    contract: Contract<SqlStorage>,
-    schema: SqlSchemaIR,
-  ): readonly SchemaDiffIssue[] {
-    if (!isPostgresSchemaIR(schema)) {
-      throw new Error(
-        `Postgres schema diff requires a PostgresSchemaIR; got ${(schema as { constructor?: { name?: string } }).constructor?.name ?? typeof schema}`,
-      );
-    }
-    const expected = contractToPostgresSchemaIR(
-      blindCast<
-        PostgresContract,
-        'collectSchemaDiffIssues is only called with a postgres contract'
-      >(contract),
-      { annotationNamespace: 'pg' },
-    );
-    const actual = ensurePostgresSchemaIR(schema);
-    const issues = diffPostgresSchema(expected, actual);
-    const ownedSchemaNames = new Set([
-      ...expected.rlsPolicies.map((p) => p.namespaceId),
-      ...expected.existingSchemas,
-    ]);
-    return filterIssuesByOwnership(issues, ownedSchemaNames);
-  }
-
   bootstrapControlTableQueries(): readonly DdlNode[] {
     return buildControlTableBootstrapQueries();
   }
@@ -593,23 +557,53 @@ export class PostgresControlAdapter implements SqlControlAdapter<'postgres'> {
     driver: SqlControlDriverInstance<'postgres'>,
     contract?: unknown,
     schema = 'public',
-  ): Promise<PostgresSchemaIR> {
+  ): Promise<PostgresDatabaseSchemaNode> {
     const declaredNamespaces = extractContractNamespaceIds(contract);
-    const ir =
+    const resolvedSchemas =
       declaredNamespaces.length > 0
-        ? await this.introspectNamespaces(driver, declaredNamespaces)
-        : await this.introspectSchema(driver, schema);
+        ? await this.resolveNamespaceSchemas(driver, declaredNamespaces)
+        : [schema];
+
+    // Walk schemas sequentially: every introspectSchema call shares the one
+    // control connection, so a parallel walk only serialises behind the wire
+    // protocol and trips pg's "already executing a query" deprecation.
+    const namespaces: Record<string, PostgresNamespaceSchemaNode> = {};
+    let pgVersion = 'unknown';
+    for (const resolved of resolvedSchemas) {
+      const { namespace, pgVersion: version } = await this.introspectSchema(driver, resolved);
+      namespaces[resolved] = namespace;
+      pgVersion = version;
+    }
+
+    const roles = await this.introspectRoles(driver);
     const existingSchemas = await this.listExistingSchemas(driver);
-    return new PostgresSchemaIR({
-      tables: ir.tables,
-      pgSchemaName: ir.pgSchemaName,
-      pgVersion: ir.pgVersion,
-      roles: ir.roles,
+    return new PostgresDatabaseSchemaNode({
+      namespaces,
+      roles,
       existingSchemas,
-      nativeEnumTypeNames: ir.nativeEnumTypeNames,
+      pgVersion,
     });
   }
 
+  /**
+   * Reads cluster-scoped database roles. Roles are not schema-qualified, so
+   * this is queried once for the whole database rather than per namespace.
+   */
+  private async introspectRoles(
+    driver: SqlControlDriverInstance<'postgres'>,
+  ): Promise<readonly PostgresRoleSchemaNode[]> {
+    const rolesResult = await driver.query<{ rolname: string }>(
+      `SELECT rolname
+       FROM pg_catalog.pg_roles
+       WHERE rolname NOT LIKE 'pg_%'
+         AND rolname != 'postgres'
+       ORDER BY rolname`,
+    );
+    return rolesResult.rows.map(
+      (row) => new PostgresRoleSchemaNode({ name: row.rolname, namespaceId: UNBOUND_NAMESPACE_ID }),
+    );
+  }
+
   /**
    * Lists every non-system schema present in the connected database.
    * The introspection consumer (`verifyPostgresNamespacePresence`)
@@ -633,16 +627,16 @@ export class PostgresControlAdapter implements SqlControlAdapter<'postgres'> {
   }
 
   /**
-   * Walks every declared namespace, resolving `UNBOUND_NAMESPACE_ID` to
-   * the connection's `current_schema()`, and merges the per-schema results
-   * into a single `SqlSchemaIR`. The merged `tables` map is flat (keyed by
-   * table name) so callers that look up by `tableName` see every contract
-   * table regardless of which namespace it lives in.
+   * Resolves the declared namespace ids to their live DDL schema names,
+   * mapping `UNBOUND_NAMESPACE_ID` to the connection's `current_schema()`
+   * and de-duplicating. The caller introspects one namespace node per
+   * resolved schema — there is no flat cross-schema merge, so two schemas
+   * holding a same-named table no longer collide.
    */
-  private async introspectNamespaces(
+  private async resolveNamespaceSchemas(
     driver: SqlControlDriverInstance<'postgres'>,
     namespaceIds: readonly string[],
-  ): Promise<PostgresSchemaIR> {
+  ): Promise<readonly string[]> {
     const resolvedSchemas: string[] = [];
     for (const id of namespaceIds) {
       if (id === UNBOUND_NAMESPACE_ID) {
@@ -654,45 +648,19 @@ export class PostgresControlAdapter implements SqlControlAdapter<'postgres'> {
         resolvedSchemas.push(id);
       }
     }
-    const uniqueSchemas = Array.from(new Set(resolvedSchemas));
-
-    // Walk schemas sequentially: every introspectSchema call shares the one
-    // control connection, so a parallel walk only serialises behind the wire
-    // protocol and trips pg's "already executing a query" deprecation.
-    const perSchema: PostgresSchemaIR[] = [];
-    for (const schema of uniqueSchemas) {
-      perSchema.push(await this.introspectSchema(driver, schema));
-    }
-
-    const mergedTables: Record<string, PostgresTableIR> = {};
-    const mergedRoles: PostgresRole[] = [];
-    for (const ir of perSchema) {
-      for (const [tableName, table] of Object.entries(ir.tables)) {
-        mergedTables[tableName] = table;
-      }
-      mergedRoles.push(...ir.roles);
-    }
-
-    const first = perSchema[0];
-    return new PostgresSchemaIR({
-      tables: mergedTables,
-      pgSchemaName: first?.pgSchemaName ?? 'public',
-      pgVersion: first?.pgVersion ?? 'unknown',
-      roles: mergedRoles,
-      existingSchemas: first?.existingSchemas ?? ['public'],
-      nativeEnumTypeNames: first?.nativeEnumTypeNames ?? [],
-    });
+    return Array.from(new Set(resolvedSchemas));
   }
 
   /**
-   * Introspects a single Postgres schema and returns a raw SqlSchemaIR
-   * containing only the tables in that schema. Used by `introspect` as
+   * Introspects a single Postgres schema and returns the namespace node for
+   * that schema (its tables, their policies, and its native enum type names),
+   * alongside the cluster-scoped Postgres version. Used by `introspect` as
    * the per-namespace walk.
    */
   private async introspectSchema(
     driver: SqlControlDriverInstance<'postgres'>,
     schema: string,
-  ): Promise<PostgresSchemaIR> {
+  ): Promise<{ readonly namespace: PostgresNamespaceSchemaNode; readonly pgVersion: string }> {
     // Issue the schema-wide queries one at a time. A single control connection
     // serialises queries anyway, so Promise.all buys no parallelism here and
     // makes pg emit a "client is already executing a query" deprecation. One
@@ -1167,14 +1135,7 @@ export class PostgresControlAdapter implements SqlControlAdapter<'postgres'> {
        ORDER BY tablename, policyname`,
       [schema],
     );
-    const rolesResult = await driver.query<{ rolname: string }>(
-      `SELECT rolname
-       FROM pg_catalog.pg_roles
-       WHERE rolname NOT LIKE 'pg_%'
-         AND rolname != 'postgres'
-       ORDER BY rolname`,
-    );
-    const policiesByTable = new Map<string, PostgresRlsPolicy[]>();
+    const policiesByTable = new Map<string, PostgresPolicySchemaNode[]>();
     for (const row of policiesResult.rows) {
       const operation = mapPgCmd(row.cmd);
       const policyRoles = [
@@ -1183,7 +1144,7 @@ export class PostgresControlAdapter implements SqlControlAdapter<'postgres'> {
       const permissive = row.permissive.toUpperCase() === 'PERMISSIVE';
       const hashSuffixMatch = /^(.+)_([0-9a-f]{8})$/.exec(row.policyname);
       const prefix = hashSuffixMatch?.[1] ?? row.policyname;
-      const policy = new PostgresRlsPolicy({
+      const policy = new PostgresPolicySchemaNode({
         name: row.policyname,
         prefix,
         tableName: row.tablename,
@@ -1199,26 +1160,20 @@ export class PostgresControlAdapter implements SqlControlAdapter<'postgres'> {
       policiesByTable.set(row.tablename, list);
     }
 
-    const tables: Record<string, PostgresTableIR> = {};
+    const tables: Record<string, PostgresTableSchemaNode> = {};
     for (const [tableName, input] of Object.entries(tableInputs)) {
-      tables[tableName] = new PostgresTableIR({
+      tables[tableName] = new PostgresTableSchemaNode({
         ...input,
-        rlsPolicies: policiesByTable.get(tableName) ?? [],
+        policies: policiesByTable.get(tableName) ?? [],
       });
     }
 
-    const roles: PostgresRole[] = rolesResult.rows.map(
-      (row) => new PostgresRole({ name: row.rolname, namespaceId: UNBOUND_NAMESPACE_ID }),
-    );
-
-    return new PostgresSchemaIR({
+    const namespace = new PostgresNamespaceSchemaNode({
+      schemaName: schema,
       tables,
-      pgSchemaName: schema,
-      pgVersion: await this.getPostgresVersion(driver),
-      roles,
-      existingSchemas: [],
       nativeEnumTypeNames,
     });
+    return { namespace, pgVersion: await this.getPostgresVersion(driver) };
   }
 
   /**