Merge pull request #7 from arkhamvm/patch-1

Transfer driverName to parent class
bashkarev · Jul 29, 2018 · 78eb024 · 78eb024
2 parents 72642bb + e433379
commit 78eb024
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/Connection.php b/Connection.php
@@ -25,10 +25,6 @@ class Connection extends \yii\db\Connection
      * @inheritdoc
      */
     public $commandClass = 'bashkarev\clickhouse\Command';
-    /**
-     * @inheritdoc
-     */
-    public $driverName = 'clickhouse';
     /**
      * @var Schema
      */
@@ -42,6 +38,18 @@ class Connection extends \yii\db\Connection
      */
     private $_configuration;
 
+    /**
+     * @inheritdoc
+     */
+    public function __construct($config = [])
+    {
+        if (!isset($config['driverName'])) {
+            $config['driverName'] = 'clickhouse';
+        }
+
+        parent::__construct($config);
+    }
+
     /**
      * @inheritdoc
      */
@@ -149,4 +157,4 @@ public function transaction(callable $callback, $isolationLevel = null)
         throw new NotSupportedException('In the clickhouse database, transactions are not supported');
     }
 
-}
+}
diff --git a/tests/ConnectionTest.php b/tests/ConnectionTest.php
@@ -59,6 +59,7 @@ public function testGetDriverName()
     {
         $connection = $this->getConnection(false, false);
         $this->assertEquals('clickhouse', $connection->driverName);
+        $this->assertEquals('clickhouse', $connection->getDriverName());
     }
 
     public function testQuoteValue()