Merge pull request #585 from utopia-php/feat-select-internals

Re-force internal attribute selection

Author: abnegate

src/Database/Adapter/MariaDB.php

@@ -128,14 +128,7 @@ public function createCollection(string $name, array $attributes = [], array $in
                 $indexLength = $index->getAttribute('lengths')[$nested] ?? '';
                 $indexLength = (empty($indexLength)) ? '' : '(' . (int)$indexLength . ')';
                 $indexOrder = $index->getAttribute('orders')[$nested] ?? '';
-
-                $indexAttribute = match ($attribute) {
-                    '$id' => '_uid',
-                    '$createdAt' => '_createdAt',
-                    '$updatedAt' => '_updatedAt',
-                    default => $attribute
-                };
-
+                $indexAttribute = $this->getInternalKeyForAttribute($attribute);
                 $indexAttribute = $this->filter($indexAttribute);
 
                 if ($indexType === Database::INDEX_FULLTEXT) {

src/Database/Adapter/SQL.php

@@ -1690,30 +1690,18 @@ protected function getAttributeProjection(array $selections, string $prefix = ''
             return '*';
         }
 
-        $selections = \array_diff($selections, ['$id', '$permissions', '$collection']);
+        $internalKeys = [
+            '$id',
+            '$internalId',
+            '$permissions',
+            '$createdAt',
+            '$updatedAt',
+        ];
 
-        $selections[] = $this->getInternalKeyForAttribute('$id');
-        $selections[] = $this->getInternalKeyForAttribute('$permissions');
+        $selections = \array_diff($selections, [...$internalKeys, '$collection']);
 
-        if (\in_array('$internalId', $selections)) {
-            $selections[] = $this->getInternalKeyForAttribute('$internalId');
-            $selections = \array_diff($selections, ['$internalId']);
-        }
-        if (\in_array('$createdAt', $selections)) {
-            $selections[] = $this->getInternalKeyForAttribute('$createdAt');
-            $selections = \array_diff($selections, ['$createdAt']);
-        }
-        if (\in_array('$updatedAt', $selections)) {
-            $selections[] = $this->getInternalKeyForAttribute('$updatedAt');
-            $selections = \array_diff($selections, ['$updatedAt']);
-        }
-        if (\in_array('$collection', $selections)) {
-            $selections[] = $this->getInternalKeyForAttribute('$collection');
-            $selections = \array_diff($selections, ['$collection']);
-        }
-        if (\in_array('$tenant', $selections)) {
-            $selections[] = $this->getInternalKeyForAttribute('$tenant');
-            $selections = \array_diff($selections, ['$tenant']);
+        foreach ($internalKeys as $internalKey) {
+            $selections[] = $this->getInternalKeyForAttribute($internalKey);
         }
 
         if (!empty($prefix)) {
@@ -1726,7 +1714,7 @@ protected function getAttributeProjection(array $selections, string $prefix = ''
             }
         }
 
-        return \implode(', ', $selections);
+        return \implode(',', $selections);
     }
 
     protected function getInternalKeyForAttribute(string $attribute): string

src/Database/Database.php

@@ -3330,20 +3330,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;
@@ -6049,6 +6035,7 @@ public function find(string $collection, array $queries = [], string $forPermiss
             if ($this->resolveRelationships && (empty($selects) || !empty($nestedSelections))) {
                 $node = $this->silent(fn () => $this->populateDocumentRelationships($collection, $node, $nestedSelections));
             }
+
             $node = $this->casting($collection, $node);
             $node = $this->decode($collection, $node, $selections);
 
@@ -6059,20 +6046,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;
@@ -6385,20 +6358,12 @@ public function decode(Document $collection, Document $document, array $selectio
                 }
             }
 
-            if (empty($selections) || \in_array($key, $selections) || \in_array('*', $selections)) {
-                if (
-                    empty($selections)
-                    || \in_array($key, $selections)
-                    || \in_array('*', $selections)
-                    || \in_array($key, ['$createdAt', '$updatedAt'])
-                ) {
-                    // Prevent null values being set for createdAt and updatedAt
-                    if (\in_array($key, ['$createdAt', '$updatedAt']) && $value[0] === null) {
-                        continue;
-                    } else {
-                        $document->setAttribute($key, ($array) ? $value : $value[0]);
-                    }
-                }
+            if (
+                empty($selections)
+                || \in_array($key, $selections)
+                || \in_array('*', $selections)
+            ) {
+                $document->setAttribute($key, ($array) ? $value : $value[0]);
             }
         }
 
@@ -6580,7 +6545,7 @@ private function validateSelections(Document $collection, array $queries): array
         $selections[] = '$updatedAt';
         $selections[] = '$permissions';
 
-        return $selections;
+        return \array_values(\array_unique($selections));
     }
 
     /**