@prisma-next/adapter-postgres 0.15.0-dev.13 → 0.15.0-dev.2

package/src/core/control-adapter.ts

@@ -7,7 +7,7 @@ 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 SchemaNodeRef } 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';
@@ -36,7 +36,6 @@ import type {
   SqlReferentialAction,
   SqlUniqueIRInput,
 } from '@prisma-next/sql-schema-ir/types';
-import { RelationalSchemaNodeKind } from '@prisma-next/sql-schema-ir/types';
 import {
   buildControlTableBootstrapQueries,
   buildSignMarkerBootstrapQueries,
@@ -67,7 +66,6 @@ import {
   PostgresNativeEnumSchemaNode,
   PostgresPolicySchemaNode,
   PostgresRoleSchemaNode,
-  PostgresSchemaNodeKind,
   PostgresTableSchemaNode,
 } from '@prisma-next/target-postgres/types';
 import { blindCast } from '@prisma-next/utils/casts';
@@ -739,13 +737,7 @@ export class PostgresControlAdapter implements SqlControlAdapter<'postgres'> {
          ORDER BY c.table_name, c.ordinal_position`,
       [schema],
     );
-    // Query all primary keys for all tables in schema. Reads pg_catalog, not
-    // information_schema: `information_schema.table_constraints` hides
-    // constraints on tables where the connecting role's only privilege is
-    // SELECT (its filter grants visibility for INSERT/UPDATE/DELETE/TRUNCATE/
-    // REFERENCES/TRIGGER — not SELECT), so a SELECT-only table introspects
-    // with all its columns but zero constraints and verify reports every
-    // declared constraint as missing. pg_catalog is not privilege-filtered.
+    // Query all primary keys for all tables in schema
     const pkResult = await driver.query<{
       table_name: string;
       constraint_name: string;
@@ -753,29 +745,24 @@ export class PostgresControlAdapter implements SqlControlAdapter<'postgres'> {
       ordinal_position: number;
     }>(
       `SELECT
-           cl.relname AS table_name,
-           con.conname AS constraint_name,
-           a.attname AS column_name,
-           k.ord AS ordinal_position
-         FROM pg_catalog.pg_constraint con
-         JOIN pg_catalog.pg_class cl ON cl.oid = con.conrelid
-         JOIN pg_catalog.pg_namespace ns ON ns.oid = cl.relnamespace
-         JOIN LATERAL unnest(con.conkey) WITH ORDINALITY AS k(attnum, ord) ON true
-         JOIN pg_catalog.pg_attribute a
-           ON a.attrelid = con.conrelid
-           AND a.attnum = k.attnum
-         WHERE ns.nspname = $1
-           AND con.contype = 'p'
-         ORDER BY cl.relname, k.ord`,
+           tc.table_name,
+           tc.constraint_name,
+           kcu.column_name,
+           kcu.ordinal_position
+         FROM information_schema.table_constraints tc
+         JOIN information_schema.key_column_usage kcu
+           ON tc.constraint_name = kcu.constraint_name
+           AND tc.table_schema = kcu.table_schema
+           AND tc.table_name = kcu.table_name
+         WHERE tc.table_schema = $1
+           AND tc.constraint_type = 'PRIMARY KEY'
+         ORDER BY tc.table_name, kcu.ordinal_position`,
       [schema],
     );
-    // Query all foreign keys for all tables in schema, including referential
-    // actions. Reads pg_catalog only (see the primary-key query above for why
-    // information_schema is unusable here); `unnest(conkey) WITH ORDINALITY`
-    // pairs source and referenced columns positionally, so composite FKs
-    // round-trip in declared order. The referential-action CASEs mirror
-    // pg_constraint's confdeltype/confupdtype encoding and produce the same
-    // rule strings information_schema.referential_constraints reports.
+    // Query all foreign keys for all tables in schema, including referential actions.
+    // Uses pg_catalog for correct positional pairing of composite FK columns
+    // (information_schema.constraint_column_usage lacks ordinal_position,
+    // which causes Cartesian products for multi-column FKs).
     const fkResult = await driver.query<{
       table_name: string;
       constraint_name: string;
@@ -788,48 +775,41 @@ export class PostgresControlAdapter implements SqlControlAdapter<'postgres'> {
       update_rule: string;
     }>(
       `SELECT
-           cl.relname AS table_name,
-           con.conname AS constraint_name,
-           a.attname AS column_name,
-           k.ord AS ordinal_position,
+           tc.table_name,
+           tc.constraint_name,
+           kcu.column_name,
+           kcu.ordinal_position,
            ref_ns.nspname AS referenced_table_schema,
            ref_cl.relname AS referenced_table_name,
            ref_att.attname AS referenced_column_name,
-           CASE con.confdeltype
-             WHEN 'a' THEN 'NO ACTION'
-             WHEN 'r' THEN 'RESTRICT'
-             WHEN 'c' THEN 'CASCADE'
-             WHEN 'n' THEN 'SET NULL'
-             WHEN 'd' THEN 'SET DEFAULT'
-           END AS delete_rule,
-           CASE con.confupdtype
-             WHEN 'a' THEN 'NO ACTION'
-             WHEN 'r' THEN 'RESTRICT'
-             WHEN 'c' THEN 'CASCADE'
-             WHEN 'n' THEN 'SET NULL'
-             WHEN 'd' THEN 'SET DEFAULT'
-           END AS update_rule
-         FROM pg_catalog.pg_constraint con
-         JOIN pg_catalog.pg_class cl ON cl.oid = con.conrelid
-         JOIN pg_catalog.pg_namespace ns ON ns.oid = cl.relnamespace
-         JOIN LATERAL unnest(con.conkey) WITH ORDINALITY AS k(attnum, ord) ON true
-         JOIN pg_catalog.pg_attribute a
-           ON a.attrelid = con.conrelid
-           AND a.attnum = k.attnum
+           rc.delete_rule,
+           rc.update_rule
+         FROM information_schema.table_constraints tc
+         JOIN information_schema.key_column_usage kcu
+           ON tc.constraint_name = kcu.constraint_name
+           AND tc.table_schema = kcu.table_schema
+           AND tc.table_name = kcu.table_name
+         JOIN pg_catalog.pg_constraint pgc
+           ON pgc.conname = tc.constraint_name
+           AND pgc.connamespace = (
+             SELECT oid FROM pg_catalog.pg_namespace WHERE nspname = tc.table_schema
+           )
          JOIN pg_catalog.pg_class ref_cl
-           ON ref_cl.oid = con.confrelid
+           ON ref_cl.oid = pgc.confrelid
          JOIN pg_catalog.pg_namespace ref_ns
            ON ref_ns.oid = ref_cl.relnamespace
          JOIN pg_catalog.pg_attribute ref_att
-           ON ref_att.attrelid = con.confrelid
-           AND ref_att.attnum = con.confkey[k.ord]
-         WHERE ns.nspname = $1
-           AND con.contype = 'f'
-         ORDER BY cl.relname, con.conname, k.ord`,
+           ON ref_att.attrelid = pgc.confrelid
+           AND ref_att.attnum = pgc.confkey[kcu.ordinal_position]
+         JOIN information_schema.referential_constraints rc
+           ON rc.constraint_name = tc.constraint_name
+           AND rc.constraint_schema = tc.table_schema
+         WHERE tc.table_schema = $1
+           AND tc.constraint_type = 'FOREIGN KEY'
+         ORDER BY tc.table_name, tc.constraint_name, kcu.ordinal_position`,
       [schema],
     );
-    // Query all unique constraints for all tables in schema (excluding PKs).
-    // Reads pg_catalog (see the primary-key query above).
+    // Query all unique constraints for all tables in schema (excluding PKs)
     const uniqueResult = await driver.query<{
       table_name: string;
       constraint_name: string;
@@ -837,20 +817,18 @@ export class PostgresControlAdapter implements SqlControlAdapter<'postgres'> {
       ordinal_position: number;
     }>(
       `SELECT
-           cl.relname AS table_name,
-           con.conname AS constraint_name,
-           a.attname AS column_name,
-           k.ord AS ordinal_position
-         FROM pg_catalog.pg_constraint con
-         JOIN pg_catalog.pg_class cl ON cl.oid = con.conrelid
-         JOIN pg_catalog.pg_namespace ns ON ns.oid = cl.relnamespace
-         JOIN LATERAL unnest(con.conkey) WITH ORDINALITY AS k(attnum, ord) ON true
-         JOIN pg_catalog.pg_attribute a
-           ON a.attrelid = con.conrelid
-           AND a.attnum = k.attnum
-         WHERE ns.nspname = $1
-           AND con.contype = 'u'
-         ORDER BY cl.relname, con.conname, k.ord`,
+           tc.table_name,
+           tc.constraint_name,
+           kcu.column_name,
+           kcu.ordinal_position
+         FROM information_schema.table_constraints tc
+         JOIN information_schema.key_column_usage kcu
+           ON tc.constraint_name = kcu.constraint_name
+           AND tc.table_schema = kcu.table_schema
+           AND tc.table_name = kcu.table_name
+         WHERE tc.table_schema = $1
+           AND tc.constraint_type = 'UNIQUE'
+         ORDER BY tc.table_name, tc.constraint_name, kcu.ordinal_position`,
       [schema],
     );
     // Query all indexes for all tables in schema (excluding constraints).
@@ -895,9 +873,10 @@ export class PostgresControlAdapter implements SqlControlAdapter<'postgres'> {
          WHERE i.schemaname = $1
            AND NOT EXISTS (
              SELECT 1
-             FROM pg_catalog.pg_constraint con
-             WHERE con.conindid = ic.oid
-               AND con.contype IN ('p', 'u', 'x')
+             FROM information_schema.table_constraints tc
+             WHERE tc.table_schema = $1
+               AND tc.table_name = i.tablename
+               AND tc.constraint_name = i.indexname
            )
          ORDER BY i.tablename, i.indexname, k.ord`,
       [schema],
@@ -1033,7 +1012,6 @@ export class PostgresControlAdapter implements SqlControlAdapter<'postgres'> {
           ? {
               columns: primaryKeyColumns,
               ...(pkRows[0]?.constraint_name ? { name: pkRows[0].constraint_name } : {}),
-              dependsOn: postgresColumnDependsOn(schema, tableName, primaryKeyColumns),
             }
           : undefined;
 
@@ -1076,10 +1054,6 @@ export class PostgresControlAdapter implements SqlControlAdapter<'postgres'> {
           name: fk.name,
           ...ifDefined('onDelete', mapReferentialAction(fk.deleteRule)),
           ...ifDefined('onUpdate', mapReferentialAction(fk.updateRule)),
-          dependsOn: [
-            postgresTableDependsOn(fk.referencedSchema, fk.referencedTable),
-            ...postgresColumnDependsOn(schema, tableName, fk.columns),
-          ],
         }),
       );
 
@@ -1104,7 +1078,6 @@ export class PostgresControlAdapter implements SqlControlAdapter<'postgres'> {
       const uniques: readonly SqlUniqueIRInput[] = Array.from(uniquesMap.values()).map((uq) => ({
         columns: Object.freeze([...uq.columns]) as readonly string[],
         name: uq.name,
-        dependsOn: postgresColumnDependsOn(schema, tableName, uq.columns),
       }));
 
       // Process indexes
@@ -1186,7 +1159,6 @@ export class PostgresControlAdapter implements SqlControlAdapter<'postgres'> {
           unique: idx.unique,
           ...(idx.type !== undefined && { type: idx.type }),
           ...(idx.options !== undefined && { options: idx.options }),
-          dependsOn: postgresColumnDependsOn(schema, tableName, idx.columns),
         }),
       );
 
@@ -1269,10 +1241,6 @@ export class PostgresControlAdapter implements SqlControlAdapter<'postgres'> {
         ...(row.qual !== null ? { using: row.qual } : {}),
         ...(row.with_check !== null ? { withCheck: row.with_check } : {}),
         permissive,
-        dependsOn: [
-          postgresTableDependsOn(row.schemaname, row.tablename),
-          ...policyRoles.map(postgresRoleDependsOn),
-        ],
       });
       const list = policiesByTable.get(row.tablename) ?? [];
       list.push(policy);
@@ -1534,44 +1502,6 @@ function mapReferentialAction(rule: string): SqlReferentialAction | undefined {
   return mapped;
 }
 
-/**
- * A FK/policy dependency chain, mirroring the shape the expected-side
- * derivation stamps (`contractToPostgresDatabaseSchemaNode`): the database
- * root's fixed sentinel id, then the namespace, then the table.
- */
-function postgresTableDependsOn(namespaceId: string, tableName: string): SchemaNodeRef {
-  return [
-    { nodeKind: PostgresSchemaNodeKind.database, id: 'database' },
-    { nodeKind: PostgresSchemaNodeKind.namespace, id: namespaceId },
-    { nodeKind: PostgresSchemaNodeKind.table, id: tableName },
-  ];
-}
-
-/** A policy's dependency chain onto one of the roles it grants to. */
-function postgresRoleDependsOn(role: string): SchemaNodeRef {
-  return [
-    { nodeKind: PostgresSchemaNodeKind.database, id: 'database' },
-    { nodeKind: PostgresSchemaNodeKind.role, id: role },
-  ];
-}
-
-/**
- * The chains from a table-child object (foreign key, index, unique, primary
- * key) to each of the own columns it is built on — the introspection-side
- * mirror of `contractToPostgresDatabaseSchemaNode`'s `columnDependsOn`. An
- * object is dropped before the columns it covers.
- */
-function postgresColumnDependsOn(
-  namespaceId: string,
-  tableName: string,
-  columns: readonly string[],
-): SchemaNodeRef[] {
-  return columns.map((column) => [
-    ...postgresTableDependsOn(namespaceId, tableName),
-    { nodeKind: RelationalSchemaNodeKind.column, id: `column:${column}` },
-  ]);
-}
-
 /**
  * Groups an array of objects by a specified key.
  * Returns a Map for O(1) lookup by group key.