refactor ClickHouseStatement fetch

Митрофанов Николай · Митрофанов Николай · commit cdb7e7975e67 · 2017-05-16T16:44:57.000+03:00
diff --git a/src/ClickHouseStatement.php b/src/ClickHouseStatement.php
@@ -141,6 +141,11 @@ protected function assumeFetchMode($fetchMode = null)
     public function fetch($fetchMode = null)
     {
         $data = $this->getIterator()->current();
+
+        if (null === $data) {
+            return false;
+        }
+
         $this->getIterator()->next();
 
         if (\PDO::FETCH_NUM === $this->assumeFetchMode($fetchMode)) {
@@ -215,8 +220,7 @@ function ($row) {
      */
     public function fetchColumn($columnIndex = 0)
     {
-        if ($elem = $this->fetch()) {
-            $elem = array_values($elem);
+        if ($elem = $this->fetch(\PDO::FETCH_NUM)) {
 
             return isset($elem[$columnIndex]) ? $elem[$columnIndex] : $elem[0];
         }

Original file line number	Diff line number	Diff line change
`@@ -141,6 +141,11 @@ protected function assumeFetchMode($fetchMode = null)`
`141`	`141`	`public function fetch($fetchMode = null)`
`142`	`142`	`{`
`143`	`143`	`$data = $this->getIterator()->current();`
	`144`	`+`
	`145`	`+ if (null === $data) {`
	`146`	`+ return false;`
	`147`	`+ }`
	`148`	`+`
`144`	`149`	`$this->getIterator()->next();`
`145`	`150`
`146`	`151`	`if (\PDO::FETCH_NUM === $this->assumeFetchMode($fetchMode)) {`
`@@ -215,8 +220,7 @@ function ($row) {`
`215`	`220`	`*/`
`216`	`221`	`public function fetchColumn($columnIndex = 0)`
`217`	`222`	`{`
`218`		`- if ($elem = $this->fetch()) {`
`219`		`- $elem = array_values($elem);`
	`223`	`+ if ($elem = $this->fetch(\PDO::FETCH_NUM)) {`
`220`	`224`
`221`	`225`	`return isset($elem[$columnIndex]) ? $elem[$columnIndex] : $elem[0];`
`222`	`226`	`}`