added ISupplementalDriver::initialize(), is used instead of construct…

…or (BC break!)
nette · Jan 25, 2017 · b4c5cd1 · b4c5cd1
1 parent 230b081
commit b4c5cd1
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 6 deletions.
diff --git a/src/Database/Connection.php b/src/Database/Connection.php
@@ -71,7 +71,8 @@ public function connect()
 		$class = empty($this->options['driverClass'])
 			? 'Nette\Database\Drivers\\' . ucfirst(str_replace('sql', 'Sql', $this->pdo->getAttribute(PDO::ATTR_DRIVER_NAME))) . 'Driver'
 			: $this->options['driverClass'];
-		$this->driver = new $class($this, $this->options);
+		$this->driver = new $class;
+		$this->driver->initialize($this, $this->options);
 		$this->preprocessor = new SqlPreprocessor($this);
 		$this->onConnect($this);
 	}

diff --git a/src/Database/Drivers/MsSqlDriver.php b/src/Database/Drivers/MsSqlDriver.php
@@ -19,6 +19,11 @@ class MsSqlDriver implements Nette\Database\ISupplementalDriver
 {
 	use Nette\SmartObject;
 
+	public function initialize(Nette\Database\Connection $connection, array $options)
+	{
+	}
+
+
 	public function convertException(\PDOException $e)
 	{
 		return Nette\Database\DriverException::from($e);

diff --git a/src/Database/Drivers/MySqlDriver.php b/src/Database/Drivers/MySqlDriver.php
@@ -32,7 +32,7 @@ class MySqlDriver implements Nette\Database\ISupplementalDriver
 	 *   - charset => character encoding to set (default is utf8 or utf8mb4 since MySQL 5.5.3)
 	 *   - sqlmode => see http://dev.mysql.com/doc/refman/5.0/en/server-sql-mode.html
 	 */
-	public function __construct(Nette\Database\Connection $connection, array $options)
+	public function initialize(Nette\Database\Connection $connection, array $options)
 	{
 		$this->connection = $connection;
 		$charset = $options['charset']

diff --git a/src/Database/Drivers/OciDriver.php b/src/Database/Drivers/OciDriver.php
@@ -26,7 +26,7 @@ class OciDriver implements Nette\Database\ISupplementalDriver
 	private $fmtDateTime;
 
 
-	public function __construct(Nette\Database\Connection $connection, array $options)
+	public function initialize(Nette\Database\Connection $connection, array $options)
 	{
 		$this->connection = $connection;
 		$this->fmtDateTime = $options['formatDateTime'] ?? 'U';

diff --git a/src/Database/Drivers/OdbcDriver.php b/src/Database/Drivers/OdbcDriver.php
@@ -19,6 +19,11 @@ class OdbcDriver implements Nette\Database\ISupplementalDriver
 {
 	use Nette\SmartObject;
 
+	public function initialize(Nette\Database\Connection $connection, array $options)
+	{
+	}
+
+
 	public function convertException(\PDOException $e)
 	{
 		return Nette\Database\DriverException::from($e);

diff --git a/src/Database/Drivers/PgSqlDriver.php b/src/Database/Drivers/PgSqlDriver.php
@@ -23,7 +23,7 @@ class PgSqlDriver implements Nette\Database\ISupplementalDriver
 	private $connection;
 
 
-	public function __construct(Nette\Database\Connection $connection, array $options)
+	public function initialize(Nette\Database\Connection $connection, array $options)
 	{
 		$this->connection = $connection;
 	}

diff --git a/src/Database/Drivers/SqliteDriver.php b/src/Database/Drivers/SqliteDriver.php
@@ -26,7 +26,7 @@ class SqliteDriver implements Nette\Database\ISupplementalDriver
 	private $fmtDateTime;
 
 
-	public function __construct(Nette\Database\Connection $connection, array $options)
+	public function initialize(Nette\Database\Connection $connection, array $options)
 	{
 		$this->connection = $connection;
 		$this->fmtDateTime = $options['formatDateTime'] ?? 'U';

diff --git a/src/Database/Drivers/SqlsrvDriver.php b/src/Database/Drivers/SqlsrvDriver.php
@@ -26,7 +26,7 @@ class SqlsrvDriver implements Nette\Database\ISupplementalDriver
 	private $version;
 
 
-	public function __construct(Nette\Database\Connection $connection, array $options)
+	public function initialize(Nette\Database\Connection $connection, array $options)
 	{
 		$this->connection = $connection;
 		$this->version = $connection->getPdo()->getAttribute(\PDO::ATTR_SERVER_VERSION);

diff --git a/src/Database/ISupplementalDriver.php b/src/Database/ISupplementalDriver.php
@@ -22,6 +22,12 @@ interface ISupplementalDriver
 		SUPPORT_SUBSELECT = 'subselect',
 		SUPPORT_SCHEMA = 'schema';
 
+	/**
+	 * Initializes connection.
+	 * @return void
+	 */
+	function initialize(Connection $connection, array $options);
+
 	/**
 	 * @return DriverException
 	 */