Skip to content

[13.x] Execute rollback callbacks for committed savepoints (follow-up to #55420) #60482

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.

Sign up for GitHub

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

Open
sulimanbenhalim wants to merge 1 commit into
base: 13.x
Choose a base branch
from
+59 −0
Open

[13.x] Execute rollback callbacks for committed savepoints (follow-up to #55420) #60482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/Illuminate/Database/DatabaseTransactionsManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,10 @@ protected function removeAllTransactionsForConnection($connection)
fn ($transaction) => $transaction->connection == $connection
)->values();

$this->committedTransactions
->filter(fn ($transaction) => $transaction->connection == $connection)
->each(fn ($transaction) => $transaction->executeCallbacksForRollback());

$this->committedTransactions = $this->committedTransactions->reject(
fn ($transaction) => $transaction->connection == $connection
)->values();
Expand All @@ -188,6 +192,8 @@ protected function removeCommittedTransactionsThatAreChildrenOf(DatabaseTransact
$committed->parent === $transaction
);

$removedTransactions->each(fn ($transaction) => $transaction->executeCallbacksForRollback());

// There may be multiple deeply nested transactions that have already committed that we
// also need to remove. We will recurse down the children of all removed transaction
// instances until there are no more deeply nested child transactions for removal.
Expand Down
53 changes: 53 additions & 0 deletions tests/Database/DatabaseTransactionsManagerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,59 @@ public function testRollbackTransactionsExecutesCallbacks()
$this->assertEquals(['default', 1], $callbacks[1]);
}

public function testRollbackExecutesCallbacksForCommittedSavepointsWhenOuterRollsBack()
{
$callbacks = [];

$manager = new DatabaseTransactionsManager;

$manager->begin('default', 1);

$manager->addCallbackForRollback(function () use (&$callbacks) {
$callbacks[] = ['default', 1];
});

$manager->begin('default', 2);

$manager->addCallbackForRollback(function () use (&$callbacks) {
$callbacks[] = ['default', 2];
});

$manager->commit('default', 2, 1);
$manager->rollback('default', 0);

$this->assertCount(2, $callbacks);
$this->assertContains(['default', 2], $callbacks);
$this->assertContains(['default', 1], $callbacks);
}

public function testPartialRollbackExecutesCallbacksForCommittedDescendantSavepoints()
{
$callbacks = [];

$manager = new DatabaseTransactionsManager;

$manager->begin('default', 1);
$manager->begin('default', 2);

$manager->addCallbackForRollback(function () use (&$callbacks) {
$callbacks[] = ['default', 2];
});

$manager->begin('default', 3);

$manager->addCallbackForRollback(function () use (&$callbacks) {
$callbacks[] = ['default', 3];
});

$manager->commit('default', 3, 2);
$manager->rollback('default', 1);

$this->assertCount(2, $callbacks);
$this->assertContains(['default', 3], $callbacks);
$this->assertContains(['default', 2], $callbacks);
}

public function testRollbackExecutesOnlyCallbacksOfTheConnection()
{
$callbacks = [];
Expand Down
Loading