Skip to content

Merge 3.9.x up into 4.2.x #6555

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

Merged
merged 5 commits into from
Oct 19, 2024
Merged

Merge 3.9.x up into 4.2.x #6555

merged 5 commits into from
Oct 19, 2024

Conversation

greg0ire
Copy link
Member

No description provided.

simPod and others added 4 commits October 14, 2024 10:09
_I managed to break this behaviour in other PR so this should be covered._

It tests basic walkthrough where we nest transactions, propagate the result through the transaction stack and also that it is committed and not rolled back.
@greg0ire
Copy link
Member Author

@simPod I tried merging up your commit, but it does not seem to work on 4.2.x, for Oracle. Did I do something wrong when resolving conflicts, or is it because of changes specific to this branch?

@simPod
Copy link
Contributor

simPod commented Oct 19, 2024

Just to be sure, you mean IBM, right?

image

@greg0ire
Copy link
Member Author

Oh yeah sorry.

@simPod
Copy link
Contributor

simPod commented Oct 19, 2024

This is tmp fix simPod/dbal@f9681b3 (#11)

TLDR transaction nesting is not working on DB2 now because of this

$this->rollbackSavepoint($this->_getNestedTransactionSavePointName());

@greg0ire greg0ire merged commit 173d1c6 into doctrine:4.2.x Oct 19, 2024
90 of 91 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants