Commit 6f346ad0 authored by Marco Pivetta's avatar Marco Pivetta

Merge branch 'hotfix/#685-DBAL-997-undefined-_conn-property'

Close #685
Close #688
Close #691
parents fbd49846 f08d7a21
...@@ -597,7 +597,7 @@ class Connection implements DriverConnection ...@@ -597,7 +597,7 @@ class Connection implements DriverConnection
*/ */
public function close() public function close()
{ {
unset($this->_conn); $this->_conn = null;
$this->_isConnected = false; $this->_isConnected = false;
} }
......
...@@ -403,6 +403,13 @@ SQLSTATE[HY000]: General error: 1 near \"MUUHAAAAHAAAA\""); ...@@ -403,6 +403,13 @@ SQLSTATE[HY000]: General error: 1 near \"MUUHAAAAHAAAA\"");
$this->assertSame($result, $conn->fetchColumn($statement, $params, $column, $types)); $this->assertSame($result, $conn->fetchColumn($statement, $params, $column, $types));
} }
public function testConnectionIsClosed()
{
$this->setExpectedException('Doctrine\\DBAL\\Exception\\DriverException');
$this->_conn->close();
$this->_conn->quoteIdentifier('Bug');
}
public function testFetchAll() public function testFetchAll()
{ {
$statement = 'SELECT * FROM foo WHERE bar = ?'; $statement = 'SELECT * FROM foo WHERE bar = ?';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment