Skip to content

Commit 8e74611

Browse files
committed
upgrade to prisma 7
1 parent 2d1ad73 commit 8e74611

File tree

10 files changed

+556
-116
lines changed

10 files changed

+556
-116
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ what commands you can run in `./prisma/schema.prisma`.
184184
One common command you might need to run is to re-seed the database:
185185

186186
```sh
187-
npx prisma@6 migrate reset --force
187+
npx prisma@7 migrate reset --force
188188
```
189189

190190
In addition to resetting your database to the latest schema, it'll also run the

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ ADD other/runfile.js /app/other/runfile.js
4949
ADD prisma /app/prisma
5050
ADD prisma.config.ts /app/prisma.config.ts
5151

52-
RUN npx prisma@6 generate
52+
RUN npx prisma@7 generate
5353

5454
# app code changes all the time
5555
ADD . .

app/utils/prisma.server.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { remember } from '@epic-web/remember'
2-
import { PrismaBetterSQLite3 } from '@prisma/adapter-better-sqlite3'
2+
import { PrismaBetterSqlite3 } from '@prisma/adapter-better-sqlite3'
33
import chalk from 'chalk'
44
import pProps from 'p-props'
55
import { type Session } from '#app/types.ts'
@@ -23,7 +23,7 @@ function getClient(): PrismaClient {
2323
)
2424
}
2525
const client = new PrismaClient({
26-
adapter: new PrismaBetterSQLite3({ url }),
26+
adapter: new PrismaBetterSqlite3({ url }),
2727
log: [
2828
{ level: 'query', emit: 'event' },
2929
{ level: 'error', emit: 'stdout' },

e2e/utils.ts

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import path from 'path'
22
import { test as base } from '@playwright/test'
3+
import { PrismaBetterSqlite3 } from '@prisma/adapter-better-sqlite3'
34
import { parse } from 'cookie'
45
import fsExtra from 'fs-extra'
56
import invariant from 'tiny-invariant'
@@ -54,7 +55,11 @@ export function extractUrl(text: string) {
5455
const users = new Set<User>()
5556

5657
export async function insertNewUser(userOverrides?: Partial<User>) {
57-
const prisma = new PrismaClient()
58+
const url = process.env.DATABASE_URL
59+
invariant(url, 'DATABASE_URL is required')
60+
const prisma = new PrismaClient({
61+
adapter: new PrismaBetterSqlite3({ url }),
62+
})
5863

5964
const user = await prisma.user.create({
6065
data: { ...createUser(), ...userOverrides },
@@ -65,7 +70,11 @@ export async function insertNewUser(userOverrides?: Partial<User>) {
6570
}
6671

6772
export async function deleteUserByEmail(email: string) {
68-
const prisma = new PrismaClient()
73+
const url = process.env.DATABASE_URL
74+
invariant(url, 'DATABASE_URL is required')
75+
const prisma = new PrismaClient({
76+
adapter: new PrismaBetterSqlite3({ url }),
77+
})
6978
await prisma.user.delete({ where: { email } })
7079
await prisma.$disconnect()
7180
}
@@ -107,7 +116,11 @@ export const test = base.extend<{
107116
export const { expect } = test
108117

109118
test.afterEach(async () => {
110-
const prisma = new PrismaClient()
119+
const url = process.env.DATABASE_URL
120+
invariant(url, 'DATABASE_URL is required')
121+
const prisma = new PrismaClient({
122+
adapter: new PrismaBetterSqlite3({ url }),
123+
})
111124
await prisma.user.deleteMany({
112125
where: { id: { in: [...users].map((u) => u.id) } },
113126
})

other/litefs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ lease:
7474

7575
consul:
7676
url: '${FLY_CONSUL_URL}'
77-
key: 'litefs/${FLY_APP_NAME}_6'
77+
key: 'litefs/${FLY_APP_NAME}_8'
7878

7979
exec:
80-
- cmd: npx prisma@6 migrate deploy
80+
- cmd: npx prisma@7 migrate deploy
8181
if-candidate: true
8282

8383
# Set the journal mode for the database to WAL. This reduces concurrency deadlock issues

0 commit comments

Comments
 (0)