MCLOUD-8420: ece-tools read driver_options configuration for DB connection (#81)

Author: BaDos

src/DB/Connection.php

@@ -218,9 +218,7 @@ private function connect()
             ),
             $connectionData->getUser(),
             $connectionData->getPassword(),
-            [
-                \PDO::ATTR_PERSISTENT => true,
-            ]
+            [\PDO::ATTR_PERSISTENT => true] + $connectionData->getDriverOptions()
         );
     }
 

src/DB/Data/Connection.php

@@ -80,4 +80,12 @@ public function getPassword()
     {
         return $this->connectionData['password'] ?? '';
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function getDriverOptions()
+    {
+        return $this->connectionData['driver_options'] ?? [];
+    }
 }

src/DB/Data/ConnectionInterface.php

@@ -46,4 +46,11 @@ public function getUser();
      * @return string|null
      */
     public function getPassword();
+
+    /**
+     * Returns driver options
+     *
+     * @return array
+     */
+    public function getDriverOptions();
 }

src/DB/Data/RelationshipConnection.php

@@ -68,4 +68,12 @@ public function getPassword()
     {
         return $this->connectionData['password'] ?? '';
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function getDriverOptions()
+    {
+        return $this->connectionData['driver_options'] ?? [];
+    }
 }

src/Test/Unit/DB/Data/ConnectionTest.php

@@ -23,13 +23,24 @@ public function testGetOptions()
             'dbname' => 'dbName',
             'username' => 'user',
             'password' => '1234',
+            'driver_options' => [
+                'option1' => 'value1',
+                'option2' => 'value2'
+            ],
         ]);
 
         $this->assertEquals('127.0.0.1', $relationshipConnection->getHost());
         $this->assertEquals('3306', $relationshipConnection->getPort());
         $this->assertEquals('dbName', $relationshipConnection->getDbName());
         $this->assertEquals('user', $relationshipConnection->getUser());
         $this->assertEquals('1234', $relationshipConnection->getPassword());
+        $this->assertEquals(
+            [
+                'option1' => 'value1',
+                'option2' => 'value2'
+            ],
+            $relationshipConnection->getDriverOptions()
+        );
     }
 
     public function testGetOptionsWithEmptyPortAndPortInHost()
@@ -75,4 +86,10 @@ public function testGetOptionsWithEmptyPortAndSocketHost()
         $this->assertEquals('/tmp/mysql.sock', $relationshipConnection->getHost());
         $this->assertEquals('', $relationshipConnection->getPort());
     }
+
+    public function testGetDriverOptionsEmpty()
+    {
+        $relationshipConnection = new Connection([]);
+        $this->assertEquals([], $relationshipConnection->getDriverOptions());
+    }
 }

src/Test/Unit/DB/Data/RelationshipConnectionTest.php

@@ -23,13 +23,24 @@ public function testGetOptions()
             'path' => 'dbName',
             'username' => 'user',
             'password' => '1234',
+            'driver_options' => [
+                'option1' => 'value1',
+                'option2' => 'value2'
+            ],
         ]);
 
         $this->assertEquals('127.0.0.1', $relationshipConnection->getHost());
         $this->assertEquals('3306', $relationshipConnection->getPort());
         $this->assertEquals('dbName', $relationshipConnection->getDbName());
         $this->assertEquals('user', $relationshipConnection->getUser());
         $this->assertEquals('1234', $relationshipConnection->getPassword());
+        $this->assertEquals(
+            [
+                'option1' => 'value1',
+                'option2' => 'value2'
+            ],
+            $relationshipConnection->getDriverOptions()
+        );
     }
 
     public function testGetEmptyOptions()
@@ -41,5 +52,6 @@ public function testGetEmptyOptions()
         $this->assertEmpty($relationshipConnection->getDbName());
         $this->assertEmpty($relationshipConnection->getUser());
         $this->assertEmpty($relationshipConnection->getPassword());
+        $this->assertEquals([], $relationshipConnection->getDriverOptions());
     }
 }