From 42f72b4477ef951aa131429f4f513579b2a4cf46 Mon Sep 17 00:00:00 2001
From: fogelito <fogelshmuel@gmail.com>
Date: Mon, 24 Mar 2025 13:33:36 +0200
Subject: [PATCH] Add internalId to orders

---
 .../Utopia/Database/Validator/Queries/Base.php  | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Base.php b/src/Appwrite/Utopia/Database/Validator/Queries/Base.php
index d1b143ec9b..85fbf43e66 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Base.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Base.php
@@ -61,12 +61,6 @@ class Base extends Queries
             'array' => false,
         ]);
 
-        $attributes[] = new Document([
-            'key' => '$internalId',
-            'type' => Database::VAR_STRING,
-            'array' => false,
-        ]);
-
         $attributes[] = new Document([
             'key' => '$createdAt',
             'type' => Database::VAR_DATETIME,
@@ -84,8 +78,15 @@ class Base extends Queries
             new Offset(),
             new Cursor(),
             new Filter($attributes, APP_DATABASE_QUERY_MAX_VALUES),
-            new Order($attributes),
-        ];
+            new Order(
+                array_merge($attributes, [
+                    new Document([
+                        'key' => '$internalId',
+                        'type' => Database::VAR_STRING,
+                        'array' => false,
+                    ])
+                ])
+            )];
 
         parent::__construct($validators);
     }