Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions src/Illuminate/Database/Connection.php
Original file line number Diff line number Diff line change
Expand Up @@ -1061,6 +1061,10 @@ public function reconnectIfMissingConnection()
*/
public function disconnect()
{
if ($this->transactions > 0) {
$this->transactionsManager?->rollback($this->getName(), 0);
}

$this->setPdo(null)->setReadPdo(null);
}

Expand Down
40 changes: 40 additions & 0 deletions tests/Database/DatabaseConnectionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
use Exception;
use Illuminate\Contracts\Events\Dispatcher;
use Illuminate\Database\Connection;
use Illuminate\Database\DatabaseTransactionsManager;
use Illuminate\Database\Events\QueryExecuted;
use Illuminate\Database\Events\TransactionBeginning;
use Illuminate\Database\Events\TransactionCommitted;
Expand Down Expand Up @@ -252,6 +253,45 @@ public function testSwapPDOWithOpenTransactionResetsTransactionLevel()
$this->assertEquals(0, $connection->transactionLevel());
}

public function testDisconnectRollsBackTransactionsManagerWhenTransactionIsActive()
{
$pdo = $this->createMock(DatabaseConnectionTestMockPDO::class);
$connection = $this->getMockConnection(['getName'], $pdo);
$connection->method('getName')->willReturn('name');
$connection->setTransactionManager($manager = new DatabaseTransactionsManager);

$connection->beginTransaction();

$connection->disconnect();

$this->assertCount(0, $manager->getPendingTransactions());
$this->assertEquals(0, $connection->transactionLevel());
}

public function testDisconnectMidTransactionDiscardsStaleAfterCommitCallbacks()
{
$pdo = $this->createMock(DatabaseConnectionTestMockPDO::class);
$connection = $this->getMockConnection(['getName'], $pdo);
$connection->method('getName')->willReturn('name');
$connection->setReconnector(function ($connection) {
$connection->setPdo($this->createMock(DatabaseConnectionTestMockPDO::class));
});
$connection->setTransactionManager($manager = new DatabaseTransactionsManager);

$fired = 0;
$connection->beginTransaction();
$manager->addCallback(function () use (&$fired) {
$fired++;
});

$connection->disconnect();

$connection->beginTransaction();
$connection->commit();

$this->assertSame(0, $fired);
}

public function testBeganTransactionFiresEventsIfSet()
{
$pdo = $this->createMock(DatabaseConnectionTestMockPDO::class);
Expand Down