Tests

AgelxNash · Jun 16, 2018 · a45e075 · a45e075
1 parent 17e0738
commit a45e075
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 2 deletions.
diff --git a/src/Drivers/IlluminateDriver.php b/src/Drivers/IlluminateDriver.php
@@ -393,7 +393,9 @@ public function getColumn($name, $result)
 
         if ($this->isResult($result)) {
             while ($row = $this->getRow($result)) {
-                $col[] = $row[$name];
+                if (array_key_exists($name, $row)) {
+                    $col[] = $row[$name];
+                }
             }
         }
 

diff --git a/src/Drivers/MySqliDriver.php b/src/Drivers/MySqliDriver.php
@@ -266,7 +266,9 @@ public function getColumn($name, $result)
 
         if ($this->isResult($result)) {
             while ($row = $this->getRow($result)) {
-                $col[] = $row[$name];
+                if (array_key_exists($name, $row)) {
+                    $col[] = $row[$name];
+                }
             }
         }
 

diff --git a/tests/RealQueryTest.php b/tests/RealQueryTest.php
@@ -129,6 +129,11 @@ public function testHelperMethods()
             $this->instance->getColumnNames($result)
         );
 
+        $this->assertEquals(
+            [],
+            $this->instance->getColumnNames(null)
+        );
+
         $out = $this->instance->getColumn('id', $result);
         $this->assertEquals(
             ['1', '2', '4'],
@@ -139,11 +144,26 @@ public function testHelperMethods()
             $this->instance->getColumn('id', $query)
         );
 
+        $this->assertEquals(
+            [],
+            $this->instance->getColumn('id', null)
+        );
+
+        $this->assertEquals(
+            [],
+            $this->instance->getColumn('nop', $query)
+        );
+
         $this->assertEquals(
             3,
             $this->instance->getRecordCount($result)
         );
 
+        $this->assertEquals(
+            0,
+            $this->instance->getRecordCount(null)
+        );
+
         $this->assertEquals(
             'id',
             $this->instance->fieldName($result, 0)
@@ -154,10 +174,20 @@ public function testHelperMethods()
             $this->instance->fieldName($result, 1)
         );
 
+        $this->assertEquals(
+            null,
+            $this->instance->fieldName(null)
+        );
+
         $this->assertEquals(
             2,
             $this->instance->numFields($result)
         );
+
+        $this->assertEquals(
+            0,
+            $this->instance->numFields(null)
+        );
     }
 
     public function testUpdate()
@@ -291,6 +321,11 @@ public function testGetTableMetaData()
     {
         $this->instance->flushExecutedQuery();
 
+        $this->assertEquals(
+            [],
+            $this->instance->getTableMetaData('')
+        );
+
         $data = $this->instance->getTableMetaData($this->table);
 
         $this->assertArrayHasKey('id', $data);