Address

Author: fogelito

composer.lock

@@ -7,7 +7,7 @@
     convertNoticesToExceptions="true"
     convertWarningsToExceptions="true"
     processIsolation="false"
-    stopOnFailure="true"
+    stopOnFailure="false"
 >
     <testsuites>
         <testsuite name="unit">

phpunit.xml

@@ -32,7 +32,7 @@
 use Utopia\Database\Validator\IndexDependency as IndexDependencyValidator;
 use Utopia\Database\Validator\PartialStructure;
 use Utopia\Database\Validator\Permissions;
-use Utopia\Database\Validator\Queries\V2 as DocumentsValidator;
+use Utopia\Database\Validator\Queries\Queries as DocumentsValidator;
 use Utopia\Database\Validator\Spatial;
 use Utopia\Database\Validator\Structure;
 
@@ -8556,7 +8556,7 @@ public function count(string $collection, array $queries = [], ?int $max = null)
 
         foreach ($context->getCollections() as $contextCollection) {
             $documentSecurity = $contextCollection->getAttribute('documentSecurity', false);
-            $skipAuth = $this->authorization->isValid(new Input(self::PERMISSION_READ, $_collection->getRead()));
+            $skipAuth = $this->authorization->isValid(new Input(self::PERMISSION_READ, $contextCollection->getRead()));
 
             if (!$skipAuth && !$documentSecurity && $contextCollection->getId() !== self::METADATA) {
                 throw new AuthorizationException($this->authorization->getDescription());

src/Database/Database.php

@@ -20,7 +20,7 @@
 use Utopia\Validator\Integer;
 use Utopia\Validator\Text;
 
-class V2 extends Validator
+class Queries extends Validator
 {
     protected string $message = 'Invalid query';
 

src/Database/Validator/Queries/V2.php …c/Database/Validator/Queries/Queries.phpsrc/Database/Validator/Queries/V2.php renamed to src/Database/Validator/Queries/Queries.php src/Database/Validator/Queries/V2.php renamed to src/Database/Validator/Queries/Queries.php

@@ -42,8 +42,13 @@ public function testDifferentSelectsProduceDifferentCacheKeys(): void
     {
         $db = $this->createDatabase();
 
-        [, , $hashA] = $db->getCacheKeys('col', 'doc1', ['name']);
-        [, , $hashB] = $db->getCacheKeys('col', 'doc1', ['email']);
+        [, , $hashA] = $db->getCacheKeys('col', 'doc1', [
+            Query::select('name'),
+        ]);
+
+        [, , $hashB] = $db->getCacheKeys('col', 'doc1', [
+            Query::select('email'),
+        ]);
 
         $this->assertNotEquals($hashA, $hashB);
     }

tests/unit/CacheKeyTest.php

@@ -9,7 +9,7 @@
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Query;
 use Utopia\Database\QueryContext;
-use Utopia\Database\Validator\Queries\V2 as DocumentsValidator;
+use Utopia\Database\Validator\Queries\Queries as DocumentsValidator;
 
 class DocumentQueriesTest extends TestCase
 {

tests/unit/Validator/DocumentQueriesTest.php

@@ -9,7 +9,7 @@
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Query;
 use Utopia\Database\QueryContext;
-use Utopia\Database\Validator\Queries\V2 as DocumentsValidator;
+use Utopia\Database\Validator\Queries\Queries as DocumentsValidator;
 
 class DocumentsQueriesTest extends TestCase
 {

tests/unit/Validator/DocumentsQueriesTest.php

@@ -8,7 +8,7 @@
 use Utopia\Database\Exception;
 use Utopia\Database\Query;
 use Utopia\Database\QueryContext;
-use Utopia\Database\Validator\Queries\V2 as DocumentsValidator;
+use Utopia\Database\Validator\Queries\Queries as DocumentsValidator;
 
 class IndexedQueriesTest extends TestCase
 {

tests/unit/Validator/IndexedQueriesTest.php

@@ -8,7 +8,7 @@
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Query;
 use Utopia\Database\QueryContext;
-use Utopia\Database\Validator\Queries\V2 as DocumentsValidator;
+use Utopia\Database\Validator\Queries\Queries as DocumentsValidator;
 
 class FilterTest extends TestCase
 {

tests/unit/Validator/Query/FilterTest.php

@@ -8,7 +8,7 @@
 use Utopia\Database\Exception;
 use Utopia\Database\Query;
 use Utopia\Database\QueryContext;
-use Utopia\Database\Validator\Queries\V2 as DocumentsValidator;
+use Utopia\Database\Validator\Queries\Queries as DocumentsValidator;
 
 class OrderTest extends TestCase
 {