sort by attribute

Author: fogelito

src/Database/Database.php

@@ -9266,6 +9266,10 @@ public function getCacheKeys(string $collectionId, ?string $documentId = null, a
             $collectionId
         );
 
+        usort($selects, function ($a, $b) {
+            return strcmp($a->getAttribute(), $b->getAttribute());
+        });
+
         if ($documentId) {
             $documentKey = "{$collectionKey}:{$documentId}";
 

tests/unit/CacheKeyTest.php

@@ -7,6 +7,7 @@
 use Utopia\Cache\Cache;
 use Utopia\Database\Adapter;
 use Utopia\Database\Database;
+use Utopia\Database\Query;
 
 class CacheKeyTest extends TestCase
 {
@@ -51,8 +52,16 @@ public function testSelectOrderDoesNotAffectCacheKey(): void
     {
         $db = $this->createDatabase();
 
-        [, , $hashA] = $db->getCacheKeys('col', 'doc1', ['name', 'email']);
-        [, , $hashB] = $db->getCacheKeys('col', 'doc1', ['email', 'name']);
+
+        [, , $hashA] = $db->getCacheKeys('col', 'doc1', [
+            Query::select('email'),
+            Query::select('name'),
+        ]);
+
+        [, , $hashB] = $db->getCacheKeys('col', 'doc1', [
+            Query::select('name'),
+            Query::select('email'),
+        ]);
 
         $this->assertEquals($hashA, $hashB);
     }