Skip to content

Commit

Permalink
chore(deps): update engines to 5.14.0-15.b34f35d03b987c7b0bf2210cb022…
Browse files Browse the repository at this point in the history
…7e6e0f98052d (prisma#24096)

* chore(deps): update engines to 5.14.0-15.b34f35d03b987c7b0bf2210cb0227e6e0f98052d

* test(migrate): unskip DbPull tests

* test(client): fix client generator snapshots (getConfig -> getDmmf)

* test(migrate): fix migrate snapshots

---------

Co-authored-by: jkomyno <skiabo97@gmail.com>
  • Loading branch information
prisma-bot and jkomyno authored May 7, 2024
1 parent ccec8f9 commit 12c8d32
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 36 deletions.
4 changes: 2 additions & 2 deletions packages/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@
"@prisma/debug": "workspace:*",
"@prisma/driver-adapter-utils": "workspace:*",
"@prisma/engines": "workspace:*",
"@prisma/engines-version": "5.14.0-14.133a47fad1768a00282f3fa0d06bcb0213fb074b",
"@prisma/engines-version": "5.14.0-15.b34f35d03b987c7b0bf2210cb0227e6e0f98052d",
"@prisma/fetch-engine": "workspace:*",
"@prisma/generator-helper": "workspace:*",
"@prisma/get-platform": "workspace:*",
Expand All @@ -192,7 +192,7 @@
"@prisma/migrate": "workspace:*",
"@prisma/mini-proxy": "0.9.5",
"@prisma/pg-worker": "workspace:*",
"@prisma/query-engine-wasm": "5.14.0-14.133a47fad1768a00282f3fa0d06bcb0213fb074b",
"@prisma/query-engine-wasm": "5.14.0-15.b34f35d03b987c7b0bf2210cb0227e6e0f98052d",
"@snaplet/copycat": "0.17.3",
"@swc-node/register": "1.9.0",
"@swc/core": "1.5.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/client/src/__tests__/generation/generator.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ describe('generator', () => {
})
} catch (e) {
expect(stripAnsi(e.message)).toMatchInlineSnapshot(`
"Prisma schema validation - (get-config wasm)
"Prisma schema validation - (get-dmmf wasm)
Error code: P1012
error: Error validating model "public": The model name \`public\` is invalid. It is a reserved name. Please change it. Read more at https://pris.ly/d/naming-models
--> schema.prisma:10
Expand All @@ -143,7 +143,7 @@ describe('generator', () => {
|
Validation Error Count: 2
[Context: getConfig]
[Context: getDmmf]
Prisma CLI Version : 0.0.0"
`)
Expand Down
2 changes: 1 addition & 1 deletion packages/engines/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
},
"dependencies": {
"@prisma/debug": "workspace:*",
"@prisma/engines-version": "5.14.0-14.133a47fad1768a00282f3fa0d06bcb0213fb074b",
"@prisma/engines-version": "5.14.0-15.b34f35d03b987c7b0bf2210cb0227e6e0f98052d",
"@prisma/fetch-engine": "workspace:*",
"@prisma/get-platform": "workspace:*"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/fetch-engine/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
},
"dependencies": {
"@prisma/debug": "workspace:*",
"@prisma/engines-version": "5.14.0-14.133a47fad1768a00282f3fa0d06bcb0213fb074b",
"@prisma/engines-version": "5.14.0-15.b34f35d03b987c7b0bf2210cb0227e6e0f98052d",
"@prisma/get-platform": "workspace:*"
},
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion packages/internals/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
"@prisma/fetch-engine": "workspace:*",
"@prisma/generator-helper": "workspace:*",
"@prisma/get-platform": "workspace:*",
"@prisma/prisma-schema-wasm": "5.14.0-14.133a47fad1768a00282f3fa0d06bcb0213fb074b",
"@prisma/prisma-schema-wasm": "5.14.0-15.b34f35d03b987c7b0bf2210cb0227e6e0f98052d",
"@prisma/schema-files-loader": "workspace:*",
"arg": "5.0.2",
"prompts": "2.4.2"
Expand Down
2 changes: 1 addition & 1 deletion packages/migrate/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
},
"dependencies": {
"@prisma/debug": "workspace:*",
"@prisma/engines-version": "5.14.0-14.133a47fad1768a00282f3fa0d06bcb0213fb074b",
"@prisma/engines-version": "5.14.0-15.b34f35d03b987c7b0bf2210cb0227e6e0f98052d",
"@prisma/generator-helper": "workspace:*",
"@prisma/get-platform": "workspace:*",
"@prisma/internals": "workspace:*",
Expand Down
6 changes: 2 additions & 4 deletions packages/migrate/src/__tests__/DbPull/sqlite.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -368,8 +368,7 @@ describe('common/sqlite', () => {
expect(captureStdout.getCapturedText().join('\n')).toMatchInlineSnapshot(`""`)
})

// TODO: requires change to `get_config` in `@prisma/prisma-schema-wasm`
it.skip('should fail when schema is invalid', async () => {
it('should fail when schema is invalid', async () => {
ctx.fixture('introspect')
const result = DbPull.new().parse(['--schema=./prisma/invalid.prisma'])
await expect(result).rejects.toThrowErrorMatchingInlineSnapshot(`
Expand Down Expand Up @@ -408,8 +407,7 @@ describe('common/sqlite', () => {
`)
})

// TODO: requires change to `get_config` in `@prisma/prisma-schema-wasm`
it.skip('should succeed when schema is invalid and using --force', async () => {
it('should succeed when schema is invalid and using --force', async () => {
ctx.fixture('introspect')

const result = DbPull.new().parse(['--schema=./prisma/invalid.prisma', '--force'])
Expand Down
9 changes: 3 additions & 6 deletions packages/migrate/src/__tests__/DbPush.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,19 +50,16 @@ describe('push', () => {
ctx.fixture('nativeTypes-sqlite')
const result = DbPush.new().parse([])
await expect(result).rejects.toThrowErrorMatchingInlineSnapshot(`
"Prisma schema validation - (get-config wasm)
Error code: P1012
"P1012
error: Native type VarChar is not supported for sqlite connector.
--> schema.prisma:12
|
11 | id Int @id
12 | name String @db.VarChar(100)
|
Validation Error Count: 1
[Context: getConfig]
Prisma CLI Version : 0.0.0"
"
`)
})

Expand Down
36 changes: 18 additions & 18 deletions pnpm-lock.yaml

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

0 comments on commit 12c8d32

Please sign in to comment.