Skip to content

chore: merge main into next#28302

Merged
aqrln merged 15 commits intonextfrom
push-troorlwxpunx
Oct 16, 2025
Merged

chore: merge main into next#28302
aqrln merged 15 commits intonextfrom
push-troorlwxpunx

Conversation

@aqrln
Copy link
Copy Markdown
Member

@aqrln aqrln commented Oct 15, 2025

Conflicts in packages/config were automatically solved using Mergiraf.

Commits:

jacek-prisma and others added 15 commits October 9, 2025 13:09
…tring (#28261)

MultiSubnetFailover is a SQL Server connection property that enables
faster failovers for Always On Availability Groups and Failover Cluster
Instances, whether across single or multiple subnets. When enabled,
clients connecting to a SQL Server listener will attempt to connect to
all its IP addresses simultaneously, choosing the first one that
responds, which significantly reduces reconnection time after a failover
event.

The Tedious package [supports it as an
option](https://github.com/tediousjs/tedious/blob/ebb023ed90969a7ec0e4b036533ad52739d921f7/src/connection.ts#L756),
however to use it from a connection string it needs to be extracted.

Ref #9187

---------

Co-authored-by: jacek-prisma <malec@prisma.io>
this PR introduces PNPM catalog to ease dependency version management.
https://pnpm.io/catalogs
This reverts commit 10fab6b.

This reverts the inclusion and usages of pnpm catalog. The reason for
reverting the change is that it breaks the prisma-engines test pipeline
(see
https://github.com/prisma/prisma-engines/actions/runs/18382915995/job/52373895545)
and we have no simple fix for it.
…#28268)

- Bump `@opentelemetry/*` packages.
- Align tracing functional tests with the latest SDK APIs.
- Update `@prisma/instrumentation` README examples to match the new
configuration patterns in `@opentelemetry/sdk-trace-base@2`.

Part of
https://linear.app/prisma-company/issue/TML-1317/add-qc-support-in-local-ppg-with-accelerate-api
…3ff8dbb0424 (#28258)

The base branch for this PR is: main
This automatic PR updates the engines to version
`6.18.0-3.b03d75f1a67e62289420f5697c28a3ff8dbb0424`.
This will get automatically merged if all the tests pass.
:warning: If this PR needs to be updated, first remove the `automerge`
label before pushing to avoid automerge to merge without waiting for
tests.
## Packages
| Package | NPM URL |
|---------|---------|
|`@prisma/engines-version`|
https://npmjs.com/package/@prisma/engines-version/v/6.18.0-3.b03d75f1a67e62289420f5697c28a3ff8dbb0424|
|`@prisma/prisma-schema-wasm`|
https://npmjs.com/package/@prisma/prisma-schema-wasm/v/6.18.0-3.b03d75f1a67e62289420f5697c28a3ff8dbb0424|
|`@prisma/query-engine-wasm`|
https://npmjs.com/package/@prisma/query-engine-wasm/v/6.18.0-3.b03d75f1a67e62289420f5697c28a3ff8dbb0424|
|`@prisma/query-compiler-wasm`|
https://npmjs.com/package/@prisma/query-compiler-wasm/v/6.18.0-3.b03d75f1a67e62289420f5697c28a3ff8dbb0424|
|`@prisma/schema-engine-wasm`|
https://npmjs.com/package/@prisma/schema-engine-wasm/v/6.18.0-3.b03d75f1a67e62289420f5697c28a3ff8dbb0424|
## Engines commit

[`prisma/prisma-engines@b03d75f1a67e62289420f5697c28a3ff8dbb0424`](prisma/prisma-engines@b03d75f)
Export the package version as a named export from
`@prisma/query-plan-executor`. This is necessary for the
`Prisma-Engine-Hash` header validation to work in `prisma dev`.

Part of
https://linear.app/prisma-company/issue/TML-1317/add-qc-support-in-local-ppg-with-accelerate-api
Initialize the OpenTelemetry SDK in the CLI entrypoint to make it usable
in loadable sub-commands. Since they are libraries, they should not be
initiaizing the SDK, it should be done by the application (the CLI).

Part of
https://linear.app/prisma-company/issue/TML-1317/add-qc-support-in-local-ppg-with-accelerate-api
…e94bfda7624 (#28288)

The base branch for this PR is: main
This automatic PR updates the engines to version
`6.18.0-6.9bf76dbea6c9e34d59a3577015bd1e94bfda7624`.
This will get automatically merged if all the tests pass.
:warning: If this PR needs to be updated, first remove the `automerge`
label before pushing to avoid automerge to merge without waiting for
tests.
## Packages
| Package | NPM URL |
|---------|---------|
|`@prisma/engines-version`|
https://npmjs.com/package/@prisma/engines-version/v/6.18.0-6.9bf76dbea6c9e34d59a3577015bd1e94bfda7624|
|`@prisma/prisma-schema-wasm`|
https://npmjs.com/package/@prisma/prisma-schema-wasm/v/6.18.0-6.9bf76dbea6c9e34d59a3577015bd1e94bfda7624|
|`@prisma/query-engine-wasm`|
https://npmjs.com/package/@prisma/query-engine-wasm/v/6.18.0-6.9bf76dbea6c9e34d59a3577015bd1e94bfda7624|
|`@prisma/query-compiler-wasm`|
https://npmjs.com/package/@prisma/query-compiler-wasm/v/6.18.0-6.9bf76dbea6c9e34d59a3577015bd1e94bfda7624|
|`@prisma/schema-engine-wasm`|
https://npmjs.com/package/@prisma/schema-engine-wasm/v/6.18.0-6.9bf76dbea6c9e34d59a3577015bd1e94bfda7624|
## Engines commit

[`prisma/prisma-engines@9bf76dbea6c9e34d59a3577015bd1e94bfda7624`](prisma/prisma-engines@9bf76db)
This PR:
- closes
[TML-1476](https://linear.app/prisma-company/issue/TML-1476/pgadapter-corrupts-historical-dates-with-2-digit-years)
- closes #28192

---------

Co-authored-by: jkomyno <12381818+jkomyno@users.noreply.github.com>
Co-authored-by: Jacek Malec <malec@prisma.io>
…179a39ccf48 (#28293)

The base branch for this PR is: main
This automatic PR updates the engines to version
`6.18.0-7.d3fc122f88ca3ce86f67a797debfb179a39ccf48`.
This will get automatically merged if all the tests pass.
:warning: If this PR needs to be updated, first remove the `automerge`
label before pushing to avoid automerge to merge without waiting for
tests.
## Packages
| Package | NPM URL |
|---------|---------|
|`@prisma/engines-version`|
https://npmjs.com/package/@prisma/engines-version/v/6.18.0-7.d3fc122f88ca3ce86f67a797debfb179a39ccf48|
|`@prisma/prisma-schema-wasm`|
https://npmjs.com/package/@prisma/prisma-schema-wasm/v/6.18.0-7.d3fc122f88ca3ce86f67a797debfb179a39ccf48|
|`@prisma/query-engine-wasm`|
https://npmjs.com/package/@prisma/query-engine-wasm/v/6.18.0-7.d3fc122f88ca3ce86f67a797debfb179a39ccf48|
|`@prisma/query-compiler-wasm`|
https://npmjs.com/package/@prisma/query-compiler-wasm/v/6.18.0-7.d3fc122f88ca3ce86f67a797debfb179a39ccf48|
|`@prisma/schema-engine-wasm`|
https://npmjs.com/package/@prisma/schema-engine-wasm/v/6.18.0-7.d3fc122f88ca3ce86f67a797debfb179a39ccf48|
## Engines commit

[`prisma/prisma-engines@d3fc122f88ca3ce86f67a797debfb179a39ccf48`](prisma/prisma-engines@d3fc122)
This PR:
- closes
[TML-1332](https://linear.app/prisma-company/issue/TML-1332/prisma-config-alternative-to-url-directurl-shadowdatabaseurl)
- this PR depends on prisma/prisma-engines#5645.

---------

Co-authored-by: jkomyno <12381818+jkomyno@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Conflicts were automatically solved using [Mergiraf](https://mergiraf.org)
@aqrln aqrln added this to the 7.0.0 milestone Oct 15, 2025
@github-actions
Copy link
Copy Markdown
Contributor

size-limit report 📦

Path Size
packages/client/runtime/library.js 197.48 KB (0%)
packages/client/runtime/library.d.ts 127 KB (0%)
packages/client/runtime/binary.js 658.05 KB (0%)
packages/client/runtime/binary.d.ts 26 B (0%)
packages/client/runtime/edge.js 166.37 KB (0%)
packages/client/runtime/edge-esm.js 165.83 KB (0%)
packages/client/runtime/wasm-engine-edge.js 128.49 KB (0%)
packages/client/runtime/index-browser.js 34.5 KB (0%)
packages/client/runtime/index-browser.d.ts 11.64 KB (0%)
packages/cli/build/index.js 2.68 MB (+1.7% 🔺)
packages/client/prisma-client-0.0.0.tgz 25.93 MB (+0.01% 🔺)
packages/cli/prisma-0.0.0.tgz 16.74 MB (+0.08% 🔺)
packages/bundle-size/da-workers-libsql/output.tgz 924.86 KB (-0.01% 🔽)
packages/bundle-size/da-workers-neon/output.tgz 998.92 KB (+0.01% 🔺)
packages/bundle-size/da-workers-pg/output.tgz 998.11 KB (-0.01% 🔽)
packages/bundle-size/da-workers-planetscale/output.tgz 941.33 KB (+0.01% 🔺)
packages/bundle-size/da-workers-d1/output.tgz 906.72 KB (-0.01% 🔽)

@aqrln aqrln merged commit 4b7c9e2 into next Oct 16, 2025
388 checks passed
@aqrln aqrln deleted the push-troorlwxpunx branch October 16, 2025 11:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants