@prisma-next/adapter-postgres 0.5.0-dev.3 → 0.5.0-dev.30

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (36) hide show
  1. package/dist/{adapter-hNElNHo4.mjs → adapter-_L4wXA4O.mjs} +9 -5
  2. package/dist/adapter-_L4wXA4O.mjs.map +1 -0
  3. package/dist/adapter.d.mts +2 -1
  4. package/dist/adapter.d.mts.map +1 -1
  5. package/dist/adapter.mjs +1 -1
  6. package/dist/control.d.mts +76 -3
  7. package/dist/control.d.mts.map +1 -1
  8. package/dist/control.mjs +44 -6
  9. package/dist/control.mjs.map +1 -1
  10. package/dist/{descriptor-meta-RTDzyrae.mjs → descriptor-meta-Dxnoq_rr.mjs} +22 -21
  11. package/dist/descriptor-meta-Dxnoq_rr.mjs.map +1 -0
  12. package/dist/operation-types.d.mts +11 -10
  13. package/dist/operation-types.d.mts.map +1 -1
  14. package/dist/runtime.d.mts +2 -2
  15. package/dist/runtime.d.mts.map +1 -1
  16. package/dist/runtime.mjs +10 -5
  17. package/dist/runtime.mjs.map +1 -1
  18. package/dist/{sql-renderer-pEaSP82_.mjs → sql-renderer-DLwYpnxz.mjs} +97 -36
  19. package/dist/sql-renderer-DLwYpnxz.mjs.map +1 -0
  20. package/dist/{types-CfRPdAk8.d.mts → types-tLtmYqCO.d.mts} +12 -1
  21. package/dist/types-tLtmYqCO.d.mts.map +1 -0
  22. package/dist/types.d.mts +1 -1
  23. package/package.json +20 -20
  24. package/src/core/adapter.ts +10 -2
  25. package/src/core/codec-lookup.ts +24 -0
  26. package/src/core/control-adapter.ts +68 -1
  27. package/src/core/descriptor-meta.ts +29 -11
  28. package/src/core/sql-renderer.ts +118 -50
  29. package/src/core/types.ts +11 -0
  30. package/src/exports/control.ts +3 -2
  31. package/src/exports/runtime.ts +16 -3
  32. package/src/types/operation-types.ts +19 -9
  33. package/dist/adapter-hNElNHo4.mjs.map +0 -1
  34. package/dist/descriptor-meta-RTDzyrae.mjs.map +0 -1
  35. package/dist/sql-renderer-pEaSP82_.mjs.map +0 -1
  36. package/dist/types-CfRPdAk8.d.mts.map +0 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@prisma-next/adapter-postgres",
3
- "version": "0.5.0-dev.3",
3
+ "version": "0.5.0-dev.30",
4
4
  "type": "module",
5
5
  "sideEffects": false,
6
6
  "files": [
@@ -10,33 +10,33 @@
10
10
  "dependencies": {
11
11
  "ajv": "^8.18.0",
12
12
  "arktype": "^2.0.0",
13
- "@prisma-next/contract": "0.5.0-dev.3",
14
- "@prisma-next/family-sql": "0.5.0-dev.3",
15
- "@prisma-next/sql-contract": "0.5.0-dev.3",
16
- "@prisma-next/framework-components": "0.5.0-dev.3",
17
- "@prisma-next/ids": "0.5.0-dev.3",
18
- "@prisma-next/contract-authoring": "0.5.0-dev.3",
19
- "@prisma-next/sql-contract-psl": "0.5.0-dev.3",
20
- "@prisma-next/sql-contract-ts": "0.5.0-dev.3",
21
- "@prisma-next/sql-operations": "0.5.0-dev.3",
22
- "@prisma-next/sql-runtime": "0.5.0-dev.3",
23
- "@prisma-next/sql-relational-core": "0.5.0-dev.3",
24
- "@prisma-next/sql-schema-ir": "0.5.0-dev.3",
25
- "@prisma-next/utils": "0.5.0-dev.3",
26
- "@prisma-next/target-postgres": "0.5.0-dev.3"
13
+ "@prisma-next/contract-authoring": "0.5.0-dev.30",
14
+ "@prisma-next/contract": "0.5.0-dev.30",
15
+ "@prisma-next/family-sql": "0.5.0-dev.30",
16
+ "@prisma-next/framework-components": "0.5.0-dev.30",
17
+ "@prisma-next/ids": "0.5.0-dev.30",
18
+ "@prisma-next/sql-contract": "0.5.0-dev.30",
19
+ "@prisma-next/sql-contract-ts": "0.5.0-dev.30",
20
+ "@prisma-next/sql-operations": "0.5.0-dev.30",
21
+ "@prisma-next/sql-relational-core": "0.5.0-dev.30",
22
+ "@prisma-next/sql-contract-psl": "0.5.0-dev.30",
23
+ "@prisma-next/sql-schema-ir": "0.5.0-dev.30",
24
+ "@prisma-next/target-postgres": "0.5.0-dev.30",
25
+ "@prisma-next/sql-runtime": "0.5.0-dev.30",
26
+ "@prisma-next/utils": "0.5.0-dev.30"
27
27
  },
28
28
  "devDependencies": {
29
29
  "pathe": "^2.0.3",
30
30
  "tsdown": "0.18.4",
31
31
  "typescript": "5.9.3",
32
32
  "vitest": "4.0.17",
33
- "@prisma-next/cli": "0.5.0-dev.3",
34
- "@prisma-next/driver-postgres": "0.5.0-dev.3",
35
- "@prisma-next/errors": "0.5.0-dev.3",
33
+ "@prisma-next/cli": "0.5.0-dev.30",
34
+ "@prisma-next/errors": "0.5.0-dev.30",
35
+ "@prisma-next/extension-pgvector": "0.5.0-dev.30",
36
+ "@prisma-next/tsconfig": "0.0.0",
36
37
  "@prisma-next/test-utils": "0.0.1",
37
- "@prisma-next/extension-pgvector": "0.5.0-dev.3",
38
38
  "@prisma-next/tsdown": "0.0.0",
39
- "@prisma-next/tsconfig": "0.0.0"
39
+ "@prisma-next/driver-postgres": "0.5.0-dev.30"
40
40
  },
41
41
  "exports": {
42
42
  "./adapter": "./dist/adapter.mjs",
@@ -1,3 +1,4 @@
1
+ import type { CodecLookup } from '@prisma-next/framework-components/codec';
1
2
  import {
2
3
  type Adapter,
3
4
  type AdapterProfile,
@@ -6,8 +7,10 @@ import {
6
7
  createCodecRegistry,
7
8
  type LowererContext,
8
9
  } from '@prisma-next/sql-relational-core/ast';
10
+ import { parseContractMarkerRow } from '@prisma-next/sql-runtime';
9
11
  import { codecDefinitions } from '@prisma-next/target-postgres/codecs';
10
12
  import { ifDefined } from '@prisma-next/utils/defined';
13
+ import { createPostgresBuiltinCodecLookup } from './codec-lookup';
11
14
  import { renderLoweredSql } from './sql-renderer';
12
15
  import type { PostgresAdapterOptions, PostgresContract, PostgresLoweredStatement } from './types';
13
16
 
@@ -58,17 +61,22 @@ class PostgresAdapterImpl
58
61
  }
59
62
  return registry;
60
63
  })();
64
+ private readonly codecLookup: CodecLookup;
61
65
 
62
66
  constructor(options?: PostgresAdapterOptions) {
67
+ this.codecLookup = options?.codecLookup ?? createPostgresBuiltinCodecLookup();
63
68
  this.profile = Object.freeze({
64
69
  id: options?.profileId ?? 'postgres/default@1',
65
70
  target: 'postgres',
66
71
  capabilities: defaultCapabilities,
67
72
  codecs: () => this.codecRegistry,
68
73
  readMarkerStatement: () => ({
69
- sql: 'select core_hash, profile_hash, contract_json, canonical_version, updated_at, app_tag, meta from prisma_contract.marker where id = $1',
74
+ sql: 'select core_hash, profile_hash, contract_json, canonical_version, updated_at, app_tag, meta, invariants from prisma_contract.marker where id = $1',
70
75
  params: [1],
71
76
  }),
77
+ // Postgres' driver hydrates `text[]` columns as native JS arrays, so
78
+ // the row is already in the shape the shared parser expects.
79
+ parseMarkerRow: (row: unknown) => parseContractMarkerRow(row),
72
80
  });
73
81
  }
74
82
 
@@ -77,7 +85,7 @@ class PostgresAdapterImpl
77
85
  }
78
86
 
79
87
  lower(ast: AnyQueryAst, context: LowererContext<PostgresContract>): PostgresLoweredStatement {
80
- return renderLoweredSql(ast, context.contract);
88
+ return renderLoweredSql(ast, context.contract, this.codecLookup);
81
89
  }
82
90
  }
83
91
 
@@ -0,0 +1,24 @@
1
+ import type { Codec, CodecLookup } from '@prisma-next/framework-components/codec';
2
+ import { codecDefinitions } from '@prisma-next/target-postgres/codecs';
3
+
4
+ /**
5
+ * Build a {@link CodecLookup} populated with the Postgres-builtin codec
6
+ * definitions only.
7
+ *
8
+ * This is the default lookup used by `createPostgresAdapter()` and
9
+ * `new PostgresControlAdapter()` when called without a stack-derived lookup
10
+ * (e.g. from tests, or one-off scripts that don't compose a full stack).
11
+ *
12
+ * Extension codecs (e.g. `pg/vector@1` from `@prisma-next/extension-pgvector`)
13
+ * are intentionally NOT included here: a bare adapter cannot see extensions.
14
+ * Stack-composed paths (`SqlControlAdapterDescriptor.create(stack)` /
15
+ * `SqlRuntimeAdapterDescriptor.create(stack)`) supply the broader,
16
+ * extension-inclusive lookup at construction time.
17
+ */
18
+ export function createPostgresBuiltinCodecLookup(): CodecLookup {
19
+ const byId = new Map<string, Codec>();
20
+ for (const definition of Object.values(codecDefinitions)) {
21
+ byId.set(definition.codec.id, definition.codec);
22
+ }
23
+ return { get: (id) => byId.get(id) };
24
+ }
@@ -1,4 +1,7 @@
1
+ import type { ContractMarkerRecord } from '@prisma-next/contract/types';
1
2
  import type { SqlControlAdapter } from '@prisma-next/family-sql/control-adapter';
3
+ import { parseContractMarkerRow } from '@prisma-next/family-sql/verify';
4
+ import type { CodecLookup } from '@prisma-next/framework-components/codec';
2
5
  import type { ControlDriverInstance } from '@prisma-next/framework-components/control';
3
6
  import type {
4
7
  AnyQueryAst,
@@ -19,6 +22,7 @@ import type {
19
22
  import { parsePostgresDefault } from '@prisma-next/target-postgres/default-normalizer';
20
23
  import { normalizeSchemaNativeType } from '@prisma-next/target-postgres/native-type-normalizer';
21
24
  import { ifDefined } from '@prisma-next/utils/defined';
25
+ import { createPostgresBuiltinCodecLookup } from './codec-lookup';
22
26
  import { pgEnumControlHooks } from './enum-control-hooks';
23
27
  import { renderLoweredSql } from './sql-renderer';
24
28
  import type { PostgresContract } from './types';
@@ -31,6 +35,19 @@ export class PostgresControlAdapter implements SqlControlAdapter<'postgres'> {
31
35
  readonly familyId = 'sql' as const;
32
36
  readonly targetId = 'postgres' as const;
33
37
 
38
+ private readonly codecLookup: CodecLookup;
39
+
40
+ /**
41
+ * @param codecLookup - Codec lookup used by the SQL renderer to resolve
42
+ * per-codec metadata at lower-time. Defaults to a Postgres-builtins-only
43
+ * lookup when omitted. Stack-aware callers
44
+ * (`SqlControlAdapterDescriptor.create(stack)`) supply
45
+ * `stack.codecLookup` so extension codecs are visible to the renderer.
46
+ */
47
+ constructor(codecLookup?: CodecLookup) {
48
+ this.codecLookup = codecLookup ?? createPostgresBuiltinCodecLookup();
49
+ }
50
+
34
51
  /**
35
52
  * Target-specific normalizer for raw Postgres default expressions.
36
53
  * Used by schema verification to normalize raw defaults before comparison.
@@ -53,7 +70,57 @@ export class PostgresControlAdapter implements SqlControlAdapter<'postgres'> {
53
70
  * without instantiating the runtime adapter.
54
71
  */
55
72
  lower(ast: AnyQueryAst, context: LowererContext<unknown>): LoweredStatement {
56
- return renderLoweredSql(ast, context.contract as PostgresContract);
73
+ return renderLoweredSql(ast, context.contract as PostgresContract, this.codecLookup);
74
+ }
75
+
76
+ /**
77
+ * Reads the contract marker from `prisma_contract.marker`. Probes
78
+ * `information_schema.tables` first so a fresh database (where the
79
+ * `prisma_contract` schema doesn't yet exist) returns `null` instead of a
80
+ * "relation does not exist" error — some Postgres wire-protocol clients
81
+ * (e.g. PGlite's TCP proxy) don't fully recover from extended-protocol
82
+ * parse errors, so we probe before reading.
83
+ */
84
+ async readMarker(
85
+ driver: ControlDriverInstance<'sql', 'postgres'>,
86
+ ): Promise<ContractMarkerRecord | null> {
87
+ const exists = await driver.query(
88
+ `select 1
89
+ from information_schema.tables
90
+ where table_schema = $1 and table_name = $2`,
91
+ ['prisma_contract', 'marker'],
92
+ );
93
+ if (exists.rows.length === 0) {
94
+ return null;
95
+ }
96
+
97
+ const result = await driver.query<{
98
+ core_hash: string;
99
+ profile_hash: string;
100
+ contract_json: unknown | null;
101
+ canonical_version: number | null;
102
+ updated_at: Date | string;
103
+ app_tag: string | null;
104
+ meta: unknown | null;
105
+ invariants: readonly string[];
106
+ }>(
107
+ `select
108
+ core_hash,
109
+ profile_hash,
110
+ contract_json,
111
+ canonical_version,
112
+ updated_at,
113
+ app_tag,
114
+ meta,
115
+ invariants
116
+ from prisma_contract.marker
117
+ where id = $1`,
118
+ [1],
119
+ );
120
+
121
+ const row = result.rows[0];
122
+ if (!row) return null;
123
+ return parseContractMarkerRow(row);
57
124
  }
58
125
 
59
126
  /**
@@ -1,5 +1,12 @@
1
1
  import type { CodecControlHooks, ExpandNativeTypeInput } from '@prisma-next/family-sql/control';
2
2
  import type { SqlOperationDescriptor } from '@prisma-next/sql-operations';
3
+ import {
4
+ buildOperation,
5
+ type CodecExpression,
6
+ type Expression,
7
+ type TraitExpression,
8
+ toExpr,
9
+ } from '@prisma-next/sql-relational-core/expression';
3
10
  import {
4
11
  PG_BIT_CODEC_ID,
5
12
  PG_BOOL_CODEC_ID,
@@ -128,17 +135,28 @@ const identityHooks: CodecControlHooks = { expandNativeType: ({ nativeType }) =>
128
135
  // Descriptor metadata
129
136
  // ============================================================================
130
137
 
131
- export const postgresQueryOperations: readonly SqlOperationDescriptor[] = [
132
- {
133
- method: 'ilike',
134
- args: [
135
- { traits: ['textual'], nullable: false },
136
- { codecId: PG_TEXT_CODEC_ID, nullable: false },
137
- ],
138
- returns: { codecId: PG_BOOL_CODEC_ID, nullable: false },
139
- lowering: { targetFamily: 'sql', strategy: 'infix', template: '{{self}} ILIKE {{arg0}}' },
140
- },
141
- ];
138
+ type CodecTypesBase = Record<string, { readonly input: unknown; readonly output: unknown }>;
139
+
140
+ export function postgresQueryOperations<
141
+ CT extends CodecTypesBase,
142
+ >(): readonly SqlOperationDescriptor[] {
143
+ return [
144
+ {
145
+ method: 'ilike',
146
+ self: { traits: ['textual'] },
147
+ impl: (
148
+ self: TraitExpression<readonly ['textual'], false, CT>,
149
+ pattern: CodecExpression<'pg/text@1', false, CT>,
150
+ ): Expression<{ codecId: 'pg/bool@1'; nullable: false }> =>
151
+ buildOperation({
152
+ method: 'ilike',
153
+ args: [toExpr(self), toExpr(pattern, PG_TEXT_CODEC_ID)],
154
+ returns: { codecId: PG_BOOL_CODEC_ID, nullable: false },
155
+ lowering: { targetFamily: 'sql', strategy: 'infix', template: '{{self}} ILIKE {{arg0}}' },
156
+ }),
157
+ },
158
+ ];
159
+ }
142
160
 
143
161
  export const postgresAdapterDescriptorMeta = {
144
162
  kind: 'adapter',
@@ -1,3 +1,4 @@
1
+ import type { CodecLookup } from '@prisma-next/framework-components/codec';
1
2
  import {
2
3
  type AggregateExpr,
3
4
  type AnyExpression,
@@ -5,6 +6,7 @@ import {
5
6
  type AnyQueryAst,
6
7
  type BinaryExpr,
7
8
  type ColumnRef,
9
+ collectOrderedParamRefs,
8
10
  type DeleteAst,
9
11
  type InsertAst,
10
12
  type InsertValue,
@@ -20,50 +22,97 @@ import {
20
22
  type ParamRef,
21
23
  type ProjectionItem,
22
24
  type SelectAst,
25
+ type Codec as SqlCodec,
23
26
  type SubqueryExpr,
24
27
  type UpdateAst,
25
28
  } from '@prisma-next/sql-relational-core/ast';
26
- import { PG_JSON_CODEC_ID, PG_JSONB_CODEC_ID } from '@prisma-next/target-postgres/codec-ids';
27
29
  import { escapeLiteral, quoteIdentifier } from '@prisma-next/target-postgres/sql-utils';
28
30
  import type { PostgresContract } from './types';
29
31
 
30
- // Mirrors `VECTOR_CODEC_ID` in `@prisma-next/extension-pgvector/core/constants`.
31
- // Duplicated here rather than imported because the canonical export is not
32
- // part of the extension's public subpath surface, and `@prisma-next/adapter-postgres`
33
- // does not (and should not) take a runtime dependency on the extension package
34
- // just for one constant. The whole `getCodecParamCast` switch is slated for
35
- // removal under TML-2310 ("Move SQL param-cast metadata onto codec descriptors"),
36
- // at which point this and the JSON/JSONB IDs below also disappear.
37
- const VECTOR_CODEC_ID = 'pg/vector@1' as const;
38
-
39
32
  /**
40
- * Map a codec ID to its `::cast` suffix, if Postgres requires one for
41
- * parameterized values (e.g. `$1::vector`, `$1::jsonb`).
33
+ * Postgres native types whose unknown-OID parameter inference is reliable in
34
+ * arbitrary expression positions. Parameters bound to a codec whose
35
+ * `meta.db.sql.postgres.nativeType` falls in this set are emitted as plain
36
+ * `$N`; everything else (including `json`, `jsonb`, extension types like
37
+ * `vector`, and unknown user types) is emitted as `$N::<nativeType>` so the
38
+ * planner picks an unambiguous overload.
39
+ *
40
+ * `json` / `jsonb` are intentionally excluded despite being Postgres builtins:
41
+ * their operator overloads make context inference unreliable in expression
42
+ * positions (e.g. `$1 -> 'key'` is ambiguous between the two).
42
43
  *
43
- * NOTE: hardcoded codec IDs here are a known wart, tracked separately by
44
- * TML-2310 ("Move SQL param-cast metadata onto codec descriptors").
45
- * Until that lands the cast lives on the renderer rather than the codec.
44
+ * Spellings match the on-disk `meta.db.sql.postgres.nativeType` values in
45
+ * `@prisma-next/target-postgres`'s codec definitions, not the `udt_name`
46
+ * abbreviations that ADR 205 used as illustrative shorthand. The lookup-based
47
+ * cast policy compares against these strings directly.
46
48
  */
47
- function getCodecParamCast(codecId: string | undefined): string | undefined {
48
- if (codecId === VECTOR_CODEC_ID) {
49
- return 'vector';
50
- }
51
- if (codecId === PG_JSON_CODEC_ID) {
52
- return 'json';
53
- }
54
- if (codecId === PG_JSONB_CODEC_ID) {
55
- return 'jsonb';
56
- }
57
- return undefined;
49
+ const POSTGRES_INFERRABLE_NATIVE_TYPES: ReadonlySet<string> = new Set([
50
+ // Numeric
51
+ 'integer',
52
+ 'smallint',
53
+ 'bigint',
54
+ 'real',
55
+ 'double precision',
56
+ 'numeric',
57
+ // Boolean
58
+ 'boolean',
59
+ // Strings
60
+ 'text',
61
+ 'character',
62
+ 'character varying',
63
+ // Temporal
64
+ 'timestamp',
65
+ 'timestamp without time zone',
66
+ 'timestamp with time zone',
67
+ 'time',
68
+ 'timetz',
69
+ 'interval',
70
+ // Bit strings
71
+ 'bit',
72
+ 'bit varying',
73
+ ]);
74
+
75
+ function renderTypedParam(
76
+ index: number,
77
+ codecId: string | undefined,
78
+ codecLookup: CodecLookup,
79
+ ): string {
80
+ if (codecId === undefined) {
81
+ return `$${index}`;
82
+ }
83
+ // SQL codecs extend the framework `Codec` base with an optional
84
+ // `meta: CodecMeta`; the framework `CodecLookup.get` returns the base type,
85
+ // so we narrow to `SqlCodec` to read `meta`. Every codec actually
86
+ // registered into a SQL codec lookup conforms to `SqlCodec`.
87
+ const codec = codecLookup.get(codecId) as SqlCodec | undefined;
88
+ if (codec === undefined) {
89
+ throw new Error(
90
+ `Postgres lowering: ParamRef carries codecId "${codecId}" but the ` +
91
+ 'assembled codec lookup has no entry for it. This usually indicates ' +
92
+ 'a missing extension pack in the runtime stack — register the pack ' +
93
+ 'that contributes this codec (e.g. `extensionPacks: [pgvectorRuntime]`), ' +
94
+ 'or use the codec directly from `@prisma-next/target-postgres/codecs` ' +
95
+ "if it's a builtin.",
96
+ );
97
+ }
98
+ const nativeType = codec.meta?.db?.sql?.postgres?.nativeType;
99
+ if (nativeType !== undefined && !POSTGRES_INFERRABLE_NATIVE_TYPES.has(nativeType)) {
100
+ return `$${index}::${nativeType}`;
101
+ }
102
+ return `$${index}`;
58
103
  }
59
104
 
60
- function renderTypedParam(index: number, codecId: string | undefined): string {
61
- const cast = getCodecParamCast(codecId);
62
- return cast ? `$${index}::${cast}` : `$${index}`;
105
+ /**
106
+ * Per-render carrier threaded through every helper. Bundles the param-index
107
+ * map (for `$N` numbering) and the assembled-stack `codecLookup` (for
108
+ * cast policy at the `renderTypedParam` chokepoint). Carrying both on a
109
+ * single value keeps helper signatures stable.
110
+ */
111
+ interface ParamIndexMap {
112
+ readonly indexMap: Map<ParamRef, number>;
113
+ readonly codecLookup: CodecLookup;
63
114
  }
64
115
 
65
- type ParamIndexMap = Map<ParamRef, number>;
66
-
67
116
  /**
68
117
  * Render a SQL query AST to a Postgres-flavored `{ sql, params }` payload.
69
118
  *
@@ -74,32 +123,30 @@ type ParamIndexMap = Map<ParamRef, number>;
74
123
  export function renderLoweredSql(
75
124
  ast: AnyQueryAst,
76
125
  contract: PostgresContract,
126
+ codecLookup: CodecLookup,
77
127
  ): { readonly sql: string; readonly params: readonly unknown[] } {
78
- const collectedParamRefs = ast.collectParamRefs();
79
- const paramIndexMap: ParamIndexMap = new Map();
80
- const params: unknown[] = [];
81
- for (const ref of collectedParamRefs) {
82
- if (paramIndexMap.has(ref)) {
83
- continue;
84
- }
85
- paramIndexMap.set(ref, params.length + 1);
86
- params.push(ref.value);
87
- }
128
+ const orderedRefs = collectOrderedParamRefs(ast);
129
+ const indexMap = new Map<ParamRef, number>();
130
+ const params: unknown[] = orderedRefs.map((ref, i) => {
131
+ indexMap.set(ref, i + 1);
132
+ return ref.value;
133
+ });
134
+ const pim: ParamIndexMap = { indexMap, codecLookup };
88
135
 
89
136
  const node = ast;
90
137
  let sql: string;
91
138
  switch (node.kind) {
92
139
  case 'select':
93
- sql = renderSelect(node, contract, paramIndexMap);
140
+ sql = renderSelect(node, contract, pim);
94
141
  break;
95
142
  case 'insert':
96
- sql = renderInsert(node, contract, paramIndexMap);
143
+ sql = renderInsert(node, contract, pim);
97
144
  break;
98
145
  case 'update':
99
- sql = renderUpdate(node, contract, paramIndexMap);
146
+ sql = renderUpdate(node, contract, pim);
100
147
  break;
101
148
  case 'delete':
102
- sql = renderDelete(node, contract, paramIndexMap);
149
+ sql = renderDelete(node, contract, pim);
103
150
  break;
104
151
  // v8 ignore next 4
105
152
  default:
@@ -171,6 +218,27 @@ function renderProjection(
171
218
  .join(', ');
172
219
  }
173
220
 
221
+ function renderReturning(
222
+ items: ReadonlyArray<ProjectionItem>,
223
+ contract: PostgresContract,
224
+ pim: ParamIndexMap,
225
+ ): string {
226
+ return items
227
+ .map((item) => {
228
+ if (item.expr.kind === 'column-ref') {
229
+ const rendered = renderColumn(item.expr);
230
+ return item.expr.column === item.alias
231
+ ? rendered
232
+ : `${rendered} AS ${quoteIdentifier(item.alias)}`;
233
+ }
234
+ if (item.expr.kind === 'literal') {
235
+ return `${renderLiteral(item.expr)} AS ${quoteIdentifier(item.alias)}`;
236
+ }
237
+ return `${renderExpr(item.expr, contract, pim)} AS ${quoteIdentifier(item.alias)}`;
238
+ })
239
+ .join(', ');
240
+ }
241
+
174
242
  function renderDistinctPrefix(
175
243
  distinct: true | undefined,
176
244
  distinctOn: ReadonlyArray<AnyExpression> | undefined,
@@ -457,11 +525,11 @@ function renderExpr(expr: AnyExpression, contract: PostgresContract, pim: ParamI
457
525
  }
458
526
 
459
527
  function renderParamRef(ref: ParamRef, pim: ParamIndexMap): string {
460
- const index = pim.get(ref);
528
+ const index = pim.indexMap.get(ref);
461
529
  if (index === undefined) {
462
530
  throw new Error('ParamRef not found in index map');
463
531
  }
464
- return renderTypedParam(index, ref.codecId);
532
+ return renderTypedParam(index, ref.codecId, pim.codecLookup);
465
533
  }
466
534
 
467
535
  function renderLiteral(expr: LiteralExpr): string {
@@ -660,7 +728,7 @@ function renderInsert(ast: InsertAst, contract: PostgresContract, pim: ParamInde
660
728
  })()
661
729
  : '';
662
730
  const returningClause = ast.returning?.length
663
- ? ` RETURNING ${ast.returning.map((col) => `${quoteIdentifier(col.table)}.${quoteIdentifier(col.column)}`).join(', ')}`
731
+ ? ` RETURNING ${renderReturning(ast.returning, contract, pim)}`
664
732
  : '';
665
733
 
666
734
  return `${insertClause}${onConflictClause}${returningClause}`;
@@ -693,7 +761,7 @@ function renderUpdate(ast: UpdateAst, contract: PostgresContract, pim: ParamInde
693
761
 
694
762
  const whereClause = ast.where ? ` WHERE ${renderWhere(ast.where, contract, pim)}` : '';
695
763
  const returningClause = ast.returning?.length
696
- ? ` RETURNING ${ast.returning.map((col) => `${quoteIdentifier(col.table)}.${quoteIdentifier(col.column)}`).join(', ')}`
764
+ ? ` RETURNING ${renderReturning(ast.returning, contract, pim)}`
697
765
  : '';
698
766
 
699
767
  return `UPDATE ${table} SET ${setClauses.join(', ')}${whereClause}${returningClause}`;
@@ -703,7 +771,7 @@ function renderDelete(ast: DeleteAst, contract: PostgresContract, pim: ParamInde
703
771
  const table = quoteIdentifier(ast.table.name);
704
772
  const whereClause = ast.where ? ` WHERE ${renderWhere(ast.where, contract, pim)}` : '';
705
773
  const returningClause = ast.returning?.length
706
- ? ` RETURNING ${ast.returning.map((col) => `${quoteIdentifier(col.table)}.${quoteIdentifier(col.column)}`).join(', ')}`
774
+ ? ` RETURNING ${renderReturning(ast.returning, contract, pim)}`
707
775
  : '';
708
776
 
709
777
  return `DELETE FROM ${table}${whereClause}${returningClause}`;
package/src/core/types.ts CHANGED
@@ -1,4 +1,5 @@
1
1
  import type { Contract } from '@prisma-next/contract/types';
2
+ import type { CodecLookup } from '@prisma-next/framework-components/codec';
2
3
  import type { SqlStorage, StorageColumn, StorageTable } from '@prisma-next/sql-contract/types';
3
4
  import type {
4
5
  AnyQueryAst,
@@ -19,6 +20,16 @@ import type {
19
20
 
20
21
  export interface PostgresAdapterOptions {
21
22
  readonly profileId?: string;
23
+ /**
24
+ * Codec lookup used by the SQL renderer to resolve per-codec metadata at
25
+ * lower-time. Defaults to a Postgres-builtins-only lookup when omitted —
26
+ * see {@link createPostgresBuiltinCodecLookup} in `./codec-lookup`.
27
+ *
28
+ * Stack-aware callers (`SqlRuntimeAdapterDescriptor.create(stack)` /
29
+ * `SqlControlAdapterDescriptor.create(stack)`) supply the assembled stack
30
+ * lookup so extension codecs are visible to the renderer.
31
+ */
32
+ readonly codecLookup?: CodecLookup;
22
33
  }
23
34
 
24
35
  export type PostgresContract = Contract<SqlStorage> & { readonly target: 'postgres' };
@@ -21,8 +21,8 @@ const postgresAdapterDescriptor: SqlControlAdapterDescriptor<'postgres'> = {
21
21
  defaultFunctionRegistry: createPostgresDefaultFunctionRegistry(),
22
22
  generatorDescriptors: createPostgresMutationDefaultGeneratorDescriptors(),
23
23
  },
24
- create(_stack): SqlControlAdapter<'postgres'> {
25
- return new PostgresControlAdapter();
24
+ create(stack): SqlControlAdapter<'postgres'> {
25
+ return new PostgresControlAdapter(stack.codecLookup);
26
26
  },
27
27
  };
28
28
 
@@ -31,3 +31,4 @@ export default postgresAdapterDescriptor;
31
31
  export { parsePostgresDefault } from '@prisma-next/target-postgres/default-normalizer';
32
32
  export { normalizeSchemaNativeType } from '@prisma-next/target-postgres/native-type-normalizer';
33
33
  export { escapeLiteral, qualifyName, quoteIdentifier, SqlEscapeError };
34
+ export { PostgresControlAdapter } from '../core/control-adapter';
@@ -1,4 +1,5 @@
1
1
  import type { GeneratedValueSpec } from '@prisma-next/contract/types';
2
+ import { extractCodecLookup } from '@prisma-next/framework-components/control';
2
3
  import type { RuntimeAdapterInstance } from '@prisma-next/framework-components/execution';
3
4
  import { builtinGeneratorIds } from '@prisma-next/ids';
4
5
  import { generateId } from '@prisma-next/ids/runtime';
@@ -79,10 +80,22 @@ const postgresRuntimeAdapterDescriptor: SqlRuntimeAdapterDescriptor<'postgres',
79
80
  ...postgresAdapterDescriptorMeta,
80
81
  codecs: createPostgresCodecRegistry,
81
82
  parameterizedCodecs: () => parameterizedCodecDescriptors,
82
- queryOperations: () => postgresQueryOperations,
83
+ queryOperations: () => postgresQueryOperations(),
83
84
  mutationDefaultGenerators: createPostgresMutationDefaultGenerators,
84
- create(_stack): SqlRuntimeAdapter {
85
- return createPostgresAdapter();
85
+ create(stack): SqlRuntimeAdapter {
86
+ // The runtime `ExecutionStack` does not (yet) carry a pre-assembled
87
+ // `codecLookup` field the way the control `ControlStack` does, so we
88
+ // derive an equivalent lookup here from the stack's component metadata
89
+ // (target + adapter + extension packs) using the same assembly helper
90
+ // that `createControlStack` uses. This keeps the renderer fed with the
91
+ // same codec set on both planes — including extension-contributed
92
+ // codecs like `pg/vector@1` from `@prisma-next/extension-pgvector`.
93
+ const codecLookup = extractCodecLookup([
94
+ stack.target,
95
+ stack.adapter,
96
+ ...stack.extensionPacks,
97
+ ]);
98
+ return createPostgresAdapter({ codecLookup });
86
99
  },
87
100
  };
88
101
 
@@ -1,11 +1,21 @@
1
1
  import type { SqlQueryOperationTypes } from '@prisma-next/sql-contract/types';
2
+ import type {
3
+ CodecExpression,
4
+ Expression,
5
+ TraitExpression,
6
+ } from '@prisma-next/sql-relational-core/expression';
2
7
 
3
- export type QueryOperationTypes = SqlQueryOperationTypes<{
4
- readonly ilike: {
5
- readonly args: readonly [
6
- { readonly traits: readonly ['textual']; readonly nullable: false },
7
- { readonly codecId: 'pg/text@1'; readonly nullable: false },
8
- ];
9
- readonly returns: { readonly codecId: 'pg/bool@1'; readonly nullable: false };
10
- };
11
- }>;
8
+ type CodecTypesBase = Record<string, { readonly input: unknown; readonly output: unknown }>;
9
+
10
+ export type QueryOperationTypes<CT extends CodecTypesBase> = SqlQueryOperationTypes<
11
+ CT,
12
+ {
13
+ readonly ilike: {
14
+ readonly self: { readonly traits: readonly ['textual'] };
15
+ readonly impl: (
16
+ self: TraitExpression<readonly ['textual'], false, CT>,
17
+ pattern: CodecExpression<'pg/text@1', false, CT>,
18
+ ) => Expression<{ codecId: 'pg/bool@1'; nullable: false }>;
19
+ };
20
+ }
21
+ >;
@@ -1 +0,0 @@
1
- {"version":3,"file":"adapter-hNElNHo4.mjs","names":["parameterizedCodecs: ReadonlyArray<CodecParamsDescriptor>"],"sources":["../src/core/adapter.ts"],"sourcesContent":["import {\n type Adapter,\n type AdapterProfile,\n type AnyQueryAst,\n type CodecParamsDescriptor,\n createCodecRegistry,\n type LowererContext,\n} from '@prisma-next/sql-relational-core/ast';\nimport { codecDefinitions } from '@prisma-next/target-postgres/codecs';\nimport { ifDefined } from '@prisma-next/utils/defined';\nimport { renderLoweredSql } from './sql-renderer';\nimport type { PostgresAdapterOptions, PostgresContract, PostgresLoweredStatement } from './types';\n\nconst defaultCapabilities = Object.freeze({\n postgres: {\n orderBy: true,\n limit: true,\n lateral: true,\n jsonAgg: true,\n returning: true,\n },\n sql: {\n enums: true,\n returning: true,\n defaultInInsert: true,\n },\n});\n\ntype AdapterCodec = (typeof codecDefinitions)[keyof typeof codecDefinitions]['codec'];\ntype ParameterizedCodec = AdapterCodec & {\n readonly paramsSchema: NonNullable<AdapterCodec['paramsSchema']>;\n};\n\nconst parameterizedCodecs: ReadonlyArray<CodecParamsDescriptor> = Object.values(codecDefinitions)\n .map((definition) => definition.codec)\n .filter((codec): codec is ParameterizedCodec => codec.paramsSchema !== undefined)\n .map((codec) =>\n Object.freeze({\n codecId: codec.id,\n paramsSchema: codec.paramsSchema,\n ...ifDefined('init', codec.init),\n }),\n );\n\nclass PostgresAdapterImpl\n implements Adapter<AnyQueryAst, PostgresContract, PostgresLoweredStatement>\n{\n // These fields make the adapter instance structurally compatible with\n // RuntimeAdapterInstance<'sql', 'postgres'> without introducing a runtime-plane dependency.\n readonly familyId = 'sql' as const;\n readonly targetId = 'postgres' as const;\n\n readonly profile: AdapterProfile<'postgres'>;\n private readonly codecRegistry = (() => {\n const registry = createCodecRegistry();\n for (const definition of Object.values(codecDefinitions)) {\n registry.register(definition.codec);\n }\n return registry;\n })();\n\n constructor(options?: PostgresAdapterOptions) {\n this.profile = Object.freeze({\n id: options?.profileId ?? 'postgres/default@1',\n target: 'postgres',\n capabilities: defaultCapabilities,\n codecs: () => this.codecRegistry,\n readMarkerStatement: () => ({\n sql: 'select core_hash, profile_hash, contract_json, canonical_version, updated_at, app_tag, meta from prisma_contract.marker where id = $1',\n params: [1],\n }),\n });\n }\n\n parameterizedCodecs(): ReadonlyArray<CodecParamsDescriptor> {\n return parameterizedCodecs;\n }\n\n lower(ast: AnyQueryAst, context: LowererContext<PostgresContract>): PostgresLoweredStatement {\n return renderLoweredSql(ast, context.contract);\n }\n}\n\nexport function createPostgresAdapter(options?: PostgresAdapterOptions) {\n return Object.freeze(new PostgresAdapterImpl(options));\n}\n"],"mappings":";;;;;;AAaA,MAAM,sBAAsB,OAAO,OAAO;CACxC,UAAU;EACR,SAAS;EACT,OAAO;EACP,SAAS;EACT,SAAS;EACT,WAAW;EACZ;CACD,KAAK;EACH,OAAO;EACP,WAAW;EACX,iBAAiB;EAClB;CACF,CAAC;AAOF,MAAMA,sBAA4D,OAAO,OAAO,iBAAiB,CAC9F,KAAK,eAAe,WAAW,MAAM,CACrC,QAAQ,UAAuC,MAAM,iBAAiB,OAAU,CAChF,KAAK,UACJ,OAAO,OAAO;CACZ,SAAS,MAAM;CACf,cAAc,MAAM;CACpB,GAAG,UAAU,QAAQ,MAAM,KAAK;CACjC,CAAC,CACH;AAEH,IAAM,sBAAN,MAEA;CAGE,AAAS,WAAW;CACpB,AAAS,WAAW;CAEpB,AAAS;CACT,AAAiB,uBAAuB;EACtC,MAAM,WAAW,qBAAqB;AACtC,OAAK,MAAM,cAAc,OAAO,OAAO,iBAAiB,CACtD,UAAS,SAAS,WAAW,MAAM;AAErC,SAAO;KACL;CAEJ,YAAY,SAAkC;AAC5C,OAAK,UAAU,OAAO,OAAO;GAC3B,IAAI,SAAS,aAAa;GAC1B,QAAQ;GACR,cAAc;GACd,cAAc,KAAK;GACnB,4BAA4B;IAC1B,KAAK;IACL,QAAQ,CAAC,EAAE;IACZ;GACF,CAAC;;CAGJ,sBAA4D;AAC1D,SAAO;;CAGT,MAAM,KAAkB,SAAqE;AAC3F,SAAO,iBAAiB,KAAK,QAAQ,SAAS;;;AAIlD,SAAgB,sBAAsB,SAAkC;AACtE,QAAO,OAAO,OAAO,IAAI,oBAAoB,QAAQ,CAAC"}