Testing phase

Methods and functions complete but failed testing in phpunit so needing to fix

Author: dpDesignz

lib/ezFunctions.php

@@ -494,6 +494,19 @@ function replace($table = '', $keyValue)
             : false;
     }
 
+    function flattenWhereConditions($whereConditions)
+    {
+        $whereConditionsReturn = [];
+        foreach ($whereConditions as $whereCondition) {
+            if (!empty($whereCondition[0]) && is_array($whereCondition[0])) {
+                $whereConditionsReturn = array_merge($whereConditionsReturn, flattenWhereConditions($whereCondition));
+            } else {
+                $whereConditionsReturn[] = $whereCondition;
+            }
+        }
+        return $whereConditionsReturn;
+    }
+
     function ezFunctions()
     {
         return true;

lib/ezQuery.php

@@ -393,7 +393,9 @@ private function conditionIs($key, $condition, $combine)
 
     private function retrieveConditions($whereConditions)
     {
-        $whereClause = [];
+        $whereConditions = flattenWhereConditions($whereConditions);
+        $whereKey = [];
+        $whereValue = [];
         $operator = [];
         $extra = [];
         $combiner = [];
@@ -402,23 +404,27 @@ private function retrieveConditions($whereConditions)
             $operator[] = (isset($checkFields[1])) ? $checkFields[1] : '';
             if (empty($checkFields[1])) {
                 $this->clearPrepare();
-                return [[], [], [], [], []];
+                return [[], [], [], [], [], []];
             }
 
             if (\strtoupper($checkFields[1]) == 'IN') {
-                $whereClause[$checkFields[0]] = \array_slice((array) $checkFields, 2);
+                $whereKey[] = $checkFields[0];
+                $whereValue[] = \array_slice((array) $checkFields, 2);
                 $combiner[] = \_AND;
                 $group[] = null;
                 $extra[] = null;
             } else {
-                $whereClause[(isset($checkFields[0])) ? $checkFields[0] : '1'] = (isset($checkFields[2])) ? $checkFields[2] : '';
-                $combiner[] = (isset($checkFields[3])) ? $checkFields[3] : \_AND;
-                $group[] = (isset($checkFields[4])) ? $checkFields[4] : null;
-                $extra[] = (isset($checkFields[5])) ? $checkFields[5] : null;
+                if (!empty($checkFields[0])) {
+                    $whereKey[] = $checkFields[0];
+                    $whereValue[] = (isset($checkFields[2])) ? $checkFields[2] : '';
+                    $combiner[] = (isset($checkFields[3])) ? $checkFields[3] : \_AND;
+                    $group[] = (isset($checkFields[4])) ? $checkFields[4] : null;
+                    $extra[] = (isset($checkFields[5])) ? $checkFields[5] : null;
+                }
             }
         }
 
-        return [$operator, $whereClause, $combiner, $extra, $group];
+        return [$operator, $whereKey, $whereValue, $combiner, $extra, $group];
     }
 
     private function processConditions($column, $condition, $value, $valueOrCombine, $extraCombine, $whereGroup)
@@ -465,7 +471,6 @@ public function whereGroup(...$whereConditions)
 
     public function where(...$whereConditions)
     {
-        $whereConditions = (!empty($whereConditions[0]) && is_array($whereConditions[0])) ? $whereConditions[0] : $whereConditions;
 
         if (empty($whereConditions))
             return false;
@@ -478,22 +483,22 @@ public function where(...$whereConditions)
         if (\is_string($whereConditions[0]) && \strpos($whereConditions[0],  $whereOrHaving) !== false)
             return $whereConditions[0];
 
-        list($operator, $whereClause, $combiner, $extra, $group) = $this->retrieveConditions($whereConditions);
+        list($operator, $whereKeys, $whereValues, $combiner, $extra, $group) = $this->retrieveConditions($whereConditions);
         if (empty($operator))
             return false;
 
         $where = '1';
-        if (!isset($whereClause['1'])) {
+        if (!empty($whereKeys)) {
             $this->whereSQL = '';
             $i = 0;
-            foreach ($whereClause as $key => $val) {
+            foreach ($whereKeys as $key) {
                 $isCondition = \strtoupper($operator[$i]);
                 $combine = $combiner[$i];
                 $this->combineWith = \_AND;
                 if (\in_array(\strtoupper($combine), \_COMBINERS) || isset($extra[$i]))
                     $this->combineWith = isset($extra[$i]) ? $combine : \strtoupper($combine);
 
-                if ($this->processConditions($key, $isCondition, $val,  $this->combineWith, $extra[$i], $group[$i]) === false)
+                if ($this->processConditions($key, $isCondition, $whereValues[$i],  $this->combineWith, $extra[$i], $group[$i]) === false)
                     return false;
 
                 $i++;

tests/pdo/pdo_mysqlTest.php

@@ -265,6 +265,26 @@ public function testSelecting()
         $this->assertEquals(0, $this->object->query('DROP TABLE unit_test'));
     }
 
+    public function testWhereGroup()
+    {
+        $this->assertTrue($this->object->connect('mysql:host=' . self::TEST_DB_HOST . ';dbname=' . self::TEST_DB_NAME . ';port=' . self::TEST_DB_PORT, self::TEST_DB_USER, self::TEST_DB_PASSWORD));
+        $this->object->query('CREATE TABLE unit_test(id integer, test_key varchar(50), active tinyint(1), PRIMARY KEY (ID))');
+        $this->object->insert('unit_test', array('id' => '1', 'test_key' => 'testing 1', 'active' => 1));
+        $this->object->insert('unit_test', array('id' => '2', 'test_key' => 'testing 2', 'active' => 0));
+        $this->object->insert('unit_test', array('id' => '3', 'test_key' => 'testing 3', 'active' => 1));
+        $this->object->insert('unit_test', array('id' => '4', 'test_key' => 'testing 4', 'active' => 1));
+
+        $result = $this->object->selecting('unit_test', '*', where(eq('active', '1'), whereGroup(like('test_key', '%1%', _OR), like('test_key', '%3%', _OR))));
+        $i = 1;
+        foreach ($result as $row) {
+            $this->assertEquals($i, $row->id);
+            $this->assertEquals('testing ' . $i, $row->test_key);
+            $i = $i + 2;
+        }
+
+        $this->assertEquals(0, $this->object->query('DROP TABLE unit_test'));
+    }
+
     public function testJoins()
     {
         $this->assertTrue($this->object->connect('mysql:host=' . self::TEST_DB_HOST . ';dbname=' . self::TEST_DB_NAME . ';port=' . self::TEST_DB_PORT, self::TEST_DB_USER, self::TEST_DB_PASSWORD));