update: check against wildcards; remove: unnecessary filtering.

Author: ItzNotABug

src/Database/Database.php

@@ -3078,7 +3078,12 @@ public function getDocument(string $collection, string $id, array $queries = [],
         $document = $this->decode($collection, $document, $selections);
         $this->map = [];
 
-        if ($this->resolveRelationships && (empty($selects) || !empty($nestedSelections))) {
+        $hasWildcards = !empty(array_filter(
+            $selects,
+            fn ($select) => in_array('*', $select->getValues(), true)
+        ));
+
+        if ($this->resolveRelationships && (empty($selects) || $hasWildcards || !empty($nestedSelections))) {
             $document = $this->silent(fn () => $this->populateDocumentRelationships($collection, $document, $nestedSelections));
         }
 
@@ -3097,20 +3102,6 @@ public function getDocument(string $collection, string $id, array $queries = [],
             }
         }
 
-        // Remove internal attributes if not queried for select query
-        // $id, $permissions and $collection are the default selected attributes for (MariaDB, MySQL, SQLite, Postgres)
-        // All internal attributes are default selected attributes for (MongoDB)
-        foreach ($queries as $query) {
-            if ($query->getMethod() === Query::TYPE_SELECT) {
-                $values = $query->getValues();
-                foreach ($this->getInternalAttributes() as $internalAttribute) {
-                    if (!\in_array($internalAttribute['$id'], $values)) {
-                        $document->removeAttribute($internalAttribute['$id']);
-                    }
-                }
-            }
-        }
-
         $this->trigger(self::EVENT_DOCUMENT_READ, $document);
 
         return $document;
@@ -5791,9 +5782,13 @@ public function find(string $collection, array $queries = [], string $forPermiss
         );
 
         $results = $skipAuth ? Authorization::skip($getResults) : $getResults();
+        $hasWildcards = !empty(array_filter(
+            $selects,
+            fn ($select) => in_array('*', $select->getValues(), true)
+        ));
 
         foreach ($results as &$node) {
-            if ($this->resolveRelationships && (empty($selects) || !empty($nestedSelections))) {
+            if ($this->resolveRelationships && (empty($selects) || $hasWildcards || !empty($nestedSelections))) {
                 $node = $this->silent(fn () => $this->populateDocumentRelationships($collection, $node, $nestedSelections));
             }
             $node = $this->casting($collection, $node);
@@ -5806,20 +5801,6 @@ public function find(string $collection, array $queries = [], string $forPermiss
 
         unset($query);
 
-        // Remove internal attributes which are not queried
-        foreach ($queries as $query) {
-            if ($query->getMethod() === Query::TYPE_SELECT) {
-                $values = $query->getValues();
-                foreach ($results as $result) {
-                    foreach ($this->getInternalAttributes() as $internalAttribute) {
-                        if (!\in_array($internalAttribute['$id'], $values)) {
-                            $result->removeAttribute($internalAttribute['$id']);
-                        }
-                    }
-                }
-            }
-        }
-
         $this->trigger(self::EVENT_DOCUMENT_FIND, $results);
 
         return $results;