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

fix(client): delete transactionId field in middleware #7662

Merged
merged 6 commits into from Jun 15, 2021

Conversation

millsp
Copy link
Member

@millsp millsp commented Jun 14, 2021

@janpio
Copy link
Member

janpio commented Jun 14, 2021

Available as 2.25.0-integration-fix-mw-tx.1 @madebysid (to fix Studio)

@janpio janpio requested a review from sdnts June 14, 2021 23:38
@millsp millsp requested a review from Jolg42 June 15, 2021 03:36
@Jolg42 Jolg42 added this to the 2.25.0 milestone Jun 15, 2021
Comment on lines +946 to +947
// TODO remove this, because transactionId should be passed?
if (index > 0) delete changedInternalParams['transactionId']
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TODO for now?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We will need to remove this, because middlewares with transactions makes it not to be executed as a regular transaction (removes transactionId)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we make an issue out of this so we can remember and prioritize? Thanks.

Copy link
Member Author

@millsp millsp Jun 15, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is preventing the transactions from rolling back. If enabled, transactions do rollback, but introduce those bugs we've seen on studio. I'm keeping track of this here #6705 (comment)

@Jolg42 Jolg42 changed the title fix(client, mw, tx): delete transactionId field in mw fix(client): delete transactionId field in middleware Jun 15, 2021
@sdnts
Copy link
Contributor

sdnts commented Jun 15, 2021

Can confirm that the version Jan quoted fixes Studio!

@millsp millsp merged commit f6c69f7 into master Jun 15, 2021
@millsp millsp deleted the integration/fix-mw-tx branch June 15, 2021 13:10
Jolg42 added a commit that referenced this pull request Jun 17, 2021
…gets

* master: (69 commits)
  chore: remove unused printDatamodelDiff (#7686)
  chore: upgrade pnpm from v5 to v6 (#7685)
  chore(deps): update devdependencies (non-major) (#7636)
  chore(deps): update react-prisma (#7637)
  fix(client): delete transactionId field in middleware (#7662)
  fix(client): env-var loading (#7669)
  fix(client): ensure autoinstall looks for the correct client (#7670)
  fix(seed): add empty export {} for TypeScript --isolatedModules (#7666)
  fix(migrate): cleanup datasource printing for SQLServer & default to postgres for pg (#7654)
  fix(cli): remove --provider from init for now (#7667)
  fix(migrate): Make phrasing of migrate warning messages more accurate (#7664)
  fix(deps): update engines to v2.25.0-36.c838e79f39885bc8e1611849b1eb28b5bb5bc922 (#7649)
  chore(deps): update dependency @prisma/studio-server to v0.400.0 (#7645)
  fix(deps): update engines to v2.25.0-35.ec38a348006215c00435291bf23ddf6096ecccb9 (#7647)
  fix: disable Node-API with M1 (#7601)
  fix(deps): update engines to v2.25.0-30.149261944d529dc4c506db7e017bb4dfd26ef398 (#7623)
  fix(deps): update engines to v2.25.0-29.6d6abdeb152d51c75fcf8ab498150c5a6a79d805 (#7619)
  refactor(migrate): Simplify engine API of evaluateDataLoss in Migrate (#7576)
  ci: fix detect-jobs-to-run (#7616)
  fix(deps): update engines to v2.25.0-28.2456c6fa85cf119868d31902130d1c8401345c53 (#7572)
  ...

# Conflicts:
#	src/packages/cli/package.json
#	src/packages/client/package.json
#	src/packages/engine-core/package.json
#	src/packages/fetch-engine/package.json
#	src/packages/migrate/package.json
#	src/packages/sdk/package.json
#	src/pnpm-lock.yaml
Copy link

@pg38scf8dc pg38scf8dc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Норм

Andrew-Colman pushed a commit to Andrew-Colman/prisma that referenced this pull request Aug 7, 2021
Co-authored-by: William Luke <william@ordino.ai>
Co-authored-by: Joël Galeran <Jolg42@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Middleware + $transactions do not play well together
6 participants