[pull] main from prisma:main

.devcontainer/Dockerfile

@@ -13,4 +13,4 @@ FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:0-${VARIANT}
 # RUN su node -c "source /usr/local/share/nvm/nvm.sh && nvm install ${EXTRA_NODE_VERSION}"
 
 # To install more global node packages
-RUN su node -c "npm install -g pnpm@8.15.5 ts-node"
+RUN su node -c "npm install -g pnpm@9 ts-node"

.github/renovate.json

@@ -17,16 +17,10 @@
   "reviewers": ["@prisma/orm-ts-maintain"],
   "rebaseWhen": "conflicted",
   "rangeStrategy": "pin",
-  "ignoreDeps": [
-    "sqlite3",
-    "@prisma/engines-version",
-    "@prisma/prisma-schema-wasm",
-    "redis",
-    "@types/redis"
-  ],
+  "ignoreDeps": ["sqlite3", "@prisma/engines-version", "@prisma/prisma-schema-wasm", "redis", "@types/redis"],
   "ignorePaths": ["sandbox/**"],
   "constraints": {
-    "pnpm": "8"
+    "pnpm": "9"
   },
   "configMigration": true,
   "packageRules": [
@@ -35,19 +29,15 @@
       "automerge": true,
       "matchDepTypes": ["devDependencies"],
       "matchUpdateTypes": ["patch"],
-      "excludePackageNames": [
-        "@prisma/studio",
-        "@prisma/studio-server",
-        "checkpoint-client"
-      ],
-      "schedule": ["before 7am on Wednesday"]
+      "schedule": ["before 7am on Wednesday"],
+      "matchPackageNames": ["!@prisma/studio", "!@prisma/studio-server", "!checkpoint-client"]
     },
     {
       "groupName": "dependencies patch (non-major)",
       "matchDepTypes": ["dependencies"],
       "matchUpdateTypes": ["patch"],
-      "excludePackageNames": ["checkpoint-client"],
-      "schedule": ["before 7am on Wednesday"]
+      "schedule": ["before 7am on Wednesday"],
+      "matchPackageNames": ["!checkpoint-client"]
     },
     {
       "groupName": "ESM devDependencies & dependencies (patch & minor)",
@@ -108,7 +98,6 @@
         "find-up",
         "get-stdin",
         "globby",
-        "has-yarn",
         "indent-string",
         "log-update",
         "new-github-issue-url",
@@ -135,15 +124,15 @@
     {
       "groupName": "definitelyTyped",
       "automerge": true,
-      "matchPackagePatterns": ["^@types/"],
       "matchUpdateTypes": ["patch", "minor"],
-      "schedule": ["before 7am on Wednesday"]
+      "schedule": ["before 7am on Wednesday"],
+      "matchPackageNames": ["/^@types//"]
     },
     {
       "groupName": "Jest",
       "automerge": true,
-      "matchPackagePatterns": [".*jest.*"],
-      "schedule": ["before 7am on Wednesday"]
+      "schedule": ["before 7am on Wednesday"],
+      "matchPackageNames": ["/.*jest.*/"]
     },
     {
       "groupName": "sql-template-tag",
@@ -173,29 +162,25 @@
     },
     {
       "groupName": "opentelemetry packages",
-      "matchPackagePatterns": ["^@opentelemetry/"],
-      "schedule": ["before 7am on Wednesday"]
+      "schedule": ["before 7am on Wednesday"],
+      "matchPackageNames": ["/^@opentelemetry//"]
     },
     {
       "groupName": "opentelemetry packages for instrumentation package",
       "matchFileNames": ["packages/instrumentation/**"],
-      "matchPackageNames": [
-        "@opentelemetry/api",
-        "@opentelemetry/instrumentation",
-        "@opentelemetry/sdk-trace-base"
-      ],
+      "matchPackageNames": ["@opentelemetry/api", "@opentelemetry/instrumentation", "@opentelemetry/sdk-trace-base"],
       "rangeStrategy": "auto"
     },
     {
       "groupName": "esbuild packages",
-      "matchPackagePatterns": ["^esbuild"],
-      "schedule": ["before 7am on Wednesday"]
+      "schedule": ["before 7am on Wednesday"],
+      "matchPackageNames": ["/^esbuild/"]
     },
     {
       "groupName": "e2e tests",
-      "excludePackageNames": ["typescript", "prisma", "@prisma/client"],
       "matchFileNames": ["packages/client/tests/e2e/**"],
-      "schedule": ["before 7am on Wednesday"]
+      "schedule": ["before 7am on Wednesday"],
+      "matchPackageNames": ["!typescript", "!prisma", "!@prisma/client"]
     },
     {
       "groupName": "e2e tests - typescript",
@@ -208,7 +193,7 @@
       "groupName": "e2e ts-version (major/minor) tests - typescript",
       "enabled": false,
       "matchPackageNames": ["typescript"],
-      "matchUpdateTypes": ["minor","major"],
+      "matchUpdateTypes": ["minor", "major"],
       "matchFileNames": ["packages/client/tests/e2e/ts-version/**"]
     },
     {
@@ -247,13 +232,7 @@
     },
     {
       "groupName": "JS drivers",
-      "matchPackageNames": [
-        "@libsql/client",
-        "@neondatabase/serverless",
-        "@planetscale/database",
-        "pg",
-        "@types/pg"
-      ],
+      "matchPackageNames": ["@libsql/client", "@neondatabase/serverless", "@planetscale/database", "pg", "@types/pg"],
       "schedule": ["before 7am on Wednesday"]
     },
     {

.github/workflows/benchmark.yml

@@ -6,8 +6,8 @@ on:
       - main
       - '*.*.x'
     paths-ignore:
-      # Any update here needs to be done for `pull_request`, see below
-      # and all files (test.yml, benchmark.yml, release-ci.yml, bundle-size.yml)
+      # Any update here needs to be done for `pull_request` (see below) and all files
+      # (test.yml, benchmark.yml, release-ci.yml, bundle-size.yml, ci-aux-files.yml)
       - '*.md'
       # - '*.bench.ts' -> should not be ignored in this workflow
       - 'LICENSE'
@@ -23,8 +23,8 @@ on:
       - 'sandbox/**'
   pull_request:
     paths-ignore:
-      # Any update here needs to be done for `push`, see above
-      # and all files (test.yml, benchmark.yml, release-ci.yml)
+      # Any update here needs to be done for `branches` (see above) and all files
+      # (test.yml, benchmark.yml, release-ci.yml, bundle-size.yml, ci-aux-files.yml)
       - '*.md'
       # - '*.bench.ts' -> should not be ignored in this workflow
       - 'LICENSE'
@@ -61,7 +61,7 @@ jobs:
         uses: ./.github/actions/setup
         with:
           node-version: 20
-          pnpm-version: 8.15.5
+          pnpm-version: 9
           skip-tsc: false
 
       - name: Run benchmarks
@@ -84,7 +84,7 @@ jobs:
           alert-comment-cc-users: '@millsp,@aqrln,@SevInf,@jkomyno'
 
       - name: Run benchmarks for Codspeed
-        uses: CodSpeedHQ/action@v2
+        uses: CodSpeedHQ/action@v3
         with:
           run: pnpm run bench-stdout-only
           token: ${{ secrets.CODSPEED_TOKEN }}

.github/workflows/bundle-size.yml

@@ -3,8 +3,8 @@ name: Bundle size
 on:
   pull_request:
     paths-ignore:
-      # Any update here needs to be done for
-      # all files (test.yml, benchmark.yml, release-ci.yml, bundle-size.yml)
+      # Any update here needs to be done for all files
+      # (test.yml, benchmark.yml, release-ci.yml, bundle-size.yml, ci-aux-files.yml)
       - '*.md'
       - '*.bench.ts'
       - 'LICENSE'
@@ -34,7 +34,7 @@ jobs:
         uses: ./.github/actions/setup
         with:
           node-version: 18
-          pnpm-version: 8.15.5
+          pnpm-version: 9
           skip-tsc: true
           skip-build: true
 

.github/workflows/ci-aux-files.yml

@@ -0,0 +1,36 @@
+name: CI for auxiliary files
+
+on:
+  pull_request:
+    paths:
+      # Any update here needs to be done for all files
+      # (test.yml, benchmark.yml, release-ci.yml, bundle-size.yml, ci-aux-files.yml)
+      - '*.md'
+      - '*.bench.ts'
+      - 'LICENSE'
+      - '.dockerignore'
+      - 'scripts/ci/publish.ts'
+      - '.github/CODEOWNERS'
+      - '.github/renovate.json'
+      - '.github/ISSUE_TEMPLATE/**'
+      - '.github/DISCUSSION_TEMPLATE/**'
+      - '.devcontainer/**'
+      - '.vscode/**'
+      - 'graphs/**'
+      - 'sandbox/**'
+  workflow_dispatch:
+
+jobs:
+  # A job named "Detect jobs to run" is a required check for merging PRs. Without this workflow,
+  # which only runs for the files ignored by `test.yml` workflow and contains a stub job with this name,
+  # no PRs that only contain changes in these files could be merged. It exists to ensure the required
+  # check still exists when the files ignored by `test.yml` are updated, even though it does nothing.
+  #
+  # In the future, this workflow can be extended to actually do something useful for these files
+  # (e.g., run type checking and linting for the code in `sandbox/` and `scripts/`, check spelling in
+  # markdown files, etc.).
+  detect-jobs-to-run:
+    name: Detect jobs to run
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo "Nothing to do."

.github/workflows/release-ci.yml

@@ -8,8 +8,8 @@ on:
       - 'integration/*'
       - '*.*.x'
     paths-ignore:
-      # Any update here needs to be done for
-      # all files (test.yml, benchmark.yml, release-ci.yml, bundle-size.yml)
+      # Any update here needs to be done for all files
+      # (test.yml, benchmark.yml, release-ci.yml, bundle-size.yml, ci-aux-files.yml)
       - '*.md'
       - '*.bench.ts'
       - 'LICENSE'
@@ -59,7 +59,7 @@ jobs:
         uses: ./.github/actions/setup
         with:
           node-version: 18
-          pnpm-version: 8.15.5
+          pnpm-version: 9
           skip-tsc: false
 
       - name: Publish all packages to npm
@@ -96,7 +96,6 @@ jobs:
         env:
           REPO_NAME: 'prisma-engines'
           TAG_NAME: '${{ steps.publish.outputs.prismaVersion }}'
-          MESSAGE: '${{ steps.publish.outputs.changelogSanitized }}'
           COMMIT_HASH: '${{ steps.publish.outputs.enginesCommitHash }}'
         with:
           result-encoding: string
@@ -106,7 +105,7 @@ jobs:
               owner: 'prisma',
               repo: '${{ env.REPO_NAME }}',
               tag: '${{ env.TAG_NAME }}',
-              message: '${{ env.MESSAGE }}',
+              message: '${{ env.TAG_NAME }}',
               object: '${{ env.COMMIT_HASH }}',
               type: 'commit',
             })

.github/workflows/release-latest.yml

@@ -50,7 +50,7 @@ jobs:
       - uses: ./.github/actions/setup
         with:
           node-version: 18
-          pnpm-version: 8.15.5
+          pnpm-version: 9
           skip-tsc: false
 
       - name: Publish all packages to npm
@@ -103,7 +103,7 @@ jobs:
               owner: 'prisma',
               repo: '${{ env.REPO_NAME }}',
               tag: '${{ env.TAG_NAME }}',
-              message: '${{ env.MESSAGE }}',
+              message: '${{ env.TAG_NAME }}',
               object: '${{ env.COMMIT_HASH }}',
               type: 'commit',
             })

.github/workflows/scripts/setup-mysql.sh

@@ -1,4 +1,4 @@
-#/bin/bash
+#!/usr/bin/env bash
 
 set -ex
 
@@ -7,7 +7,14 @@ if [ "$RUNNER_OS" = "Windows" ]; then
 fi
 
 if [ "$RUNNER_OS" = "macOS" ]; then
-    brew install mysql || true
+    brew install mysql
+
+    cat <<EOF > /opt/homebrew/etc/my.cnf
+[mysqld]
+bind-address = ::1
+mysqlx-bind-address = ::1
+EOF
+
     brew services run mysql
 fi
 

.github/workflows/scripts/setup.sh

@@ -2,7 +2,7 @@
 
 set -ex
 
-npm i --silent -g pnpm@8.15.5 --unsafe-perm
+npm i --silent -g pnpm@9 --unsafe-perm
 
 pnpm i