@@ -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