Skip to content

Commit 0818225

Browse files
committed
removed unused ISupplementalDriver::normalizeRow() (BC break)
1 parent e662ef6 commit 0818225

File tree

9 files changed

+3
-75
lines changed

9 files changed

+3
-75
lines changed

src/Database/Drivers/MsSqlDriver.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,6 @@ public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
9191
}
9292

9393

94-
/**
95-
* Normalizes result row.
96-
*/
97-
public function normalizeRow(array $row): array
98-
{
99-
return $row;
100-
}
101-
102-
10394
/********************* reflection ****************d*g**/
10495

10596

src/Database/Drivers/MySqlDriver.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -125,15 +125,6 @@ public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
125125
}
126126

127127

128-
/**
129-
* Normalizes result row.
130-
*/
131-
public function normalizeRow(array $row): array
132-
{
133-
return $row;
134-
}
135-
136-
137128
/********************* reflection ****************d*g**/
138129

139130

src/Database/Drivers/OciDriver.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -111,15 +111,6 @@ public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
111111
}
112112

113113

114-
/**
115-
* Normalizes result row.
116-
*/
117-
public function normalizeRow(array $row): array
118-
{
119-
return $row;
120-
}
121-
122-
123114
/********************* reflection ****************d*g**/
124115

125116

src/Database/Drivers/OdbcDriver.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -90,15 +90,6 @@ public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
9090
}
9191

9292

93-
/**
94-
* Normalizes result row.
95-
*/
96-
public function normalizeRow(array $row): array
97-
{
98-
return $row;
99-
}
100-
101-
10293
/********************* reflection ****************d*g**/
10394

10495

src/Database/Drivers/PgSqlDriver.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -113,15 +113,6 @@ public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
113113
}
114114

115115

116-
/**
117-
* Normalizes result row.
118-
*/
119-
public function normalizeRow(array $row): array
120-
{
121-
return $row;
122-
}
123-
124-
125116
/********************* reflection ****************d*g**/
126117

127118

src/Database/Drivers/SqliteDriver.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,6 @@ public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
117117
}
118118

119119

120-
/**
121-
* Normalizes result row.
122-
*/
123-
public function normalizeRow(array $row): array
124-
{
125-
return $row;
126-
}
127-
128-
129120
/********************* reflection ****************d*g**/
130121

131122

src/Database/Drivers/SqlsrvDriver.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -109,15 +109,6 @@ public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
109109
}
110110

111111

112-
/**
113-
* Normalizes result row.
114-
*/
115-
public function normalizeRow(array $row): array
116-
{
117-
return $row;
118-
}
119-
120-
121112
/********************* reflection ****************d*g**/
122113

123114

src/Database/ISupplementalDriver.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,6 @@ function formatLike(string $value, int $pos): string;
5555
*/
5656
function applyLimit(string &$sql, ?int $limit, ?int $offset): void;
5757

58-
/**
59-
* Normalizes result row.
60-
*/
61-
function normalizeRow(array $row): array;
62-
6358

6459
/********************* reflection ****************d*g**/
6560

src/Database/ResultSet.php

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ class ResultSet implements \Iterator, IRowContainer
2323
/** @var Connection */
2424
private $connection;
2525

26-
/** @var ISupplementalDriver */
27-
private $supplementalDriver;
28-
2926
/** @var \PDOStatement|NULL */
3027
private $pdoStatement;
3128

@@ -55,7 +52,6 @@ public function __construct(Connection $connection, $queryString, array $params)
5552
{
5653
$time = microtime(TRUE);
5754
$this->connection = $connection;
58-
$this->supplementalDriver = $connection->getSupplementalDriver();
5955
$this->queryString = $queryString;
6056
$this->params = $params;
6157

@@ -74,7 +70,7 @@ public function __construct(Connection $connection, $queryString, array $params)
7470
$this->pdoStatement->execute();
7571
}
7672
} catch (\PDOException $e) {
77-
$e = $this->supplementalDriver->convertException($e);
73+
$e = $connection->getSupplementalDriver()->convertException($e);
7874
$e->queryString = $queryString;
7975
throw $e;
8076
}
@@ -133,7 +129,7 @@ public function getTime(): float
133129
public function normalizeRow(array $row): array
134130
{
135131
if ($this->types === NULL) {
136-
$this->types = (array) $this->supplementalDriver->getColumnTypes($this->pdoStatement);
132+
$this->types = (array) $this->connection->getSupplementalDriver()->getColumnTypes($this->pdoStatement);
137133
}
138134

139135
foreach ($this->types as $key => $type) {
@@ -166,7 +162,7 @@ public function normalizeRow(array $row): array
166162
}
167163
}
168164

169-
return $this->supplementalDriver->normalizeRow($row);
165+
return $row;
170166
}
171167

172168

0 commit comments

Comments
 (0)