Merge pull request #35 from mathroc/fix/34

fix {Retry,MasterSlaves}Driver::get{Database,SchemaManager}

features/bootstrap/FeatureContext.php

@@ -84,7 +84,7 @@ public function aMasterSlavesConnectionWithSlaves($connectionName, $slaveCount)
         $params = [
             'master' => $master,
             'slaves' => $slaves,
-            'driverClass' => 'Ez\DbLinker\Driver\MysqlMasterSlavesDriver',
+            'driverClass' => $this->masterSlaveDriverClass(),
         ];
         $this->connections[$connectionName] = [
             'params' => $params,
@@ -268,7 +268,7 @@ public function aRetryMasterSlavesConnectionWithSlavesLimitedToRetryWithDbAndUse
             'connectionParams' => [
                 'master' => $master,
                 'slaves' => $slaves,
-                'driverClass' => 'Ez\DbLinker\Driver\MysqlMasterSlavesDriver',
+                'driverClass' => $this->masterSlaveDriverClass(),
             ],
             'retryStrategy' => $this->retryStrategy($n),
         ];
@@ -280,6 +280,16 @@ public function aRetryMasterSlavesConnectionWithSlavesLimitedToRetryWithDbAndUse
         ];
     }
 
+    /**
+     * @Then I can get the database name on :connectionName
+     */
+    public function iCanGetTheDatabaseNameOn($connectionName)
+    {
+        $response = $this->getConnection($connectionName)->getDatabase();
+        $expectedResponse = $this->defaultDatabaseName();
+        assert($response === $expectedResponse, "'$response' matches '$expectedResponse'");
+    }
+
     /**
      * @Given a retry connection :connectionName limited to :n retry with db :db
      * @Given a retry connection :connectionName limited to :n retry with db :db and username :username
@@ -387,7 +397,7 @@ public function shouldHaveSlave($connectionName, $n)
         if ($connection instanceof \Ez\DbLinker\Driver\Connection\RetryConnection) {
             $connection = $connection->wrappedConnection();
         }
-        $slaveCount = $connection->slaves()->count();
+        $slaveCount = count($connection->slaves());
         assert($slaveCount === (int)$n, "Slaves count is $slaveCount, $n expected.");
     }
 

features/bootstrap/MySQLContext.php

@@ -14,7 +14,7 @@ private function masterParams($username = null, $password = '') {
             'host'          => getenv('DBLINKER_MYSQL_1_PORT_3306_TCP_ADDR'),
             'user'          => getenv('DBLINKER_MYSQL_1_ENV_MYSQL_USER'),
             'password'      => getenv('DBLINKER_MYSQL_1_ENV_MYSQL_PASSWORD'),
-            'dbname'        => getenv('DBLINKER_MYSQL_1_ENV_MYSQL_DATABASE'),
+            'dbname'        => $this->defaultDatabaseName(),
         ];
         if ($username !== null) {
             $params['user'] = $username;
@@ -26,6 +26,11 @@ private function masterParams($username = null, $password = '') {
         return $this->params($params);
     }
 
+    private function defaultDatabaseName()
+    {
+        return getenv('DBLINKER_MYSQL_1_ENV_MYSQL_DATABASE');
+    }
+
     private function activeConnectionsCount()
     {
         $connection = $this->rootConnection();

features/bootstrap/PostgreSQLContext.php

@@ -11,7 +11,7 @@ private function masterParams($username = null, $password = '') {
             'host'          => getenv('DBLINKER_POSTGRESQL_1_PORT_5432_TCP_ADDR'),
             'user'          => getenv('DBLINKER_POSTGRESQL_1_ENV_POSTGRES_USER'),
             'password'      => getenv('DBLINKER_POSTGRESQL_1_ENV_POSTGRES_PASSWORD'),
-            'dbname'        => getenv('DBLINKER_POSTGRESQL_1_ENV_POSTGRES_DATABASE'),
+            'dbname'        => $this->defaultDatabaseName(),
         ];
         if ($username !== null && $username !== 'root') {
             if ($username === 'root') {
@@ -24,6 +24,11 @@ private function masterParams($username = null, $password = '') {
         return $this->params($params);
     }
 
+    private function defaultDatabaseName()
+    {
+        return getenv('DBLINKER_POSTGRESQL_1_ENV_POSTGRES_DATABASE');
+    }
+
     private function activeConnectionsCount()
     {
         return 0;

features/master-slave.feature

@@ -42,3 +42,6 @@ Feature: Master / Slaves
          When I query "SELECT 1" on "conn"
          Then the last query succeeded on "conn"
           And "conn" is on master
+
+    Scenario: Get database
+        Then I can get the database name on "conn"

features/retry-master-slave.feature

@@ -1,6 +1,10 @@
 @retry @master-slaves
 Feature: Retry Master/Slaves
 
+    Scenario: Get database
+        Given a retry master/slaves connection "conn" with 2 slaves limited to 1 retry
+        Then I can get the database name on "conn"
+
     Scenario: ACCESS_DENIED_ERROR restart on another slave
         Given a retry master/slaves connection "conn" with 2 slaves limited to 1 retry with username "nobody"
          When I query "SELECT 1" on "conn"

features/retry.feature

@@ -78,6 +78,9 @@ Feature: Retry
           And the last error should be "CON_COUNT" on "conn2"
           And "conn2" retry limit should be 0
 
+    Scenario: Get database
+        Then I can get the database name on "conn"
+
     Scenario: No such table
         Given table "not_here_yet" can be created automatically on "conn"
          When I prepare a statement "SELECT * FROM not_here_yet" on "conn"

src/Driver/Connection/ConnectionWrapper.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Ez\DbLinker\Driver\Connection;
+
+interface ConnectionWrapper
+{
+    /**
+     * @return \Doctrine\DBAL\Driver\Connection
+     */
+    public function wrappedConnection();
+
+    /**
+     * @return \Doctrine\DBAL\Driver
+     */
+    public function wrappedDriver();
+}

src/Driver/Connection/ConnectionWrapperTrait.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace Ez\DbLinker\Driver\Connection;
+
+use Closure;
+use Exception;
+use SplObjectStorage;
+use Doctrine\DBAL\DriverManager;
+use Doctrine\DBAL\Driver\Connection;
+
+trait ConnectionWrapperTrait
+{
+    private $wrappedConnection;
+    private $wrappedDriver;
+
+    /**
+     * @inherit
+     */
+    public function wrappedConnection()
+    {
+        if ($this->wrappedConnection === null) {
+            $this->wrap();
+        }
+        return $this->wrappedConnection;
+    }
+
+    public function wrappedDriver()
+    {
+        if ($this->wrappedDriver === null) {
+            $this->wrap();
+        }
+        return $this->wrappedDriver;
+    }
+
+    abstract protected function wrap();
+}