From c1782f6f58998cf5a6f3d5fd270ed697f98999b1 Mon Sep 17 00:00:00 2001
From: Jake Barnby <jakeb994@gmail.com>
Date: Fri, 19 Sep 2025 15:28:41 +1200
Subject: [PATCH] Don't remove required attributes

---
 .../Databases/Collections/Documents/XList.php | 37 -------------------
 .../Databases/Legacy/DatabasesBase.php        | 12 +++---
 .../Databases/TablesDB/DatabasesBase.php      | 12 +++---
 3 files changed, 12 insertions(+), 49 deletions(-)

diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/XList.php
index 9c8405cf18..546cbeddd4 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/XList.php
@@ -158,43 +158,6 @@ class XList extends Action
             ->addMetric(METRIC_DATABASES_OPERATIONS_READS, max($operations, 1))
             ->addMetric(str_replace('{databaseInternalId}', $database->getSequence(), METRIC_DATABASE_ID_OPERATIONS_READS), $operations);
 
-        // Check if the SELECT query includes the removable attributes
-        $hasWildcard = false;
-        $hasSelectQueries = !empty($selectQueries);
-        $requestedAttributes = [];
-
-        if ($hasSelectQueries) {
-            foreach ($selectQueries as $query) {
-                if ($query->getMethod() !== Query::TYPE_SELECT) {
-                    continue;
-                }
-
-                $values = $query->getValues();
-                if (\in_array('*', $values, true)) {
-                    $hasWildcard = true;
-                    break;
-                }
-
-                // Check which removable attributes are explicitly requested
-                foreach ($this->removableAttributes['*'] as $attribute) {
-                    if (\in_array($attribute, $values, true)) {
-                        $requestedAttributes[$attribute] = true;
-                    }
-                }
-            }
-
-            if (!$hasWildcard) {
-                foreach ($documents as $document) {
-                    // Remove attributes that are not explicitly requested
-                    foreach ($this->removableAttributes['*'] as $attribute) {
-                        if (!isset($requestedAttributes[$attribute])) {
-                            $document->removeAttribute($attribute);
-                        }
-                    }
-                }
-            }
-        }
-
         $response->dynamic(new Document([
             'total' => $total,
             // rows or documents
diff --git a/tests/e2e/Services/Databases/Legacy/DatabasesBase.php b/tests/e2e/Services/Databases/Legacy/DatabasesBase.php
index 8b4f78d3ea..a432bc0acd 100644
--- a/tests/e2e/Services/Databases/Legacy/DatabasesBase.php
+++ b/tests/e2e/Services/Databases/Legacy/DatabasesBase.php
@@ -5270,8 +5270,8 @@ trait DatabasesBase
         $this->assertEquals(2, count($response['body']['documents']));
         $this->assertEquals(null, $response['body']['documents'][0]['fullName']);
         $this->assertArrayNotHasKey("libraries", $response['body']['documents'][0]);
-        $this->assertArrayNotHasKey('$databaseId', $response['body']['documents'][0]);
-        $this->assertArrayNotHasKey('$collectionId', $response['body']['documents'][0]);
+        $this->assertArrayHasKey('$databaseId', $response['body']['documents'][0]);
+        $this->assertArrayHasKey('$collectionId', $response['body']['documents'][0]);
     }
 
     /**
@@ -5291,8 +5291,8 @@ trait DatabasesBase
 
         $this->assertEquals(200, $response['headers']['status-code']);
         $this->assertArrayNotHasKey('libraries', $response['body']['documents'][0]);
-        $this->assertArrayNotHasKey('$databaseId', $response['body']['documents'][0]);
-        $this->assertArrayNotHasKey('$collectionId', $response['body']['documents'][0]);
+        $this->assertArrayHasKey('$databaseId', $response['body']['documents'][0]);
+        $this->assertArrayHasKey('$collectionId', $response['body']['documents'][0]);
 
         $response = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/collections/' . $data['personCollection'] . '/documents', array_merge([
             'content-type' => 'application/json',
@@ -5305,8 +5305,8 @@ trait DatabasesBase
         $document = $response['body']['documents'][0];
         $this->assertEquals(200, $response['headers']['status-code']);
         $this->assertArrayHasKey('libraries', $document);
-        $this->assertArrayNotHasKey('$databaseId', $document);
-        $this->assertArrayNotHasKey('$collectionId', $document);
+        $this->assertArrayHasKey('$databaseId', $document);
+        $this->assertArrayHasKey('$collectionId', $document);
 
         $response = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/collections/' . $data['personCollection'] . '/documents/' . $document['$id'], array_merge([
             'content-type' => 'application/json',
diff --git a/tests/e2e/Services/Databases/TablesDB/DatabasesBase.php b/tests/e2e/Services/Databases/TablesDB/DatabasesBase.php
index 387a7ec3f0..336193f5d9 100644
--- a/tests/e2e/Services/Databases/TablesDB/DatabasesBase.php
+++ b/tests/e2e/Services/Databases/TablesDB/DatabasesBase.php
@@ -5197,8 +5197,8 @@ trait DatabasesBase
         $this->assertEquals(2, count($response['body']['rows']));
         $this->assertEquals(null, $response['body']['rows'][0]['fullName']);
         $this->assertArrayNotHasKey("libraries", $response['body']['rows'][0]);
-        $this->assertArrayNotHasKey('$databaseId', $response['body']['rows'][0]);
-        $this->assertArrayNotHasKey('$tableId', $response['body']['rows'][0]);
+        $this->assertArrayHasKey('$databaseId', $response['body']['rows'][0]);
+        $this->assertArrayHasKey('$tableId', $response['body']['rows'][0]);
     }
 
     /**
@@ -5218,8 +5218,8 @@ trait DatabasesBase
 
         $this->assertEquals(200, $response['headers']['status-code']);
         $this->assertArrayNotHasKey('libraries', $response['body']['rows'][0]);
-        $this->assertArrayNotHasKey('$databaseId', $response['body']['rows'][0]);
-        $this->assertArrayNotHasKey('$tableId', $response['body']['rows'][0]);
+        $this->assertArrayHasKey('$databaseId', $response['body']['rows'][0]);
+        $this->assertArrayHasKey('$tableId', $response['body']['rows'][0]);
 
         $response = $this->client->call(Client::METHOD_GET, '/tablesdb/' . $data['databaseId'] . '/tables/' . $data['personCollection'] . '/rows', array_merge([
             'content-type' => 'application/json',
@@ -5232,8 +5232,8 @@ trait DatabasesBase
         $row = $response['body']['rows'][0];
         $this->assertEquals(200, $response['headers']['status-code']);
         $this->assertArrayHasKey('libraries', $row);
-        $this->assertArrayNotHasKey('$databaseId', $row);
-        $this->assertArrayNotHasKey('$tableId', $row);
+        $this->assertArrayHasKey('$databaseId', $row);
+        $this->assertArrayHasKey('$tableId', $row);
 
         $response = $this->client->call(Client::METHOD_GET, '/tablesdb/' . $data['databaseId'] . '/tables/' . $data['personCollection'] . '/rows/' . $row['$id'], array_merge([
             'content-type' => 'application/json',