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.

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

Jump to bottom

[5.3] Allow reconnect in transaction by setting transactions to 0 #15931

Merged
merged 1 commit into from
Oct 18, 2016
Merged

[5.3] Allow reconnect in transaction by setting transactions to 0 #15931

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
7 changes: 1 addition & 6 deletions src/Illuminate/Database/Connection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
use Exception;
use Throwable;
use LogicException;
use RuntimeException;
use DateTimeInterface;
use Illuminate\Support\Arr;
use Illuminate\Database\Query\Expression;
Expand Down Expand Up @@ -985,14 +984,10 @@ public function getReadPdo()
*
* @param \PDO|null $pdo
* @return $this
*
* @throws \RuntimeException
*/
public function setPdo($pdo)
{
if ($this->transactions >= 1) {
throw new RuntimeException("Can't swap PDO instance while within transaction.");
}
$this->transactions = 0;

$this->pdo = $pdo;

Expand Down
46 changes: 32 additions & 14 deletions tests/Database/DatabaseConnectionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,14 +156,14 @@ public function testBeginTransactionMethodNeverRetriesIfWithinTransaction()
}
}

public function testCantSwapPDOWithOpenTransaction()
public function testSwapPDOWithOpenTransactionResetsTransactionLevel()
{
$pdo = $this->createMock('DatabaseConnectionTestMockPDO');
$pdo->expects($this->once())->method('beginTransaction')->will($this->returnValue(true));
$connection = $this->getMockConnection([], $pdo);
$connection->beginTransaction();
$this->setExpectedException('RuntimeException', "Can't swap PDO instance while within transaction.");
$connection->disconnect();
$this->assertEquals(0, $connection->transactionLevel());
}

public function testBeganTransactionFiresEventsIfSet()
Expand Down Expand Up @@ -240,24 +240,42 @@ public function testTransactionMethodRollsbackAndThrows()
}

/**
* @expectedException RuntimeException
* @expectedException \Illuminate\Database\QueryException
*/
public function testTransactionMethodDisallowPDOChanging()
public function testOnLostConnectionPDOIsNotSwappedWithinATransaction()
{
$pdo = $this->getMockBuilder('DatabaseConnectionTestMockPDO')->setMethods(['beginTransaction', 'commit', 'rollBack'])->getMock();
$pdo->expects($this->once())->method('beginTransaction');
$pdo->expects($this->once())->method('rollBack');
$pdo->expects($this->never())->method('commit');
$pdo = m::mock(PDO::class);
$pdo->shouldReceive('beginTransaction')->once();
$statement = m::mock(PDOStatement::class);
$pdo->shouldReceive('prepare')->once()->andReturn($statement);
$statement->shouldReceive('execute')->once()->andThrow(new PDOException('server has gone away'));

$mock = $this->getMockConnection([], $pdo);
$connection = new \Illuminate\Database\Connection($pdo);
$connection->beginTransaction();
$connection->statement('foo');
}

$mock->setReconnector(function ($connection) {
$connection->setPDO(null);
});
public function testOnLostConnectionPDOIsSwappedOutsideTransaction()
{
$pdo = m::mock(PDO::class);

$statement = m::mock(PDOStatement::class);
$statement->shouldReceive('execute')->once()->andThrow(new PDOException('server has gone away'));
$statement->shouldReceive('execute')->once()->andReturn('result');

$pdo->shouldReceive('prepare')->twice()->andReturn($statement);

$mock->transaction(function ($connection) {
$connection->reconnect();
$connection = new \Illuminate\Database\Connection($pdo);

$called = false;

$connection->setReconnector(function ($connection) use (&$called) {
$called = true;
});

$this->assertEquals('result', $connection->statement('foo'));

$this->assertTrue($called);
}

public function testRunMethodRetriesOnFailure()
Expand Down