Simple refactor + testFetchRowKeys

Author: isublimity

src/Statement.php

@@ -359,17 +359,19 @@ public function countAll()
     public function statistics($key = false)
     {
         $this->init();
-        if ($key)
-        {
-            if (!is_array($this->statistics)) {
-                return null;
-            }
-            if (!isset($this->statistics[$key])) {
-                return null;
-            }
-            return $this->statistics[$key];
+
+        if (!is_array($this->statistics)) {
+            return null;
+        }
+
+        if (!$key) return $this->statistics;
+
+        if (!isset($this->statistics[$key])) {
+            return null;
         }
-        return $this->statistics;
+
+        return $this->statistics[$key];
+
     }
 
     /**
@@ -410,19 +412,22 @@ public function fetchRow($key = null)
         $this->init();
 
         $position=$this->iterator;
-        if (isset($this->array_data[$position])) {
-            $this->iterator++;
-            if ($key) {
-                if (isset($this->array_data[$position][$key])) {
-                    return $this->array_data[$position][$key];
-                } else {
-                    return null;
-                }
-            }
+
+        if (!isset($this->array_data[$position])) {
+            return null;
+        }
+
+        $this->iterator++;
+
+        if (!$key) {
             return $this->array_data[$position];
         }
+        if (!isset($this->array_data[$position][$key])) {
+            return null;
+        }
+
+        return $this->array_data[$position][$key];
 
-        return null;
     }
     /**
      * @param string $key
@@ -432,17 +437,19 @@ public function fetchRow($key = null)
     public function fetchOne($key = null)
     {
         $this->init();
-        if (isset($this->array_data[0])) {
-            if ($key) {
-                if (isset($this->array_data[0][$key])) {
-                    return $this->array_data[0][$key];
-                } else {
-                    return null;
-                }
-            }
+        if (!isset($this->array_data[0])) {
+            return null;
+        }
+
+        if (!$key) {
             return $this->array_data[0];
         }
-        return null;
+
+        if (!isset($this->array_data[0][$key])) {
+            return null;
+        }
+
+        return $this->array_data[0][$key];
     }
 
     /**

tests/ClientTest.php

@@ -1008,24 +1008,4 @@ public function testStreamInsertFormatJSONEachRow()
         $this->assertEquals(count(file($file_name)), $statement->count());
     }
 
-
-    public function testFetchOne()
-    {
-        $result = $this->client->select(
-            'SELECT number FROM system.numbers LIMIT 5'
-        );
-        // fetchOne
-        $this->assertEquals(0,$result->fetchOne('number'));
-        $this->assertEquals(0,$result->fetchOne('number'));
-        $this->assertEquals(0,$result->fetchOne('number'));
-
-        // fetchRow
-        $this->assertEquals(0,$result->fetchRow('number'));
-        $this->assertEquals(1,$result->fetchRow('number'));
-        $this->assertEquals(2,$result->fetchRow('number'));
-        $result->resetIterator();
-        $this->assertEquals(0,$result->fetchRow('number'));
-        $this->assertEquals(1,$result->fetchRow('number'));
-        $this->assertEquals(2,$result->fetchRow('number'));
-    }
 }

tests/FetchTest.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace ClickHouseDB\Tests;
+
+use ClickHouseDB\Exception\QueryException;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Class FetchTest
+ * @group FetchTest
+ * @package ClickHouseDB\Tests
+ */
+final class FetchTest extends TestCase
+{
+    use WithClient;
+
+
+
+    public function testFetchRowKeys()
+    {
+        $result = $this->client->select(
+            'SELECT number FROM system.numbers LIMIT 5'
+        );
+        $this->assertEquals(null,$result->fetchRow('x'));
+        $this->assertEquals(null,$result->fetchRow('y'));
+        $this->assertEquals(2,$result->fetchRow('number'));
+        $result->resetIterator();
+        $this->assertEquals(null,$result->fetchRow('x'));
+        $this->assertEquals(1,$result->fetchRow('number'));
+
+
+        $this->assertEquals(null,$result->fetchOne('w'));
+        $this->assertEquals(null,$result->fetchOne('q'));
+        $this->assertEquals(0,$result->fetchOne('number'));
+    }
+    public function testFetchOne()
+    {
+        $result = $this->client->select(
+            'SELECT number FROM system.numbers LIMIT 5'
+        );
+        // fetchOne
+        $this->assertEquals(0,$result->fetchOne('number'));
+        $this->assertEquals(0,$result->fetchOne('number'));
+        $this->assertEquals(0,$result->fetchOne('number'));
+
+        // fetchRow
+        $this->assertEquals(0,$result->fetchRow('number'));
+        $this->assertEquals(1,$result->fetchRow('number'));
+        $this->assertEquals(2,$result->fetchRow('number'));
+        $result->resetIterator();
+        $this->assertEquals(0,$result->fetchRow('number'));
+        $this->assertEquals(1,$result->fetchRow('number'));
+        $this->assertEquals(2,$result->fetchRow('number'));
+    }
+}