[pull] main from prisma:main

package.json

@@ -52,7 +52,7 @@
     "@typescript-eslint/eslint-plugin": "7.15.0",
     "@typescript-eslint/parser": "7.15.0",
     "@typescript-eslint/utils": "7.15.0",
-    "@vitest/coverage-v8": "3.2.4",
+    "@vitest/coverage-v8": "4.0.18",
     "arg": "5.0.2",
     "batching-toposort": "1.2.0",
     "buffer": "6.0.3",
@@ -97,7 +97,7 @@
     "tsx": "4.19.3",
     "turbo": "2.5.6",
     "typescript": "5.4.5",
-    "vitest": "3.2.4",
+    "vitest": "4.0.18",
     "wrangler": "3.114.15",
     "zx": "8.4.1"
   },

packages/adapter-mariadb/src/mariadb.test.ts

@@ -5,6 +5,9 @@ import { inferCapabilities, PrismaMariaDbAdapterFactory, rewriteConnectionString
 describe.each([
   ['8.0.12', { supportsRelationJoins: false }],
   ['8.0.13', { supportsRelationJoins: true }],
+  ['8.1.0', { supportsRelationJoins: true }],
+  ['8.4.5', { supportsRelationJoins: true }],
+  ['8.4.13', { supportsRelationJoins: true }],
   ['11.4.7-MariaDB-ubu2404', { supportsRelationJoins: false }],
 ])('infer capabilities for %s', (version, capabilities) => {
   test(`inferCapabilities(${version})`, () => {

packages/adapter-mariadb/src/mariadb.ts

@@ -255,8 +255,8 @@ export function inferCapabilities(version: unknown): Capabilities {
 
   // No relation-joins support for mysql < 8.0.13 or mariadb.
   const isMariaDB = suffix?.toLowerCase()?.includes('mariadb') ?? false
-  const supportsRelationJoins = !isMariaDB && (major > 8 || (major === 8 && minor >= 0 && patch >= 13))
-
+  const supportsRelationJoins =
+    !isMariaDB && (major > 8 || (major === 8 && (minor > 0 || (minor === 0 && patch >= 13))))
   return { supportsRelationJoins }
 }
 

packages/client-generator-js/package.json

@@ -43,8 +43,7 @@
     "ts-pattern": "5.6.2"
   },
   "devDependencies": {
-    "@types/pluralize": "0.0.33",
-    "vitest": "3.2.4"
+    "@types/pluralize": "0.0.33"
   },
   "scripts": {
     "dev": "DEV=true tsx helpers/build.ts",

packages/client-generator-registry/package.json

@@ -29,9 +29,6 @@
     "@prisma/generator": "workspace:*",
     "@prisma/internals": "workspace:*"
   },
-  "devDependencies": {
-    "vitest": "3.2.4"
-  },
   "scripts": {
     "dev": "DEV=true tsx helpers/build.ts",
     "build": "tsx helpers/build.ts",

packages/client-generator-ts/package.json

@@ -44,8 +44,7 @@
     "ts-pattern": "5.6.2"
   },
   "devDependencies": {
-    "@types/pluralize": "0.0.33",
-    "vitest": "3.2.4"
+    "@types/pluralize": "0.0.33"
   },
   "scripts": {
     "dev": "DEV=true tsx helpers/build.ts",

packages/client/tests/e2e/browser-bundle/package.json

@@ -10,6 +10,6 @@
   "devDependencies": {
     "@types/node": "~20.19.0",
     "prisma": "/tmp/prisma-0.0.0.tgz",
-    "vitest": "3.2.4"
+    "vitest": "4.0.18"
   }
 }

packages/client/tests/e2e/issues/16418-slow-compilation-big-schema/package.json

@@ -11,6 +11,6 @@
     "@types/jest": "29.5.12",
     "@types/node": "~20.19.0",
     "prisma": "/tmp/prisma-0.0.0.tgz",
-    "vitest": "3.2.4"
+    "vitest": "4.0.18"
   }
 }

packages/client/tests/e2e/prisma-version-json/package.json

@@ -11,6 +11,6 @@
     "@types/node": "~20.19.0",
     "prisma": "/tmp/prisma-0.0.0.tgz",
     "typescript": "5.9.3",
-    "vitest": "3.2.4"
+    "vitest": "4.0.18"
   }
 }

packages/client/tests/e2e/structured-output/prisma-config/package.json

@@ -10,6 +10,6 @@
   "devDependencies": {
     "@types/node": "~20.19.0",
     "prisma": "/tmp/prisma-0.0.0.tgz",
-    "vitest": "3.2.4"
+    "vitest": "4.0.18"
   }
 }

packages/config/package.json

@@ -20,8 +20,7 @@
   "devDependencies": {
     "@prisma/debug": "workspace:*",
     "@prisma/get-platform": "workspace:*",
-    "dotenv": "17.2.3",
-    "vitest": "3.2.4"
+    "dotenv": "17.2.3"
   },
   "scripts": {
     "dev": "DEV=true tsx helpers/build.ts",

packages/credentials-store/package.json

@@ -27,8 +27,7 @@
     "xdg-app-paths": "8.3.0"
   },
   "devDependencies": {
-    "tempy": "1.0.1",
-    "vitest": "3.2.4"
+    "tempy": "1.0.1"
   },
   "scripts": {
     "dev": "DEV=true tsx helpers/build.ts",

packages/debug/package.json

@@ -27,17 +27,14 @@
   },
   "bugs": "https://github.com/prisma/prisma/issues",
   "devDependencies": {
-    "@types/jest": "29.5.14",
     "@types/node": "~20.19.24",
-    "jest": "29.7.0",
-    "jest-junit": "16.0.0",
     "kleur": "4.1.5",
     "typescript": "5.4.5"
   },
   "scripts": {
     "dev": "DEV=true tsx helpers/build.ts",
     "build": "tsx helpers/build.ts",
-    "test": "jest",
+    "test": "vitest run",
     "prepublishOnly": "pnpm run build"
   },
   "files": [

packages/debug/src/__tests__/basic.test.ts

@@ -1,5 +1,7 @@
 import { stripVTControlCharacters } from 'node:util'
 
+import { describe, expect, test } from 'vitest'
+
 import { Debug, getLogs } from '../index'
 import { removeISODate, sanitizeTestLogs } from '../util'
 

packages/debug/src/__tests__/debug.extended.test.ts

@@ -1,12 +1,13 @@
+import { afterEach, beforeEach, expect, test, vi } from 'vitest'
+
 import * as useDebugImport from '../index'
 
 let Debug: typeof useDebugImport.default
 
-const importDebug = async () =>
-  await jest.isolateModulesAsync(async () => {
-    const mod = await import('../index')
-    Debug = mod.default
-  })
+const importDebug = async () => {
+  const mod = await import('../index')
+  Debug = mod.default
+}
 
 beforeEach(() => {
   delete process.env.DEBUG
@@ -18,12 +19,11 @@
 })
 
 afterEach(() => {
-  jest.resetModules()
-  jest.restoreAllMocks()
+  vi.resetModules()
 })
 
 test('with a namespace', async () => {
-  const consoleWarn = jest.spyOn(console, 'warn').mockImplementation()
+  const consoleWarn = vi.spyOn(console, 'warn')
 
   process.env.DEBUG = 'test'
   process.env.DEBUG_COLORS = 'false'
@@ -37,7 +37,7 @@
 })
 
 test('with colors', async () => {
-  const consoleWarn = jest.spyOn(console, 'warn').mockImplementation()
+  const consoleWarn = vi.spyOn(console, 'warn')
 
   process.env.DEBUG = 'test2'
   process.env.FORCE_COLOR = 'true'
@@ -48,12 +48,12 @@
   debug('hello world')
 
   const consoleWarnParams = consoleWarn.mock.calls.map(mapper)
-  expect(consoleWarnParams[0][0]).toMatchInlineSnapshot(`"test2 hello world"`)
+  expect(consoleWarnParams[0][0]).toMatchInlineSnapshot(`"test2 hello world"`)
   expect(consoleWarnParams.length).toBe(1)
 })
 
 test('with multiple wild cards', async () => {
-  const consoleWarn = jest.spyOn(console, 'warn').mockImplementation()
+  const consoleWarn = vi.spyOn(console, 'warn')
 
   process.env.DEBUG = 'test3:*:*:*'
   process.env.DEBUG_COLORS = 'false'
@@ -62,12 +62,12 @@
   Debug('test3:client:query-engine')('match2')
 
   const consoleWarnParams = consoleWarn.mock.calls.map(mapper)
   expect(consoleWarnParams[0][0]).toMatchInlineSnapshot(`"test3:client:query-engine:init match1"`)
   expect(consoleWarnParams.length).toBe(1)
 })
 
 test('with multiple wild cards and filter', async () => {
-  const consoleWarn = jest.spyOn(console, 'warn').mockImplementation()
+  const consoleWarn = vi.spyOn(console, 'warn')
 
   process.env.DEBUG = 'test4:*:query-engine:*'
   process.env.DEBUG_COLORS = 'false'
@@ -77,13 +77,13 @@
   Debug('test4:pool:query-engine:delete')('match3')
 
   const consoleWarnParams = consoleWarn.mock.calls.map(mapper)
   expect(consoleWarnParams[0][0]).toMatchInlineSnapshot(`"test4:client:query-engine:init match1"`)
   expect(consoleWarnParams[1][0]).toMatchInlineSnapshot(`"test4:pool:query-engine:delete match3"`)
   expect(consoleWarnParams.length).toBe(2)
 })
 
 test('with trailing wild cards', async () => {
-  const consoleWarn = jest.spyOn(console, 'warn').mockImplementation()
+  const consoleWarn = vi.spyOn(console, 'warn')
 
   process.env.DEBUG = 'test5:*:*'
   process.env.DEBUG_COLORS = 'false'
@@ -93,14 +93,14 @@
   Debug('test5:pool:query-engine:delete')('match3')
 
   const consoleWarnParams = consoleWarn.mock.calls.map(mapper)
   expect(consoleWarnParams[0][0]).toMatchInlineSnapshot(`"test5:client:query-engine:init match1"`)
   expect(consoleWarnParams[1][0]).toMatchInlineSnapshot(`"test5:client:query-engine match2"`)
   expect(consoleWarnParams[2][0]).toMatchInlineSnapshot(`"test5:pool:query-engine:delete match3"`)
   expect(consoleWarnParams.length).toBe(3)
 })
 
 test('with trailing wild cards and filter', async () => {
-  const consoleWarn = jest.spyOn(console, 'warn').mockImplementation()
+  const consoleWarn = vi.spyOn(console, 'warn')
 
   process.env.DEBUG = 'test6:client:*'
   process.env.DEBUG_COLORS = 'false'
@@ -110,13 +110,13 @@
   Debug('test6:pool:query-engine:delete')('match3')
 
   const consoleWarnParams = consoleWarn.mock.calls.map(mapper)
   expect(consoleWarnParams[0][0]).toMatchInlineSnapshot(`"test6:client:query-engine:init match1"`)
   expect(consoleWarnParams[1][0]).toMatchInlineSnapshot(`"test6:client:query-engine match2"`)
   expect(consoleWarnParams.length).toBe(2)
 })
 
 test('with multiple wild cards and exclusion filter', async () => {
-  const consoleWarn = jest.spyOn(console, 'warn').mockImplementation()
+  const consoleWarn = vi.spyOn(console, 'warn')
 
   process.env.DEBUG = 'test7:*:*,-test7:*:*:init'
   process.env.DEBUG_COLORS = 'false'
@@ -126,13 +126,13 @@
   Debug('test7:pool:query-engine:delete')('match3')
 
   const consoleWarnParams = consoleWarn.mock.calls.map(mapper)
   expect(consoleWarnParams[0][0]).toMatchInlineSnapshot(`"test7:client:query-engine match2"`)
   expect(consoleWarnParams[1][0]).toMatchInlineSnapshot(`"test7:pool:query-engine:delete match3"`)
   expect(consoleWarnParams.length).toBe(2)
 })
 
 test('with multiple wild cards and multiple exclusion filters', async () => {
-  const consoleWarn = jest.spyOn(console, 'warn').mockImplementation()
+  const consoleWarn = vi.spyOn(console, 'warn')
 
   process.env.DEBUG = 'test8:*:*,-test8:*:*:init,-test8:pool:*'
   process.env.DEBUG_COLORS = 'false'
@@ -142,12 +142,12 @@
   Debug('test8:pool:query-engine:delete')('match3')
 
   const consoleWarnParams = consoleWarn.mock.calls.map(mapper)
   expect(consoleWarnParams[0][0]).toMatchInlineSnapshot(`"test8:client:query-engine match2"`)
   expect(consoleWarnParams.length).toBe(1)
 })
 
 test('truncation when no wildcard is used', async () => {
-  const consoleWarn = jest.spyOn(console, 'warn').mockImplementation()
+  const consoleWarn = vi.spyOn(console, 'warn')
 
   process.env.DEBUG = 'test9:client'
   process.env.DEBUG_COLORS = 'false'
@@ -158,12 +158,12 @@
   Debug('test9:client')('match4')
 
   const consoleWarnParams = consoleWarn.mock.calls.map(mapper)
   expect(consoleWarnParams[0][0]).toMatchInlineSnapshot(`"test9:client match4"`)
   expect(consoleWarnParams.length).toBe(1)
 })
 
 test('object serialization', async () => {
-  const consoleWarn = jest.spyOn(console, 'warn').mockImplementation()
+  const consoleWarn = vi.spyOn(console, 'warn')
 
   process.env.DEBUG = 'test10:client'
   process.env.DEBUG_COLORS = 'false'
@@ -174,7 +174,7 @@
   Debug('test10:client')(object)
 
   const consoleWarnParams = consoleWarn.mock.calls.map(mapper)
   expect(consoleWarnParams[0][0]).toMatchInlineSnapshot(`
     "test10:client {
       "a": 1,
       "b": {
@@ -189,7 +189,7 @@
 })
 
 test('millisecond timestamps', async () => {
-  const consoleWarn = jest.spyOn(console, 'warn').mockImplementation()
+  const consoleWarn = vi.spyOn(console, 'warn')
 
   process.env.DEBUG = 'test11:client'
   process.env.DEBUG_COLORS = 'false'
@@ -198,13 +198,13 @@
 
   const consoleWarnParams = consoleWarn.mock.calls.map(mapper)
 
   expect(consoleWarnParams[0][0]).toMatchInlineSnapshot(`"test11:client match1"`)
   expect(consoleWarnParams[0][1]?.match(/\+\d+ms/)).toBeTruthy()
   expect(consoleWarnParams.length).toBe(1)
 })
 
 test('wildcard can be used like a regex at the end', async () => {
-  const consoleWarn = jest.spyOn(console, 'warn').mockImplementation()
+  const consoleWarn = vi.spyOn(console, 'warn')
 
   process.env.DEBUG = 'test12:client*'
   process.env.DEBUG_COLORS = 'false'
@@ -222,7 +222,7 @@
 })
 
 test('wildcard can be used like a regex in the middle', async () => {
-  const consoleWarn = jest.spyOn(console, 'warn').mockImplementation()
+  const consoleWarn = vi.spyOn(console, 'warn')
 
   process.env.DEBUG = 'test13:client*init'
   process.env.DEBUG_COLORS = 'false'
@@ -238,7 +238,7 @@
 })
 
 test('can manage complex inclusions and exclusions', async () => {
-  const consoleWarn = jest.spyOn(console, 'warn').mockImplementation()
+  const consoleWarn = vi.spyOn(console, 'warn')
 
   // Accepted alternatives:
   // - Anything that starts with 'test14:', followed by any number of characters, then ':query-engine:',
@@ -265,7 +265,7 @@
 })
 
 test('regex characters do not mess with matching', async () => {
-  const consoleWarn = jest.spyOn(console, 'warn').mockImplementation()
+  const consoleWarn = vi.spyOn(console, 'warn')
 
   process.env.DEBUG = 'test15:\\w+'
   process.env.DEBUG_COLORS = 'false'

packages/debug/src/__tests__/debug.original.test.ts

@@ -1,4 +1,5 @@
 // copied from the original debug tests
+import { describe, it } from 'vitest'
 
 import Debug from '../index'
 

packages/debug/src/__tests__/env-disabled.test.ts

@@ -1,5 +1,7 @@
 import { stripVTControlCharacters } from 'node:util'
 
+import { describe, expect, test } from 'vitest'
+
 import { sanitizeTestLogs } from '../util'
 
 describe('debug', () => {

packages/debug/src/__tests__/env-enabled.test.ts

@@ -1,5 +1,7 @@
 import { stripVTControlCharacters } from 'node:util'
 
+import { describe, expect, test } from 'vitest'
+
 import { removeISODate, sanitizeTestLogs } from '../util'
 
 describe('debug', () => {