Transfer driverName to parent class

bashkarev · Jul 29, 2018 · e433379 · e433379
1 parent 6444943
commit e433379
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 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,15 +38,17 @@ class Connection extends \yii\db\Connection
      */
     private $_configuration;
 
-	/**
-	 * @inheritdoc
-	 */
-	public function init()
-	{
-		$this->setDriverName($this->driverName);
+    /**
+     * @inheritdoc
+     */
+    public function __construct($config = [])
+    {
+        if (!isset($config['driverName'])) {
+            $config['driverName'] = 'clickhouse';
+        }
 
-		parent::init();
-	}
+        parent::__construct($config);
+    }
 
     /**
      * @inheritdoc

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()