Skip to content

feat: Migrate Prisma from 6.14.0 to 7.7.0 with driver adapters #3391

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
devin-ai-integration wants to merge 8 commits into
base: main
Choose a base branch
from
Draft

feat: Migrate Prisma from 6.14.0 to 7.7.0 with driver adapters #3391

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1622138
feat: migrate Prisma from 6.14.0 to 7.7.0 with driver adapters
devin-ai-integration[bot] Apr 15, 2026
a59aebc
fix: update @prisma/instrumentation to v7, fix pool timeout mapping
devin-ai-integration[bot] Apr 15, 2026
6c5d959
fix: update references/prisma-7 to Prisma 7.7.0 to fix hoisting conflict
devin-ai-integration[bot] Apr 15, 2026
f560b7b
fix: remove --skip-generate flag from prisma db push (removed in Pris…
devin-ai-integration[bot] Apr 15, 2026
39c62b4
fix: update Dockerfile for Prisma 7 (generate command + remove engine…
devin-ai-integration[bot] Apr 16, 2026
47cba16
fix: handle DriverAdapterError for transaction write conflict retries
devin-ai-integration[bot] Apr 16, 2026
d00e5ca
fix: increase waitpoint test timeouts for PrismaPg adapter overhead
devin-ai-integration[bot] Apr 16, 2026
9579fbc
fix: increase processWorkerQueueDebounceMs in priority test to preven…
devin-ai-integration[bot] Apr 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: update @prisma/instrumentation to v7, fix pool timeout mapping 
- Bump @prisma/instrumentation from ^6.14.0 to ^7.7.0 for Prisma 7 compatibility
- Fix DATABASE_POOL_TIMEOUT incorrectly mapped to idleTimeoutMillis (semantic mismatch)
  - pool_timeout was a connection acquisition timeout, idleTimeoutMillis is idle eviction
  - Use DATABASE_CONNECTION_TIMEOUT for idleTimeoutMillis instead (pg Pool has no
    direct acquisition timeout equivalent)

Co-Authored-By: Eric Allam <eallam@icloud.com>
  • Loading branch information
@devin-ai-integration @ericallam
devin-ai-integration[bot] and ericallam committed Apr 15, 2026
commit a59aebccd3c79c19e3b77f2ce1c1a21d69206a19
4 changes: 2 additions & 2 deletions apps/webapp/app/db.server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ function getClient() {
const adapter = new PrismaPg({
connectionString: databaseUrl.href,
max: env.DATABASE_CONNECTION_LIMIT,
idleTimeoutMillis: env.DATABASE_POOL_TIMEOUT * 1000,
idleTimeoutMillis: env.DATABASE_CONNECTION_TIMEOUT * 1000,
connectionTimeoutMillis: env.DATABASE_CONNECTION_TIMEOUT * 1000,
});

Expand Down Expand Up @@ -243,7 +243,7 @@ function getReplicaClient() {
const adapter = new PrismaPg({
connectionString: replicaUrl.href,
max: env.DATABASE_CONNECTION_LIMIT,
idleTimeoutMillis: env.DATABASE_POOL_TIMEOUT * 1000,
idleTimeoutMillis: env.DATABASE_CONNECTION_TIMEOUT * 1000,
connectionTimeoutMillis: env.DATABASE_CONNECTION_TIMEOUT * 1000,
});

Expand Down
2 changes: 1 addition & 1 deletion apps/webapp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
"@opentelemetry/sdk-trace-node": "2.0.1",
"@opentelemetry/semantic-conventions": "1.36.0",
"@popperjs/core": "^2.11.8",
"@prisma/instrumentation": "^6.14.0",
"@prisma/instrumentation": "^7.7.0",
"@radix-ui/react-accordion": "^1.2.11",
"@radix-ui/react-alert-dialog": "^1.0.4",
"@radix-ui/react-dialog": "^1.0.3",
Expand Down
68 changes: 52 additions & 16 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading