@prisma-next/adapter-postgres 0.5.0-dev.7 → 0.5.0-dev.70

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@prisma-next/adapter-postgres",
-  "version": "0.5.0-dev.7",
+  "version": "0.5.0-dev.70",
+  "license": "Apache-2.0",
   "type": "module",
   "sideEffects": false,
   "files": [
@@ -8,32 +9,32 @@
     "src"
   ],
   "dependencies": {
-    "ajv": "^8.18.0",
-    "arktype": "^2.0.0",
-    "@prisma-next/contract": "0.5.0-dev.7",
-    "@prisma-next/contract-authoring": "0.5.0-dev.7",
-    "@prisma-next/framework-components": "0.5.0-dev.7",
-    "@prisma-next/ids": "0.5.0-dev.7",
-    "@prisma-next/family-sql": "0.5.0-dev.7",
-    "@prisma-next/sql-contract": "0.5.0-dev.7",
-    "@prisma-next/sql-contract-psl": "0.5.0-dev.7",
-    "@prisma-next/sql-contract-ts": "0.5.0-dev.7",
-    "@prisma-next/sql-operations": "0.5.0-dev.7",
-    "@prisma-next/sql-relational-core": "0.5.0-dev.7",
-    "@prisma-next/sql-runtime": "0.5.0-dev.7",
-    "@prisma-next/target-postgres": "0.5.0-dev.7",
-    "@prisma-next/utils": "0.5.0-dev.7",
-    "@prisma-next/sql-schema-ir": "0.5.0-dev.7"
+    "arktype": "^2.1.29",
+    "@prisma-next/contract": "0.5.0-dev.70",
+    "@prisma-next/contract-authoring": "0.5.0-dev.70",
+    "@prisma-next/family-sql": "0.5.0-dev.70",
+    "@prisma-next/ids": "0.5.0-dev.70",
+    "@prisma-next/sql-contract": "0.5.0-dev.70",
+    "@prisma-next/sql-contract-ts": "0.5.0-dev.70",
+    "@prisma-next/sql-operations": "0.5.0-dev.70",
+    "@prisma-next/sql-relational-core": "0.5.0-dev.70",
+    "@prisma-next/framework-components": "0.5.0-dev.70",
+    "@prisma-next/sql-contract-psl": "0.5.0-dev.70",
+    "@prisma-next/sql-runtime": "0.5.0-dev.70",
+    "@prisma-next/sql-schema-ir": "0.5.0-dev.70",
+    "@prisma-next/target-postgres": "0.5.0-dev.70",
+    "@prisma-next/utils": "0.5.0-dev.70"
   },
   "devDependencies": {
     "pathe": "^2.0.3",
-    "tsdown": "0.18.4",
+    "tsdown": "0.22.0",
     "typescript": "5.9.3",
-    "vitest": "4.0.17",
-    "@prisma-next/cli": "0.5.0-dev.7",
-    "@prisma-next/errors": "0.5.0-dev.7",
-    "@prisma-next/driver-postgres": "0.5.0-dev.7",
-    "@prisma-next/extension-pgvector": "0.5.0-dev.7",
+    "vitest": "4.1.5",
+    "@prisma-next/cli": "0.5.0-dev.70",
+    "@prisma-next/driver-postgres": "0.5.0-dev.70",
+    "@prisma-next/extension-pgvector": "0.5.0-dev.70",
+    "@prisma-next/errors": "0.5.0-dev.70",
+    "@prisma-next/migration-tools": "0.5.0-dev.70",
     "@prisma-next/test-utils": "0.0.1",
     "@prisma-next/tsconfig": "0.0.0",
     "@prisma-next/tsdown": "0.0.0"

package/src/core/adapter.ts

@@ -1,13 +1,13 @@
-import {
-  type Adapter,
-  type AdapterProfile,
-  type AnyQueryAst,
-  type CodecParamsDescriptor,
-  createCodecRegistry,
-  type LowererContext,
+import type { CodecLookup } from '@prisma-next/framework-components/codec';
+import { APP_SPACE_ID } from '@prisma-next/framework-components/control';
+import type {
+  Adapter,
+  AdapterProfile,
+  AnyQueryAst,
+  LowererContext,
 } from '@prisma-next/sql-relational-core/ast';
-import { codecDefinitions } from '@prisma-next/target-postgres/codecs';
-import { ifDefined } from '@prisma-next/utils/defined';
+import { parseContractMarkerRow } from '@prisma-next/sql-runtime';
+import { createPostgresBuiltinCodecLookup } from './codec-lookup';
 import { renderLoweredSql } from './sql-renderer';
 import type { PostgresAdapterOptions, PostgresContract, PostgresLoweredStatement } from './types';
 
@@ -26,58 +26,33 @@ const defaultCapabilities = Object.freeze({
   },
 });
 
-type AdapterCodec = (typeof codecDefinitions)[keyof typeof codecDefinitions]['codec'];
-type ParameterizedCodec = AdapterCodec & {
-  readonly paramsSchema: NonNullable<AdapterCodec['paramsSchema']>;
-};
-
-const parameterizedCodecs: ReadonlyArray<CodecParamsDescriptor> = Object.values(codecDefinitions)
-  .map((definition) => definition.codec)
-  .filter((codec): codec is ParameterizedCodec => codec.paramsSchema !== undefined)
-  .map((codec) =>
-    Object.freeze({
-      codecId: codec.id,
-      paramsSchema: codec.paramsSchema,
-      ...ifDefined('init', codec.init),
-    }),
-  );
-
 class PostgresAdapterImpl
   implements Adapter<AnyQueryAst, PostgresContract, PostgresLoweredStatement>
 {
-  // These fields make the adapter instance structurally compatible with
-  // RuntimeAdapterInstance<'sql', 'postgres'> without introducing a runtime-plane dependency.
+  // These fields make the adapter instance structurally compatible with RuntimeAdapterInstance<'sql', 'postgres'> without introducing a runtime-plane dependency.
   readonly familyId = 'sql' as const;
   readonly targetId = 'postgres' as const;
 
   readonly profile: AdapterProfile<'postgres'>;
-  private readonly codecRegistry = (() => {
-    const registry = createCodecRegistry();
-    for (const definition of Object.values(codecDefinitions)) {
-      registry.register(definition.codec);
-    }
-    return registry;
-  })();
+  private readonly codecLookup: CodecLookup;
 
   constructor(options?: PostgresAdapterOptions) {
+    this.codecLookup = options?.codecLookup ?? createPostgresBuiltinCodecLookup();
     this.profile = Object.freeze({
       id: options?.profileId ?? 'postgres/default@1',
       target: 'postgres',
       capabilities: defaultCapabilities,
-      codecs: () => this.codecRegistry,
       readMarkerStatement: () => ({
-        sql: 'select core_hash, profile_hash, contract_json, canonical_version, updated_at, app_tag, meta from prisma_contract.marker where id = $1',
-        params: [1],
+        sql: 'select core_hash, profile_hash, contract_json, canonical_version, updated_at, app_tag, meta, invariants from prisma_contract.marker where space = $1',
+        params: [APP_SPACE_ID],
       }),
+      // Postgres' driver hydrates `text[]` columns as native JS arrays, so the row is already in the shape the shared parser expects.
+      parseMarkerRow: (row: unknown) => parseContractMarkerRow(row),
     });
   }
 
-  parameterizedCodecs(): ReadonlyArray<CodecParamsDescriptor> {
-    return parameterizedCodecs;
-  }
-
   lower(ast: AnyQueryAst, context: LowererContext<PostgresContract>): PostgresLoweredStatement {
-    return renderLoweredSql(ast, context.contract);
+    return renderLoweredSql(ast, context.contract, this.codecLookup);
   }
 }
 

package/src/core/codec-lookup.ts

@@ -0,0 +1,19 @@
+import type { CodecLookup } from '@prisma-next/framework-components/codec';
+import { extractCodecLookup } from '@prisma-next/framework-components/control';
+import { postgresCodecRegistry } from '@prisma-next/target-postgres/codecs';
+
+/**
+ * Build a {@link CodecLookup} populated with the Postgres-builtin codec definitions only.
+ *
+ * This is the default lookup used by `createPostgresAdapter()` and `new PostgresControlAdapter()` when called without a stack-derived lookup (e.g. from tests, or one-off scripts that don't compose a full stack).
+ *
+ * Extension codecs (e.g. `pg/vector@1` from `@prisma-next/extension-pgvector`) are intentionally NOT included here: a bare adapter cannot see extensions. Stack-composed paths (`SqlControlAdapterDescriptor.create(stack)` / `SqlRuntimeAdapterDescriptor.create(stack)`) supply the broader, extension-inclusive lookup at construction time.
+ */
+export function createPostgresBuiltinCodecLookup(): CodecLookup {
+  return extractCodecLookup([
+    {
+      id: 'postgres-builtin-codecs',
+      types: { codecTypes: { codecDescriptors: Array.from(postgresCodecRegistry.values()) } },
+    },
+  ]);
+}

package/src/core/control-adapter.ts

@@ -1,4 +1,7 @@
+import type { ContractMarkerRecord } from '@prisma-next/contract/types';
 import type { SqlControlAdapter } from '@prisma-next/family-sql/control-adapter';
+import { parseContractMarkerRow } from '@prisma-next/family-sql/verify';
+import type { CodecLookup } from '@prisma-next/framework-components/codec';
 import type { ControlDriverInstance } from '@prisma-next/framework-components/control';
 import type {
   AnyQueryAst,
@@ -19,6 +22,7 @@ import type {
 import { parsePostgresDefault } from '@prisma-next/target-postgres/default-normalizer';
 import { normalizeSchemaNativeType } from '@prisma-next/target-postgres/native-type-normalizer';
 import { ifDefined } from '@prisma-next/utils/defined';
+import { createPostgresBuiltinCodecLookup } from './codec-lookup';
 import { pgEnumControlHooks } from './enum-control-hooks';
 import { renderLoweredSql } from './sql-renderer';
 import type { PostgresContract } from './types';
@@ -31,6 +35,19 @@ export class PostgresControlAdapter implements SqlControlAdapter<'postgres'> {
   readonly familyId = 'sql' as const;
   readonly targetId = 'postgres' as const;
 
+  private readonly codecLookup: CodecLookup;
+
+  /**
+   * @param codecLookup - Codec lookup used by the SQL renderer to resolve
+   *   per-codec metadata at lower-time. Defaults to a Postgres-builtins-only
+   *   lookup when omitted. Stack-aware callers
+   *   (`SqlControlAdapterDescriptor.create(stack)`) supply
+   *   `stack.codecLookup` so extension codecs are visible to the renderer.
+   */
+  constructor(codecLookup?: CodecLookup) {
+    this.codecLookup = codecLookup ?? createPostgresBuiltinCodecLookup();
+  }
+
   /**
    * Target-specific normalizer for raw Postgres default expressions.
    * Used by schema verification to normalize raw defaults before comparison.
@@ -53,7 +70,108 @@ export class PostgresControlAdapter implements SqlControlAdapter<'postgres'> {
    * without instantiating the runtime adapter.
    */
   lower(ast: AnyQueryAst, context: LowererContext<unknown>): LoweredStatement {
-    return renderLoweredSql(ast, context.contract as PostgresContract);
+    return renderLoweredSql(ast, context.contract as PostgresContract, this.codecLookup);
+  }
+
+  /**
+   * Reads the contract marker from `prisma_contract.marker`. Probes
+   * `information_schema.tables` first so a fresh database (where the
+   * `prisma_contract` schema doesn't yet exist) returns `null` instead of a
+   * "relation does not exist" error — some Postgres wire-protocol clients
+   * (e.g. PGlite's TCP proxy) don't fully recover from extended-protocol
+   * parse errors, so we probe before reading.
+   */
+  async readMarker(
+    driver: ControlDriverInstance<'sql', 'postgres'>,
+    space: string,
+  ): Promise<ContractMarkerRecord | null> {
+    const exists = await driver.query(
+      `select 1
+       from information_schema.tables
+       where table_schema = $1 and table_name = $2`,
+      ['prisma_contract', 'marker'],
+    );
+    if (exists.rows.length === 0) {
+      return null;
+    }
+
+    const result = await driver.query<{
+      core_hash: string;
+      profile_hash: string;
+      contract_json: unknown | null;
+      canonical_version: number | null;
+      updated_at: Date | string;
+      app_tag: string | null;
+      meta: unknown | null;
+      invariants: readonly string[];
+    }>(
+      `select
+         core_hash,
+         profile_hash,
+         contract_json,
+         canonical_version,
+         updated_at,
+         app_tag,
+         meta,
+         invariants
+       from prisma_contract.marker
+       where space = $1`,
+      [space],
+    );
+
+    const row = result.rows[0];
+    if (!row) return null;
+    return parseContractMarkerRow(row);
+  }
+
+  /**
+   * Reads every row from `prisma_contract.marker` and returns them keyed
+   * by `space`. Mirrors the existence probe in {@link readMarker}: a
+   * fresh database without the `prisma_contract` schema returns an empty
+   * map rather than raising "relation does not exist".
+   */
+  async readAllMarkers(
+    driver: ControlDriverInstance<'sql', 'postgres'>,
+  ): Promise<ReadonlyMap<string, ContractMarkerRecord>> {
+    const exists = await driver.query(
+      `select 1
+       from information_schema.tables
+       where table_schema = $1 and table_name = $2`,
+      ['prisma_contract', 'marker'],
+    );
+    if (exists.rows.length === 0) {
+      return new Map();
+    }
+
+    const result = await driver.query<{
+      space: string;
+      core_hash: string;
+      profile_hash: string;
+      contract_json: unknown | null;
+      canonical_version: number | null;
+      updated_at: Date | string;
+      app_tag: string | null;
+      meta: unknown | null;
+      invariants: readonly string[];
+    }>(
+      `select
+         space,
+         core_hash,
+         profile_hash,
+         contract_json,
+         canonical_version,
+         updated_at,
+         app_tag,
+         meta,
+         invariants
+       from prisma_contract.marker`,
+    );
+
+    const rows = new Map<string, ContractMarkerRecord>();
+    for (const row of result.rows) {
+      rows.set(row.space, parseContractMarkerRow(row));
+    }
+    return rows;
   }
 
   /**

package/src/core/control-mutation-defaults.ts

@@ -1,4 +1,5 @@
 import type { ExecutionMutationDefaultValue } from '@prisma-next/contract/types';
+import { timestampNowControlDescriptor } from '@prisma-next/family-sql/control';
 import type {
   ControlMutationDefaultEntry,
   DefaultFunctionLoweringContext,
@@ -301,25 +302,30 @@ export function createPostgresDefaultFunctionRegistry(): ReadonlyMap<
 }
 
 export function createPostgresMutationDefaultGeneratorDescriptors(): readonly MutationDefaultGeneratorDescriptor[] {
-  return builtinGeneratorRegistryMetadata.map(({ id, applicableCodecIds }) => ({
-    id,
-    applicableCodecIds,
-    resolveGeneratedColumnDescriptor: ({ generated }) => {
-      if (generated.kind !== 'generator' || generated.id !== id) {
-        return undefined;
-      }
-      const descriptor = resolveBuiltinGeneratedColumnDescriptor({
+  return [
+    ...builtinGeneratorRegistryMetadata.map(
+      ({ id, applicableCodecIds }): MutationDefaultGeneratorDescriptor => ({
         id,
-        ...(generated.params ? { params: generated.params } : {}),
-      });
-      return {
-        codecId: descriptor.type.codecId,
-        nativeType: descriptor.type.nativeType,
-        ...(descriptor.type.typeRef ? { typeRef: descriptor.type.typeRef } : {}),
-        ...(descriptor.typeParams ? { typeParams: descriptor.typeParams } : {}),
-      };
-    },
-  }));
+        applicableCodecIds,
+        resolveGeneratedColumnDescriptor: ({ generated }) => {
+          if (generated.kind !== 'generator' || generated.id !== id) {
+            return undefined;
+          }
+          const descriptor = resolveBuiltinGeneratedColumnDescriptor({
+            id,
+            ...(generated.params ? { params: generated.params } : {}),
+          });
+          return {
+            codecId: descriptor.type.codecId,
+            nativeType: descriptor.type.nativeType,
+            ...(descriptor.type.typeRef ? { typeRef: descriptor.type.typeRef } : {}),
+            ...(descriptor.typeParams ? { typeParams: descriptor.typeParams } : {}),
+          };
+        },
+      }),
+    ),
+    timestampNowControlDescriptor(),
+  ];
 }
 
 export function createPostgresScalarTypeDescriptors(): ReadonlyMap<string, string> {

package/src/core/descriptor-meta.ts

@@ -1,8 +1,17 @@
 import type { CodecControlHooks, ExpandNativeTypeInput } from '@prisma-next/family-sql/control';
 import type { SqlOperationDescriptor } from '@prisma-next/sql-operations';
+import {
+  buildOperation,
+  type CodecExpression,
+  type Expression,
+  refsOf,
+  type TraitExpression,
+  toExpr,
+} from '@prisma-next/sql-relational-core/expression';
 import {
   PG_BIT_CODEC_ID,
   PG_BOOL_CODEC_ID,
+  PG_BYTEA_CODEC_ID,
   PG_CHAR_CODEC_ID,
   PG_ENUM_CODEC_ID,
   PG_FLOAT_CODEC_ID,
@@ -30,12 +39,10 @@ import {
   SQL_TIMESTAMP_CODEC_ID,
   SQL_VARCHAR_CODEC_ID,
 } from '@prisma-next/target-postgres/codec-ids';
-import { codecDefinitions } from '@prisma-next/target-postgres/codecs';
+import { postgresCodecRegistry } from '@prisma-next/target-postgres/codecs';
 import { pgEnumControlHooks } from './enum-control-hooks';
 
-// ============================================================================
-// Helper functions for reducing boilerplate
-// ============================================================================
+// ============================================================================ Helper functions for reducing boilerplate ============================================================================
 
 /** Creates a type import spec for codec types */
 const codecTypeImport = (named: string) =>
@@ -124,21 +131,32 @@ const precisionHooks: CodecControlHooks = { expandNativeType: expandPrecision };
 const numericHooks: CodecControlHooks = { expandNativeType: expandNumeric };
 const identityHooks: CodecControlHooks = { expandNativeType: ({ nativeType }) => nativeType };
 
-// ============================================================================
-// Descriptor metadata
-// ============================================================================
+// ============================================================================ Descriptor metadata ============================================================================
 
-export const postgresQueryOperations: readonly SqlOperationDescriptor[] = [
-  {
-    method: 'ilike',
-    args: [
-      { traits: ['textual'], nullable: false },
-      { codecId: PG_TEXT_CODEC_ID, nullable: false },
-    ],
-    returns: { codecId: PG_BOOL_CODEC_ID, nullable: false },
-    lowering: { targetFamily: 'sql', strategy: 'infix', template: '{{self}} ILIKE {{arg0}}' },
-  },
-];
+type CodecTypesBase = Record<string, { readonly input: unknown; readonly output: unknown }>;
+
+export function postgresQueryOperations<
+  CT extends CodecTypesBase,
+>(): readonly SqlOperationDescriptor[] {
+  return [
+    {
+      method: 'ilike',
+      self: { traits: ['textual'] },
+      impl: (
+        self: TraitExpression<readonly ['textual'], false, CT>,
+        pattern: CodecExpression<'pg/text@1', false, CT>,
+      ): Expression<{ codecId: 'pg/bool@1'; nullable: false }> => {
+        const selfRefs = refsOf(self);
+        return buildOperation({
+          method: 'ilike',
+          args: [toExpr(self), toExpr(pattern, PG_TEXT_CODEC_ID, selfRefs)],
+          returns: { codecId: PG_BOOL_CODEC_ID, nullable: false },
+          lowering: { targetFamily: 'sql', strategy: 'infix', template: '{{self}} ILIKE {{arg0}}' },
+        });
+      },
+    },
+  ];
+}
 
 export const postgresAdapterDescriptorMeta = {
   kind: 'adapter',
@@ -162,7 +180,7 @@ export const postgresAdapterDescriptorMeta = {
   },
   types: {
     codecTypes: {
-      codecInstances: Object.values(codecDefinitions).map((def) => def.codec),
+      codecDescriptors: Array.from(postgresCodecRegistry.values()),
       import: {
         package: '@prisma-next/target-postgres/codec-types',
         named: 'CodecTypes',
@@ -202,6 +220,7 @@ export const postgresAdapterDescriptorMeta = {
         [PG_ENUM_CODEC_ID]: pgEnumControlHooks,
         [PG_JSON_CODEC_ID]: identityHooks,
         [PG_JSONB_CODEC_ID]: identityHooks,
+        [PG_BYTEA_CODEC_ID]: identityHooks,
       },
     },
     storage: [
@@ -267,6 +286,7 @@ export const postgresAdapterDescriptorMeta = {
       },
       { typeId: PG_JSON_CODEC_ID, familyId: 'sql', targetId: 'postgres', nativeType: 'json' },
       { typeId: PG_JSONB_CODEC_ID, familyId: 'sql', targetId: 'postgres', nativeType: 'jsonb' },
+      { typeId: PG_BYTEA_CODEC_ID, familyId: 'sql', targetId: 'postgres', nativeType: 'bytea' },
     ],
     queryOperationTypes: {
       import: {