Skip to content
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.

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

chore(deps,test): integrate engine iTX error messages changes #16382

Merged
merged 2 commits into from
Nov 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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.7.0-54.fe21a0f9f05434bb7549516326748f6014d9356a"
"@prisma/engines-version": "4.7.0-55.fb373173a07dde4877f9a40212b5a2a3341a054e"
},
"sideEffects": false
}
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,9 @@ testMatrix.setupTestSuite(({ provider }, _suiteMeta, clientMeta) => {
)

await expect(result).rejects.toMatchObject({
message: expect.stringContaining('Transaction API error: Transaction already closed'),
message: expect.stringMatching(
/Transaction API error: Transaction already closed: A commit cannot be executed on an expired transaction. The timeout for this transaction was 500 ms, however \d+ ms passed since the start of the transaction. Consider increasing the interactive transaction timeout or doing less work in the transaction./,
),
})

expect(await prisma.user.findMany()).toHaveLength(0)
Expand Down Expand Up @@ -235,7 +237,7 @@ testMatrix.setupTestSuite(({ provider }, _suiteMeta, clientMeta) => {
XX
XX const result = prisma.$transaction(async () => {
→ XX await transactionBoundPrisma.user.create(
Transaction API error: Transaction already closed: A query cannot be executed on a closed transaction..
Transaction API error: Transaction already closed: A query cannot be executed on a committed transaction.
`)
}

Expand Down
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.7.0-54.fe21a0f9f05434bb7549516326748f6014d9356a",
"@prisma/engines-version": "4.7.0-55.fb373173a07dde4877f9a40212b5a2a3341a054e",
"@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.7.0-54.fe21a0f9f05434bb7549516326748f6014d9356a",
"@prisma/engines-version": "4.7.0-55.fb373173a07dde4877f9a40212b5a2a3341a054e",
"@swc/core": "1.3.14",
"@swc/jest": "0.2.23",
"@types/jest": "28.1.8",
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.7.0-54.fe21a0f9f05434bb7549516326748f6014d9356a",
"@prisma/prisma-fmt-wasm": "4.7.0-55.fb373173a07dde4877f9a40212b5a2a3341a054e",
"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.7.0-54.fe21a0f9f05434bb7549516326748f6014d9356a",
"@prisma/engines-version": "4.7.0-55.fb373173a07dde4877f9a40212b5a2a3341a054e",
"@prisma/generator-helper": "workspace:*",
"@prisma/internals": "workspace:*",
"@swc/core": "1.3.14",
Expand Down
28 changes: 14 additions & 14 deletions pnpm-lock.yaml

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