Merge pull request #86 from utopia-php/fix-83-count-include-parens-for-or-queries

Fix: statements with OR clauses when counting documents

Author: TorstenDittmann

src/Database/Adapter/MariaDB.php

@@ -654,7 +654,8 @@ public function count(string $collection, array $queries = [], int $max = 0): in
                 $conditions[] = $this->getSQLCondition('table_main.'.$query->getAttribute(), $query->getOperator(), ':attribute_'.$i.'_'.$key.'_'.$query->getAttribute(), $value);
             }
 
-            $where[] = implode(' OR ', $conditions);
+            $condition = implode(' OR ', $conditions);
+            $where[] = empty($condition) ? '' : '('.$condition.')';
         }
 
         $stmt = $this->getPDO()->prepare("SELECT COUNT(1) as sum FROM (SELECT 1 FROM {$this->getNamespace()}.{$name} table_main

tests/Database/Base.php

@@ -915,17 +915,6 @@ public function testFind(Document $document)
         $documents = static::getDatabase()->find('movies', [], 2, 0, ['price', 'year'], [Database::ORDER_DESC, Database::ORDER_ASC], $movies[0], Database::CURSOR_BEFORE);
         $this->assertEmpty(count($documents));
 
-        /**
-         * ORDER BY - After Exception
-         */
-
-        $document = new Document([
-            '$collection' => 'other collection'
-        ]);
-
-        $this->expectException(Exception::class);
-        static::getDatabase()->find('movies', [], 2, 0, [], [], $document);
-
         /**
          * Limit
          */
@@ -947,6 +936,26 @@ public function testFind(Document $document)
         $this->assertEquals('Frozen II', $documents[1]['name']);
         $this->assertEquals('Work in Progress', $documents[2]['name']);
         $this->assertEquals('Work in Progress 2', $documents[3]['name']);
+
+        /**
+         * Test that OR queries are handled correctly
+         */
+        $documents = static::getDatabase()->find('movies', [
+            new Query('director', Query::TYPE_EQUAL, ['TBD', 'Joe Johnston']),
+            new Query('year', Query::TYPE_EQUAL, [2025]),
+        ]);
+        $this->assertEquals(1, count($documents));
+
+        /**
+         * ORDER BY - After Exception
+         * Must be last assertion in test
+         */
+        $document = new Document([
+            '$collection' => 'other collection'
+        ]);
+
+        $this->expectException(Exception::class);
+        static::getDatabase()->find('movies', [], 2, 0, [], [], $document);
     }
 
     /**
@@ -985,6 +994,17 @@ public function testCount()
         $count = static::getDatabase()->count('movies', [], 3);
         $this->assertEquals(3, $count);
         Authorization::reset();
+
+        /**
+         * Test that OR queries are handled correctly
+         */
+        Authorization::disable();
+        $count = static::getDatabase()->count('movies', [
+            new Query('director', Query::TYPE_EQUAL, ['TBD', 'Joe Johnston']),
+            new Query('year', Query::TYPE_EQUAL, [2025]),
+        ]);
+        $this->assertEquals(1, $count);
+        Authorization::reset();
     }
 
     /**