Merge pull request #726 from alekitto/ms_reconnect_notice

MasterSlaveConnection::close() should reset connections array

lib/Doctrine/DBAL/Connections/MasterSlaveConnection.php

@@ -290,6 +290,9 @@ class MasterSlaveConnection extends Connection
         unset($this->connections['slave']);
 
         parent::close();
+
+        $this->_conn = null;
+        $this->connections = array('master' => null, 'slave' => null);
     }
 
     /**

tests/Doctrine/Tests/DBAL/Functional/MasterSlaveConnectionTest.php

@@ -126,4 +126,17 @@ class MasterSlaveConnectionTest extends DbalFunctionalTestCase
         $conn->connect('slave');
         $this->assertFalse($conn->isConnectedToMaster());
     }
+
+    public function testMasterSlaveConnectionCloseAndReconnect()
+    {
+        $conn = $this->createMasterSlaveConnection();
+        $conn->connect('master');
+        $this->assertTrue($conn->isConnectedToMaster());
+
+        $conn->close();
+        $this->assertFalse($conn->isConnectedToMaster());
+
+        $conn->connect('master');
+        $this->assertTrue($conn->isConnectedToMaster());
+    }
 }