Skip to content

Commit

Permalink
revert: "chore(deps): update engines to 4.8.0-11.e88b5dd70fddc391f934…
Browse files Browse the repository at this point in the history
…4ee8056dfd92f0f6fdef" (#16652)

This reverts commit 71ae13b.
  • Loading branch information
Jolg42 committed Dec 6, 2022
1 parent 71ae13b commit f6d71c8
Show file tree
Hide file tree
Showing 8 changed files with 349 additions and 377 deletions.
2 changes: 1 addition & 1 deletion packages/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
}
},
"dependencies": {
"@prisma/engines-version": "4.8.0-11.e88b5dd70fddc391f9344ee8056dfd92f0f6fdef"
"@prisma/engines-version": "4.8.0-10.3cd1456b7514e2d6e87f2144dca12032da3ceb30"
},
"sideEffects": false
}
2 changes: 1 addition & 1 deletion packages/engines/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"author": "Tim Suchanek <suchanek@prisma.io>",
"devDependencies": {
"@prisma/debug": "workspace:*",
"@prisma/engines-version": "4.8.0-11.e88b5dd70fddc391f9344ee8056dfd92f0f6fdef",
"@prisma/engines-version": "4.8.0-10.3cd1456b7514e2d6e87f2144dca12032da3ceb30",
"@prisma/fetch-engine": "workspace:*",
"@prisma/get-platform": "workspace:*",
"@swc/core": "1.3.14",
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 @@ -15,7 +15,7 @@
"bugs": "https://github.com/prisma/prisma/issues",
"enginesOverride": {},
"devDependencies": {
"@prisma/engines-version": "4.8.0-11.e88b5dd70fddc391f9344ee8056dfd92f0f6fdef",
"@prisma/engines-version": "4.8.0-10.3cd1456b7514e2d6e87f2144dca12032da3ceb30",
"@swc/core": "1.3.14",
"@swc/jest": "0.2.23",
"@types/jest": "29.2.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/internals/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"@prisma/fetch-engine": "workspace:*",
"@prisma/generator-helper": "workspace:*",
"@prisma/get-platform": "workspace:*",
"@prisma/prisma-fmt-wasm": "4.8.0-11.e88b5dd70fddc391f9344ee8056dfd92f0f6fdef",
"@prisma/prisma-fmt-wasm": "4.8.0-10.3cd1456b7514e2d6e87f2144dca12032da3ceb30",
"archiver": "5.3.1",
"arg": "5.0.2",
"chalk": "4.1.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 @@ -17,7 +17,7 @@
"version": "latest"
},
"devDependencies": {
"@prisma/engines-version": "4.8.0-11.e88b5dd70fddc391f9344ee8056dfd92f0f6fdef",
"@prisma/engines-version": "4.8.0-10.3cd1456b7514e2d6e87f2144dca12032da3ceb30",
"@prisma/generator-helper": "workspace:*",
"@prisma/internals": "workspace:*",
"@swc/core": "1.3.14",
Expand Down
12 changes: 6 additions & 6 deletions packages/migrate/src/__tests__/DbPull.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ describeIf(!process.env.TEST_SKIP_MSSQL)('sqlserver-multi-schema', () => {
ctx.fixture('introspection/sqlserver-multi-schema')
const introspect = new DbPull()
const result = introspect.parse(['--print', '--schema', 'without-schemas-in-datasource.prisma'])
await expect(result).rejects.toThrow(`P4001`)
await expect(result).rejects.toThrowError(`P4001`)
expect(ctx.mocked['console.log'].mock.calls.join('\n')).toMatchInlineSnapshot(``)
expect(ctx.mocked['console.info'].mock.calls.join('\n')).toMatchInlineSnapshot(``)
expect(ctx.mocked['console.error'].mock.calls.join('\n')).toMatchInlineSnapshot(``)
Expand Down Expand Up @@ -612,7 +612,7 @@ describeIf(!process.env.TEST_SKIP_MSSQL)('sqlserver-multi-schema', () => {
ctx.fixture('introspection/sqlserver-multi-schema')
const introspect = new DbPull()
const result = introspect.parse(['--print', '--schema', 'with-schemas-in-datasource-1-non-existing-value.prisma'])
await expect(result).rejects.toThrow(`P4001`)
await expect(result).rejects.toThrowError(`P4001`)
expect(ctx.mocked['console.log'].mock.calls.join('\n')).toMatchSnapshot()
expect(ctx.mocked['console.info'].mock.calls.join('\n')).toMatchInlineSnapshot(``)
expect(ctx.mocked['console.error'].mock.calls.join('\n')).toMatchInlineSnapshot(``)
Expand Down Expand Up @@ -640,7 +640,7 @@ describeIf(!process.env.TEST_SKIP_MSSQL)('sqlserver-multi-schema', () => {
const introspect = new DbPull()
const connectionString = `${process.env.TEST_MSSQL_JDBC_URI_MIGRATE}schema=does-not-exist`
const result = introspect.parse(['--print', '--url', connectionString])
await expect(result).rejects.toThrow(`P4001`)
await expect(result).rejects.toThrowError(`P4001`)
expect(ctx.mocked['console.log'].mock.calls.join('\n')).toMatchSnapshot()
expect(ctx.mocked['console.info'].mock.calls.join('\n')).toMatchInlineSnapshot(``)
expect(ctx.mocked['console.error'].mock.calls.join('\n')).toMatchInlineSnapshot(``)
Expand Down Expand Up @@ -689,7 +689,7 @@ describe('postgresql-multi-schema', () => {
ctx.fixture('introspection/postgresql-multi-schema')
const introspect = new DbPull()
const result = introspect.parse(['--print', '--schema', 'without-schemas-in-datasource.prisma'])
await expect(result).rejects.toThrow(`P4001`)
await expect(result).rejects.toThrowError(`P4001`)
expect(ctx.mocked['console.log'].mock.calls.join('\n')).toMatchInlineSnapshot(``)
expect(ctx.mocked['console.info'].mock.calls.join('\n')).toMatchInlineSnapshot(``)
expect(ctx.mocked['console.error'].mock.calls.join('\n')).toMatchInlineSnapshot(``)
Expand Down Expand Up @@ -751,7 +751,7 @@ describe('postgresql-multi-schema', () => {
ctx.fixture('introspection/postgresql-multi-schema')
const introspect = new DbPull()
const result = introspect.parse(['--print', '--schema', 'with-schemas-in-datasource-1-non-existing-value.prisma'])
await expect(result).rejects.toThrow(`P4001`)
await expect(result).rejects.toThrowError(`P4001`)
expect(ctx.mocked['console.log'].mock.calls.join('\n')).toMatchSnapshot()
expect(ctx.mocked['console.info'].mock.calls.join('\n')).toMatchInlineSnapshot(``)
expect(ctx.mocked['console.error'].mock.calls.join('\n')).toMatchInlineSnapshot(``)
Expand Down Expand Up @@ -780,7 +780,7 @@ describe('postgresql-multi-schema', () => {
// postgres://prisma:prisma@localhost:5432/tests-migrate?schema=does-not-exist
const connectionString = `${setupParams.connectionString}?schema=does-not-exist`
const result = introspect.parse(['--print', '--url', connectionString])
await expect(result).rejects.toThrow(`P4001`)
await expect(result).rejects.toThrowError(`P4001`)
expect(ctx.mocked['console.log'].mock.calls.join('\n')).toMatchSnapshot()
expect(ctx.mocked['console.info'].mock.calls.join('\n')).toMatchInlineSnapshot(``)
expect(ctx.mocked['console.error'].mock.calls.join('\n')).toMatchInlineSnapshot(``)
Expand Down
30 changes: 1 addition & 29 deletions packages/migrate/src/__tests__/__snapshots__/DbPull.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -864,34 +864,14 @@ datasource db {
schemas = ["base", "transactional"]
}
model Post {
id String @id(clustered: false, map: "PK__Post__RANDOM_ID_SANITIZED") @db.NVarChar(1)
title String @db.NVarChar(1)
authorId String @db.NVarChar(1)
SomeUser SomeUser @relation(fields: [authorId], references: [id])
@@schema("transactional")
}
model some_table {
id String @id(map: "PK__some_tab__RANDOM_ID_SANITIZED") @db.NVarChar(1)
@@schema("base")
}
model some_table {
id String @id(map: "PK__some_tab__RANDOM_ID_SANITIZED") @db.NVarChar(1)
title String @db.NVarChar(1)
@@schema("transactional")
email String @db.NVarChar(1)
}
model SomeUser {
id String @id(clustered: false, map: "PK__SomeUser__RANDOM_ID_SANITIZED") @db.NVarChar(1)
email String @db.NVarChar(1)
Post Post[]
@@schema("base")
}
Expand All @@ -913,15 +893,11 @@ datasource db {
model some_table {
id String @id(map: "PK__some_tab__RANDOM_ID_SANITIZED") @db.NVarChar(1)
email String @db.NVarChar(1)
@@schema("base")
}
model SomeUser {
id String @id(clustered: false, map: "PK__SomeUser__RANDOM_ID_SANITIZED") @db.NVarChar(1)
email String @db.NVarChar(1)
@@schema("base")
}
Expand All @@ -943,15 +919,11 @@ datasource db {
model some_table {
id String @id(map: "PK__some_tab__RANDOM_ID_SANITIZED") @db.NVarChar(1)
email String @db.NVarChar(1)
@@schema("base")
}
model SomeUser {
id String @id(clustered: false, map: "PK__SomeUser__RANDOM_ID_SANITIZED") @db.NVarChar(1)
email String @db.NVarChar(1)
@@schema("base")
}
Expand Down

0 comments on commit f6d71c8

Please sign in to comment.