Skip to content

Commit c0c84d8

Browse files
committed
Migrate away from deprecated v7 options and generate prisma client
1 parent ea74146 commit c0c84d8

6 files changed

Lines changed: 19 additions & 7 deletions

File tree

dev-packages/node-integration-tests/suites/tracing/prisma-orm-v7/prisma.config.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
import { defineConfig } from 'prisma/config';
22

33
export default defineConfig({
4-
earlyAccess: true,
54
schema: './prisma/schema.prisma',
6-
migrate: {
7-
migrations: './prisma/migrations',
8-
},
5+
migrations: './prisma/migrations',
96
datasource: {
107
url: 'postgresql://prisma:prisma@localhost:5435/tests',
118
},

dev-packages/node-integration-tests/suites/tracing/prisma-orm-v7/prisma/schema.prisma

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ datasource db {
44

55
generator client {
66
provider = "prisma-client"
7+
output = "./generated/prisma"
78
}
89

910
model User {
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"compilerOptions": {
3+
"module": "ESNext",
4+
"moduleResolution": "bundler",
5+
"target": "ES2023",
6+
"declaration": false,
7+
"rewriteRelativeImportExtensions": true,
8+
"skipLibCheck": true
9+
},
10+
"include": ["./generated/prisma/**/*.ts"]
11+
}

dev-packages/node-integration-tests/suites/tracing/prisma-orm-v7/scenario.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { PrismaPg } from '@prisma/adapter-pg';
2-
import { PrismaClient } from '@prisma/client';
2+
import { PrismaClient } from './prisma/generated/prisma/client.js';
33
import * as Sentry from '@sentry/node';
44
import { randomBytes } from 'crypto';
55

dev-packages/node-integration-tests/suites/tracing/prisma-orm-v7/test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ describe('Prisma ORM v7 Tests', () => {
1616
.withDockerCompose({
1717
workingDirectory: [cwd],
1818
readyMatches: ['port 5432'],
19-
setupCommand: `yarn prisma generate --schema ${cwd}/prisma/schema.prisma && yarn prisma migrate dev -n sentry-test --schema ${cwd}/prisma/schema.prisma`,
19+
setupCommand: `prisma generate --schema ${cwd}/prisma/schema.prisma && tsc -p ${cwd}/prisma/tsconfig.json && prisma migrate dev -n sentry-test --schema ${cwd}/prisma/schema.prisma`,
2020
})
2121
.expect({
2222
transaction: transaction => {
@@ -64,6 +64,7 @@ describe('Prisma ORM v7 Tests', () => {
6464
'@prisma/client': '7.2.0',
6565
pg: '^8.11.0',
6666
prisma: '7.2.0',
67+
typescript: '^5.9.0',
6768
},
6869
copyPaths: ['prisma', 'prisma.config.ts', 'docker-compose.yml'],
6970
},

dev-packages/node-integration-tests/utils/runner.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,9 @@ async function runDockerCompose(options: DockerOptions): Promise<VoidFunction> {
110110
clearTimeout(timeout);
111111
if (options.setupCommand) {
112112
try {
113-
execSync(options.setupCommand, { cwd, stdio: 'inherit' });
113+
// Prepend local node_modules/.bin to PATH so additionalDependencies binaries take precedence
114+
const env = { ...process.env, PATH: `${cwd}/node_modules/.bin:${process.env.PATH}` };
115+
execSync(options.setupCommand, { cwd, stdio: 'inherit', env });
114116
} catch (e) {
115117
log('Error running docker setup command', e);
116118
}

0 commit comments

Comments
 (0)