fix(client): keep fluent relation fields named select or include when unpacking results by spokodev · Pull Request #29683 · prisma/orm

spokodev · 2026-07-02T13:11:36Z

RequestHandler.unpack derives the path to read a fluent-API result out of the
response with:

const pathForGet = dataPath.filter((key) => key !== 'select' && key !== 'include')

dataPath is a sequence of [selector, relationField] pairs, where the selector
is always select or include and the relation field names are at the odd
positions. Filtering by the literal string value also strips any relation field
that is itself named select or include, so deepGet receives the wrong path
and returns the wrong slice of the response (often the whole response object).

Both select and include are valid Prisma relation field names. For example a
dataPath of ['select', 'select'] produced [] and returned the entire object
instead of response.select. The sibling module resolve-result-extension-context
already reads the same dataPath positionally (index += 2) and ships tests for
fields named select and include; only unpack was left on the naive filter.

The fix derives the path positionally through a small dataPathToGetPath helper,
keeping the odd-position field names. Behavior is identical for every field name
except select and include.

… unpacking results

coderabbitai · 2026-07-02T13:12:31Z

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: Organization UI

Review profile: ASSERTIVE

Plan: Pro

Run ID: 68b22c9d-eb35-4061-9f58-c968d0c7adb0

📥 Commits

Reviewing files that changed from the base of the PR and between 918cf5d and 40e4bae.

📒 Files selected for processing (2)

packages/client/src/runtime/RequestHandler.ts
packages/client/src/runtime/dataPathToGetPath.test.ts

Summary by CodeRabbit

Bug Fixes
- Improved how nested results are resolved, making related data lookups more reliable.
- Fixed handling for field names that match reserved words like select and include, so they are no longer mistaken for path markers.
Tests
- Added coverage for nested path conversion and edge cases, including empty paths.

Walkthrough

This change introduces a new exported helper function, dataPathToGetPath, in RequestHandler.ts that derives a positional path of relation-field names from a fluent-API dataPath array by stepping through odd indices. The unpack method is updated to use this helper for computing pathForGet instead of filtering out 'select'/'include' literal entries. A new test file adds Jest coverage for the helper, verifying standard extraction, preservation of fields literally named "select" or "include", and empty-path handling.

Changes

Files	Change Summary
`packages/client/src/runtime/RequestHandler.ts`	Added exported `dataPathToGetPath(dataPath: string[]): string[]`; updated `unpack` to derive `pathForGet` via this helper
`packages/client/src/runtime/dataPathToGetPath.test.ts`	New test file with three test cases for `dataPathToGetPath`

Sequence Diagram(s)

sequenceDiagram
  participant unpack
  participant dataPathToGetPath
  unpack->>dataPathToGetPath: pass dataPath
  dataPathToGetPath-->>unpack: return pathForGet
  unpack->>unpack: read nested result using pathForGet

Related PRs: None identified.

Suggested labels: package/client, area/general

Suggested reviewers: None identified.

Poem: 🐰 A path once tangled, select and include entwined,
Now steps in twos, a pattern well-defined,
Odd indices hop, relation names in tow,
A helper born to make the getPath flow,
Tests confirm the hops are clean and true.

🚥 Pre-merge checks | ✅ 5

✅ Passed checks (5 passed)

Check name	Status	Explanation
Title check	✅ Passed	The title clearly describes the main fix: preserving fluent relation fields named select or include during unpacking.
Description check	✅ Passed	The description matches the changeset and explains the bug, root cause, and positional-path fix accurately.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests

✨ Simplify code

Create PR with simplified code

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands.}

CLAassistant · 2026-07-02T13:13:23Z

All committers have signed the CLA.

Ziiyodullayevv

Good fix for fluent relation fields. Keeping select or include named fields when unpacking results ensures query results maintain their expected structure.

aqrln

Thank you!

… unpacking results (prisma#29683) `RequestHandler.unpack` derives the path to read a fluent-API result out of the response with: const pathForGet = dataPath.filter((key) => key !== 'select' && key !== 'include') `dataPath` is a sequence of `[selector, relationField]` pairs, where the selector is always `select` or `include` and the relation field names are at the odd positions. Filtering by the literal string value also strips any relation field that is itself named `select` or `include`, so `deepGet` receives the wrong path and returns the wrong slice of the response (often the whole response object). Both `select` and `include` are valid Prisma relation field names. For example a dataPath of `['select', 'select']` produced `[]` and returned the entire object instead of `response.select`. The sibling module `resolve-result-extension-context` already reads the same dataPath positionally (`index += 2`) and ships tests for fields named `select` and `include`; only `unpack` was left on the naive filter. The fix derives the path positionally through a small `dataPathToGetPath` helper, keeping the odd-position field names. Behavior is identical for every field name except `select` and `include`.

This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [@prisma/adapter-pg](https://github.com/prisma/prisma) ([source](https://github.com/prisma/prisma/tree/HEAD/packages/adapter-pg)) | imports | minor | [`7.9.1` -> `7.10.0`](https://renovatebot.com/diffs/npm/@prisma%2fadapter-pg/7.9.1/7.10.0) | | [@prisma/client](https://www.prisma.io) ([source](https://github.com/prisma/prisma/tree/HEAD/packages/client)) | imports | minor | [`7.9.1` -> `7.10.0`](https://renovatebot.com/diffs/npm/@prisma%2fclient/7.9.1/7.10.0) | --- ### Release Notes <details> <summary>prisma/prisma (@prisma/adapter-pg)</summary> ### [`v7.10.0`](https://github.com/prisma/orm/releases/tag/7.10.0) [Compare Source](prisma/orm@7.9.1...7.10.0) ##### Prisma ORM 7.10.0 Prisma ORM 7.10.0 introduces a compatibility package for running Prisma 7 alongside newer Prisma versions, secures Prisma Studio's local server, and includes fixes across Prisma Client and the PostgreSQL, MariaDB, Neon, SQLite, and Prisma Postgres Serverless adapters. ##### Highlights ##### Run Prisma 7 alongside Prisma 8 This release introduces `@prisma/prisma7`, a compatibility package that lets you retain a matching Prisma 7 CLI and configuration while installing Prisma 8 in the same project. Once 7.10.0 is released, a side-by-side installation can use: ```sh npm install --save-dev prisma@8 @prisma/prisma7@7.10.0 npm install @prisma/client@7.10.0 ``` Use `prisma` for the directly installed Prisma 8 CLI and `prisma7` for Prisma 7: ```sh npx prisma --version npx prisma7 --version npx prisma7 generate npx prisma7 migrate dev npx prisma7 db push ``` Prisma 7 now prefers version-specific configuration files, allowing its configuration to coexist with Prisma 8's `prisma.config.*` files: ```ts // prisma7.config.ts import { defineConfig } from '@prisma/prisma7/config' export default defineConfig({ schema: 'prisma/schema.prisma', migrations: { path: 'prisma/migrations', }, }) ``` Without an explicit `--config` option, Prisma 7 searches for: 1. Root-level `prisma7.config.*` files. 2. `.config/prisma7.*` files. 3. Existing `prisma.config.*` files as a backwards-compatible fallback. The supported extensions are `.js`, `.ts`, `.mjs`, `.cjs`, `.mts`, and `.cts`. An explicit config path always takes precedence: ```sh npx prisma7 generate --config ./custom/prisma7.config.ts ``` New projects initialized by the Prisma 7 CLI use `prisma7.config.ts`. Existing projects containing only `prisma.config.*` continue to work without migration or additional warnings. If a `prisma7.config.*` file exists but cannot be loaded, Prisma reports the error rather than silently falling back to another configuration. The `prisma7` identity is carried through CLI help, version output, shell completion, initialization, migration, database, and generation guidance. Stable Prisma concepts such as `schema.prisma`, Prisma Migrate, `@prisma/client`, and `PRISMA_*` environment variables remain unchanged. Together, the separate executable and configuration namespace make it possible to operate Prisma 7 and Prisma 8 side by side without command or config-file collisions. [#29949](prisma/orm#29949), [#29969](prisma/orm#29969), [#29994](prisma/orm#29994), [#30000](prisma/orm#30000), [#30002](prisma/orm#30002), [#30020](prisma/orm#30020) ##### Prisma Studio security hardening Prisma Studio's local HTTP server now: - Binds explicitly to `127.0.0.1` instead of all network interfaces. - Rejects browser requests from origins other than the active `localhost` or `127.0.0.1` Studio URL. - No longer returns wildcard CORS headers. - Applies the same protections across Node.js, Bun, and Deno. This prevents network clients or malicious websites from accessing Studio's database endpoints while Studio is running. [#29890](prisma/orm#29890) ##### Prisma Client - Fixed `P2002` errors from nested writes so `meta.modelName` identifies the model where the unique constraint violation occurred, including models using `@@map` and `@@schema`. [#29628](prisma/orm#29628) - Fixed automatically batched `findUniqueOrThrow()` calls so every missing record rejects with `P2025`; later misses no longer resolve to `undefined`. [#29654](prisma/orm#29654) - Parameter-chunked statements are now executed atomically in a transaction and rolled back if a later chunk fails. [#29771](prisma/orm#29771) - Improved interactive transaction cleanup during `$disconnect()`, including transactions whose driver-level startup is still in progress. [#28768](prisma/orm#28768) - Prevented transaction cleanup failures after a timeout or backend termination from becoming unhandled promise rejections. [#29611](prisma/orm#29611) - Fixed fluent relation queries when relation fields are literally named `select` or `include`. [#29683](prisma/orm#29683) - Fixed handling of `Date` and `Uint8Array` values created in other JavaScript realms, such as iframes, jsdom, and Node.js `vm` contexts. [#29177](prisma/orm#29177) - Invalid `Date` values passed to `$queryRaw` or `$executeRaw` now throw `PrismaClientValidationError` instead of a generic error. [#29718](prisma/orm#29718) - Fixed `moduleFormat` inference for the `prisma-client` generator in TypeScript projects using `module: "node16"` or `"nodenext"`. Generated output now follows the nearest `package.json` `type`, defaulting to CommonJS when absent. [#29712](prisma/orm#29712) - Deserialized `Bytes` values now own standalone `ArrayBuffer`s rather than exposing unrelated contents from Node.js's shared `Buffer` pool. This applies to both regular and raw query results. [#29701](prisma/orm#29701) - Fixed an incorrect logging context in the remote executor, including Accelerate-backed query execution. [#28892](prisma/orm#28892) ##### Client extensions and observability - Result-extension `compute` callbacks now receive the current model name as a typed second argument: ```ts compute(data, modelName) { // ... } ``` The model name is also preserved when multiple extensions compose the same computed field. [#29782](prisma/orm#29782) - Improved OpenTelemetry context for remotely executed queries: - `$on('query')` callbacks run within the matching `db_query` span. - Events from one operation share the same trace. - Error events are recorded as span exceptions. - Log events continue to be emitted when tracing is disabled or their reported span is unavailable. [#28892](prisma/orm#28892) ##### Driver adapters ##### MariaDB - `@prisma/adapter-mariadb` now accepts an existing `mariadb` pool. External pools remain caller-owned unless `disposeExternalPool: true` is supplied. [#27992](prisma/orm#27992) - Fixed pooled connection leaks during commit, rollback, and failed transaction startup. Connections are now returned with `release()` and transaction-specific listeners are removed before reuse. [#29612](prisma/orm#29612) - Added support for bracketed IPv6 addresses in both `mysql://` and `mariadb://` connection strings. [#29026](prisma/orm#29026) - Prevented malformed connection strings from exposing embedded passwords in retained debug output and diagnostic reports. [#27992](prisma/orm#27992) ##### PostgreSQL, Neon, and Prisma Postgres Serverless - PostgreSQL deadlocks using SQLSTATE `40P01` are now reported as `P2034` transaction write conflicts. [#29717](prisma/orm#29717) - PostgreSQL `RESTRICT` violations using SQLSTATE `23001` are now reported as `P2003`, preserving an available field or constraint name. [#29554](prisma/orm#29554) - `@prisma/adapter-pg` now preserves database constraint names when reporting unique constraint violations through `P2002`. [#29587](prisma/orm#29587) - Prisma Postgres Serverless now prefers the named constraint for `P2002`, falling back to parsed field names when no constraint name is available. [#29801](prisma/orm#29801) - Fixed Neon HTTP adapter serialization for typed parameters such as `Bytes` and `DateTime`. [#29747](prisma/orm#29747) ##### SQLite - `@prisma/adapter-better-sqlite3` now converts previously unhandled SQLite result codes into typed database errors instead of exposing raw driver errors. - The complete `SQLITE_BUSY` family is now mapped to socket timeout errors, with numeric extended result codes preserved where available. [#29794](prisma/orm#29794) ##### CLI and Migrate - `prisma generate` can now offer to install Prisma's agent skills. The opt-in prompt: - Is shown at most once per machine. - Is skipped in CI, containers, Git hooks, npm lifecycle scripts, and watch mode. - Is skipped when `--no-hints` is used or Prisma skills are already installed. - Times out after 30 seconds. - Never causes generation to fail if installation is unsuccessful. [#29690](prisma/orm#29690) - A globally installed CLI now warns during `prisma generate` when its version differs from the project's local `prisma` or `@prisma/client`, and recommends running the local CLI. The check is best-effort and does not fail generation. [#29593](prisma/orm#29593) - `prisma version` and `prisma version --json` now include the resolved Prisma CLI package path, making global-versus-local installation issues easier to diagnose. [#29573](prisma/orm#29573) - Empty or generator-only schema files now report `Schema must contain a datasource block` from `db pull`, `db push`, and `migrate dev`, rather than reaching the schema engine and potentially producing inconsistent errors. [#29657](prisma/orm#29657) - CLI commands now tolerate corrupt, unreadable, or unwritable command-state files. Invalid state is reinitialized, writes are atomic, and persistence failures fall back to in-memory state. [#29609](prisma/orm#29609) - Studio now recognizes semicolon-delimited `sqlserver://` connection strings before reporting the existing explicit message that SQL Server is not supported by Studio. [#29623](prisma/orm#29623) - The AI-agent safety checkpoint now also covers interactive `prisma db push` confirmations involving data-loss warnings, rather than only invocations using `--accept-data-loss`. [#29793](prisma/orm#29793) ##### Performance and reliability - Optimized query-plan execution by eagerly evaluating plans with one unconditional database operation and synchronously interpreting the remaining pure plan. Cached plans remain immutable. [#29004](prisma/orm#29004) - Prevented call-stack overflows when rendering very large parameter lists or combining chunked results containing hundreds of thousands of rows. [#29751](prisma/orm#29751) - Reduced ordinary query setup overhead by constructing fluent-relation field maps lazily and in linear time. Non-fluent queries no longer build this map. [#29752](prisma/orm#29752) ##### Dependencies - Updated the transitive `fast-uri` dependency to a patched release addressing production audit advisories affecting versions through `3.1.3`. [#29758](prisma/orm#29758) </details> --- ### Configuration 📅 **Schedule**: (UTC) - Branch creation - At any time (no schedule defined) - Automerge - At any time (no schedule defined) 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate CLI](https://github.com/renovatebot/renovate).  Reviewed-on: https://git.oirnoir.dev/OIRNOIR/YouTube-Helper-Server/pulls/41

fix(client): keep fluent relation fields named select or include when…

40e4bae

… unpacking results

coderabbitai Bot approved these changes Jul 2, 2026

View reviewed changes

Ziiyodullayevv reviewed Jul 3, 2026

View reviewed changes

tensordreams changed the base branch from main to v7 July 21, 2026 12:04

tensordreams changed the base branch from v7 to main July 21, 2026 15:09

aqrln approved these changes Jul 22, 2026

View reviewed changes

dosubot Bot added the lgtm This PR has been approved by a maintainer label Jul 22, 2026

aqrln merged commit c5821b5 into prisma:main Jul 22, 2026
240 of 243 checks passed

Navigation Menu

Uh oh!

fix(client): keep fluent relation fields named select or include when unpacking results - #29683

fix(client): keep fluent relation fields named select or include when unpacking results#29683
aqrln merged 1 commit into
prisma:mainfrom
spokodev:w33/prisma-unpack-named-select

spokodev commented Jul 2, 2026

Uh oh!

coderabbitai Bot commented Jul 2, 2026 •

edited

Loading

Uh oh!

CLAassistant commented Jul 2, 2026 •

edited

Loading

Uh oh!

Ziiyodullayevv left a comment

Uh oh!

aqrln left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

Conversation

spokodev commented Jul 2, 2026

Uh oh!

coderabbitai Bot commented Jul 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary by CodeRabbit

Walkthrough

Changes

Sequence Diagram(s)

Uh oh!

CLAassistant commented Jul 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Ziiyodullayevv left a comment

Choose a reason for hiding this comment

Uh oh!

aqrln left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

coderabbitai Bot commented Jul 2, 2026 •

edited

Loading

CLAassistant commented Jul 2, 2026 •

edited

Loading