removed unused ISupplementalDriver::normalizeRow() (BC break)

hranicka · Feb 2, 2017 · 0818225 · 0818225
1 parent e662ef6
commit 0818225
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 75 deletions.
diff --git a/src/Database/Drivers/MsSqlDriver.php b/src/Database/Drivers/MsSqlDriver.php
@@ -91,15 +91,6 @@ public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
 	}
 
 
-	/**
-	 * Normalizes result row.
-	 */
-	public function normalizeRow(array $row): array
-	{
-		return $row;
-	}
-
-
 	/********************* reflection ****************d*g**/
 
 

diff --git a/src/Database/Drivers/MySqlDriver.php b/src/Database/Drivers/MySqlDriver.php
@@ -125,15 +125,6 @@ public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
 	}
 
 
-	/**
-	 * Normalizes result row.
-	 */
-	public function normalizeRow(array $row): array
-	{
-		return $row;
-	}
-
-
 	/********************* reflection ****************d*g**/
 
 

diff --git a/src/Database/Drivers/OciDriver.php b/src/Database/Drivers/OciDriver.php
@@ -111,15 +111,6 @@ public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
 	}
 
 
-	/**
-	 * Normalizes result row.
-	 */
-	public function normalizeRow(array $row): array
-	{
-		return $row;
-	}
-
-
 	/********************* reflection ****************d*g**/
 
 

diff --git a/src/Database/Drivers/OdbcDriver.php b/src/Database/Drivers/OdbcDriver.php
@@ -90,15 +90,6 @@ public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
 	}
 
 
-	/**
-	 * Normalizes result row.
-	 */
-	public function normalizeRow(array $row): array
-	{
-		return $row;
-	}
-
-
 	/********************* reflection ****************d*g**/
 
 

diff --git a/src/Database/Drivers/PgSqlDriver.php b/src/Database/Drivers/PgSqlDriver.php
@@ -113,15 +113,6 @@ public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
 	}
 
 
-	/**
-	 * Normalizes result row.
-	 */
-	public function normalizeRow(array $row): array
-	{
-		return $row;
-	}
-
-
 	/********************* reflection ****************d*g**/
 
 

diff --git a/src/Database/Drivers/SqliteDriver.php b/src/Database/Drivers/SqliteDriver.php
@@ -117,15 +117,6 @@ public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
 	}
 
 
-	/**
-	 * Normalizes result row.
-	 */
-	public function normalizeRow(array $row): array
-	{
-		return $row;
-	}
-
-
 	/********************* reflection ****************d*g**/
 
 

diff --git a/src/Database/Drivers/SqlsrvDriver.php b/src/Database/Drivers/SqlsrvDriver.php
@@ -109,15 +109,6 @@ public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
 	}
 
 
-	/**
-	 * Normalizes result row.
-	 */
-	public function normalizeRow(array $row): array
-	{
-		return $row;
-	}
-
-
 	/********************* reflection ****************d*g**/
 
 

diff --git a/src/Database/ISupplementalDriver.php b/src/Database/ISupplementalDriver.php
@@ -55,11 +55,6 @@ function formatLike(string $value, int $pos): string;
 	 */
 	function applyLimit(string &$sql, ?int $limit, ?int $offset): void;
 
-	/**
-	 * Normalizes result row.
-	 */
-	function normalizeRow(array $row): array;
-
 
 	/********************* reflection ****************d*g**/
 

diff --git a/src/Database/ResultSet.php b/src/Database/ResultSet.php
@@ -23,9 +23,6 @@ class ResultSet implements \Iterator, IRowContainer
 	/** @var Connection */
 	private $connection;
 
-	/** @var ISupplementalDriver */
-	private $supplementalDriver;
-
 	/** @var \PDOStatement|NULL */
 	private $pdoStatement;
 
@@ -55,7 +52,6 @@ public function __construct(Connection $connection, $queryString, array $params)
 	{
 		$time = microtime(TRUE);
 		$this->connection = $connection;
-		$this->supplementalDriver = $connection->getSupplementalDriver();
 		$this->queryString = $queryString;
 		$this->params = $params;
 
@@ -74,7 +70,7 @@ public function __construct(Connection $connection, $queryString, array $params)
 				$this->pdoStatement->execute();
 			}
 		} catch (\PDOException $e) {
-			$e = $this->supplementalDriver->convertException($e);
+			$e = $connection->getSupplementalDriver()->convertException($e);
 			$e->queryString = $queryString;
 			throw $e;
 		}
@@ -133,7 +129,7 @@ public function getTime(): float
 	public function normalizeRow(array $row): array
 	{
 		if ($this->types === NULL) {
-			$this->types = (array) $this->supplementalDriver->getColumnTypes($this->pdoStatement);
+			$this->types = (array) $this->connection->getSupplementalDriver()->getColumnTypes($this->pdoStatement);
 		}
 
 		foreach ($this->types as $key => $type) {
@@ -166,7 +162,7 @@ public function normalizeRow(array $row): array
 			}
 		}
 
-		return $this->supplementalDriver->normalizeRow($row);
+		return $row;
 	}