Merge pull request #912 from vincentchalamon/master

Fix bug about get default params on PoolingShardConnection

lib/Doctrine/DBAL/Sharding/PoolingShardConnection.php

@@ -141,7 +141,7 @@ public function getActiveShardId()
      */
     public function getParams()
     {
-        return $this->activeShardId ? $this->connections[$this->activeShardId] : parent::getParams();
+        return $this->activeShardId ? $this->connections[$this->activeShardId] : $this->connections[0];
     }
 
     /**

tests/Doctrine/Tests/DBAL/Sharding/PoolingShardConnectionTest.php

@@ -209,34 +209,37 @@ public function testGetParamsOverride()
         $conn = DriverManager::getConnection(array(
             'wrapperClass' => 'Doctrine\DBAL\Sharding\PoolingShardConnection',
             'driver' => 'pdo_sqlite',
-            'global' => array('memory' => true),
+            'global' => array('memory' => true, 'host' => 'localhost'),
             'shards' => array(
-                array('id' => 1, 'memory' => true),
+                array('id' => 1, 'memory' => true, 'host' => 'foo'),
             ),
             'shardChoser' => 'Doctrine\DBAL\Sharding\ShardChoser\MultiTenantShardChoser',
         ));
 
         $this->assertEquals(array(
             'wrapperClass' => 'Doctrine\DBAL\Sharding\PoolingShardConnection',
             'driver' => 'pdo_sqlite',
-            'global' => array('memory' => true),
+            'global' => array('memory' => true, 'host' => 'localhost'),
             'shards' => array(
-                array('id' => 1, 'memory' => true),
+                array('id' => 1, 'memory' => true, 'host' => 'foo'),
             ),
             'shardChoser' => new MultiTenantShardChoser(),
+            'memory' => true,
+            'host' => 'localhost',
         ), $conn->getParams());
 
         $conn->connect(1);
         $this->assertEquals(array(
             'wrapperClass' => 'Doctrine\DBAL\Sharding\PoolingShardConnection',
             'driver' => 'pdo_sqlite',
-            'global' => array('memory' => true),
+            'global' => array('memory' => true, 'host' => 'localhost'),
             'shards' => array(
-                array('id' => 1, 'memory' => true),
+                array('id' => 1, 'memory' => true, 'host' => 'foo'),
             ),
             'shardChoser' => new MultiTenantShardChoser(),
             'id' => 1,
             'memory' => true,
+            'host' => 'foo',
         ), $conn->getParams());
     }