Skip to content

Merge 2161a70e7 up into 4.2.x #6585

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 6 commits into from
Nov 5, 2024
Merged

Merge 2161a70e7 up into 4.2.x #6585

merged 6 commits into from
Nov 5, 2024

Conversation

greg0ire
Copy link
Member

@greg0ire greg0ire commented Nov 4, 2024

I didn't manage to merge 3.9.x up into 4.2.x, and 2161a70 is the most recent commit on 3.9.x I managed to merge up.

@simPod , can you please take care of merging 3.9.x up into 4.2.x?

simPod and others added 4 commits October 31, 2024 17:07
…octrine#6563)

|      Q       |   A
|------------- | -----------
| Type         | improvement
| Fixed issues | <!-- use #NUM format to reference an issue -->

#### Summary

Covers the concern expressed by @greg0ire
doctrine#6545 (comment)

This ensures the transaction is (not)active based on `autocommmit` mode
when interacting with `transactional()`.
Right now, the Codecov UI displays downloads in a confusing way:
You get an "appveyor" header, and then 2 list items with links to
appveyor, followed by one list item with a link to Github.

We didn't specify that appveyor name anywhere, maybe Codecov behaves
differently on that platform. Let us see if specifying names for each
system makes things clearer.
Distinguish between Appveyor and github-action
@greg0ire
Copy link
Member Author

greg0ire commented Nov 4, 2024

Argh, not even this passes the build. It does pass it locally, but here in the CI, I get

1) Doctrine\DBAL\Tests\ConnectionTest::testTransactionIsActiveAfterTransactionalInNoAutoCommitMode
Doctrine\DBAL\Exception\SavepointsNotSupported: Savepoints are not supported by this driver.

/home/runner/work/dbal/dbal/src/Exception/SavepointsNotSupported.php:14
/home/runner/work/dbal/dbal/src/Connection.php:1102
/home/runner/work/dbal/dbal/src/Connection.php:1005
/home/runner/work/dbal/dbal/src/Connection.php:928
/home/runner/work/dbal/dbal/tests/ConnectionTest.php:198

@simPod please help.

@simPod
Copy link
Contributor

simPod commented Nov 4, 2024

I've already solved it in #6546, will do today/in the morning

@simPod
Copy link
Contributor

simPod commented Nov 5, 2024

greg0ire#9

savepoint support is required in v4 for transaction nesting
@greg0ire greg0ire merged commit dae8c84 into doctrine:4.2.x Nov 5, 2024
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