Merge remote-tracking branch 'upstream/feat-mongodb' into feat-documentsdb

Author: ArnabChatterjee20k

src/Database/Adapter.php

@@ -875,6 +875,13 @@ abstract public function getLimitForIndexes(): int;
      */
     abstract public function getMaxIndexLength(): int;
 
+    /**
+     * Get the maximum UID length for this adapter
+     *
+     * @return int
+     */
+    abstract public function getMaxUIDLength(): int;
+
     /**
      * Get the minimum supported DateTime value
      *

src/Database/Adapter/Mongo.php

@@ -3019,6 +3019,14 @@ public function getMaxIndexLength(): int
         return 1024;
     }
 
+    /**
+     * @return int
+     */
+    public function getMaxUIDLength(): int
+    {
+        return 255;
+    }
+
     public function getConnectionId(): string
     {
         return '0';

src/Database/Adapter/Pool.php

@@ -310,6 +310,11 @@ public function getMaxIndexLength(): int
         return $this->delegate(__FUNCTION__, \func_get_args());
     }
 
+    public function getMaxUIDLength(): int
+    {
+        return $this->delegate(__FUNCTION__, \func_get_args());
+    }
+
     public function getMinDateTime(): \DateTime
     {
         return $this->delegate(__FUNCTION__, \func_get_args());

src/Database/Adapter/SQL.php

@@ -1850,6 +1850,14 @@ public function getMaxIndexLength(): int
         return $this->sharedTables ? 767 : 768;
     }
 
+    /**
+     * @return int
+     */
+    public function getMaxUIDLength(): int
+    {
+        return 36;
+    }
+
     /**
      * @param Query $query
      * @param array<string, mixed> $binds

src/Database/Database.php

@@ -3882,7 +3882,7 @@ private function populateOneToManyRelationshipsBatch(
             return [];
         }
 
-        // For batch relationship population, we need to fetch documents with all fields
+        // For batch relationship population, we need to fetch documents with all attributes
         // to enable proper grouping by back-reference, then apply selects afterward
         $selectQueries = [];
         $otherQueries = [];
@@ -4154,30 +4154,30 @@ private function applySelectFiltersToDocuments(array $documents, array $selectQu
             return;
         }
 
-        // Collect all fields to keep from select queries
-        $fieldsToKeep = [];
+        // Collect all attributes to keep from select queries
+        $attributesToKeep = [];
         foreach ($selectQueries as $selectQuery) {
             foreach ($selectQuery->getValues() as $value) {
-                $fieldsToKeep[$value] = true;
+                $attributesToKeep[$value] = true;
             }
         }
 
         // Early return if wildcard selector present
-        if (isset($fieldsToKeep['*'])) {
+        if (isset($attributesToKeep['*'])) {
             return;
         }
 
         // Always preserve internal attributes (use hashmap for O(1) lookup)
         $internalKeys = \array_map(fn ($attr) => $attr['$id'], $this->getInternalAttributes());
         foreach ($internalKeys as $key) {
-            $fieldsToKeep[$key] = true;
+            $attributesToKeep[$key] = true;
         }
 
         foreach ($documents as $doc) {
             $allKeys = \array_keys($doc->getArrayCopy());
             foreach ($allKeys as $attrKey) {
                 // Keep if: explicitly selected OR is internal attribute ($ prefix)
-                if (!isset($fieldsToKeep[$attrKey]) && !\str_starts_with($attrKey, '$')) {
+                if (!isset($attributesToKeep[$attrKey]) && !\str_starts_with($attrKey, '$')) {
                     $doc->removeAttribute($attrKey);
                 }
             }
@@ -5051,7 +5051,12 @@ public function updateDocuments(
         $updatedAt = $updates->getUpdatedAt();
         $updates['$updatedAt'] = ($updatedAt === null || !$this->preserveDates) ? DateTime::now() : $updatedAt;
 
-        $updates = $this->encode($collection, $updates);
+        $updates = $this->encode(
+            $collection,
+            $updates,
+            applyDefaults: false
+        );
+
         // Check new document structure
         $validator = new PartialStructure(
             $collection,
@@ -7119,11 +7124,12 @@ public static function addFilter(string $name, callable $encode, callable $decod
      *
      * @param Document $collection
      * @param Document $document
+     * @param bool $applyDefaults Whether to apply default values to null attributes
      *
      * @return Document
      * @throws DatabaseException
      */
-    public function encode(Document $collection, Document $document): Document
+    public function encode(Document $collection, Document $document, bool $applyDefaults = true): Document
     {
         $attributes = $collection->getAttribute('attributes', []);
         $internalDateAttributes = ['$createdAt', '$updatedAt'];
@@ -7156,6 +7162,10 @@ public function encode(Document $collection, Document $document): Document
             // False positive "Call to function is_null() with mixed will always evaluate to false"
             // @phpstan-ignore-next-line
             if (is_null($value) && !is_null($default)) {
+                // Skip applying defaults during updates to avoid resetting unspecified attributes
+                if (!$applyDefaults) {
+                    continue;
+                }
                 $value = ($array) ? $default : [$default];
             } else {
                 $value = ($array) ? $value : [$value];
@@ -7711,7 +7721,7 @@ private function processRelationshipQueries(
 
                 $nestingPath = \implode('.', $nesting);
 
-                // If nestingPath is empty, it means we want all fields (*) for this relationship
+                // If nestingPath is empty, it means we want all attributes (*) for this relationship
                 if (empty($nestingPath)) {
                     $nestedSelections[$selectedKey][] = Query::select(['*']);
                 } else {
@@ -7787,7 +7797,7 @@ private function processNestedRelationshipPath(string $startCollection, array $q
                 }
                 $pathGroups[$pathKey][] = [
                     'method' => $query->getMethod(),
-                    'field' => \end($parts), // The actual field to query
+                    'attribute' => \end($parts), // The actual attribute to query
                     'values' => $query->getValues(),
                 ];
             }
@@ -7833,7 +7843,7 @@ private function processNestedRelationshipPath(string $startCollection, array $q
             // Now walk backwards from the deepest collection to the starting collection
             $leafQueries = [];
             foreach ($queryGroup as $q) {
-                $leafQueries[] = new Query($q['method'], $q['field'], $q['values']);
+                $leafQueries[] = new Query($q['method'], $q['attribute'], $q['values']);
             }
 
             // Query the deepest collection
@@ -7935,7 +7945,7 @@ private function processNestedRelationshipPath(string $startCollection, array $q
      * The method works by:
      * 1. Parsing dot-path queries (e.g., "project.employee.company.name")
      * 2. Extracting the first relationship (e.g., "project")
-     * 3. If the nested field still contains dots, using iterative processing
+     * 3. If the nested attribute still contains dots, using iterative processing
      * 4. Finding matching documents in the related collection
      * 5. Converting to filters on the parent collection
      *
@@ -7985,7 +7995,7 @@ private function convertRelationshipQueries(
             // Parse the relationship path
             $parts = \explode('.', $attribute);
             $relationshipKey = \array_shift($parts);
-            $nestedField = \implode('.', $parts);
+            $nestedAttribute = \implode('.', $parts);
             $relationship = $relationshipsByKey[$relationshipKey] ?? null;
 
             if (!$relationship) {
@@ -8003,7 +8013,7 @@ private function convertRelationshipQueries(
 
             $groupedQueries[$relationshipKey]['queries'][] = [
                 'method' => $method,
-                'field' => $nestedField,
+                'attribute' => $nestedAttribute,
                 'values' => $query->getValues()
             ];
 
@@ -8022,7 +8032,7 @@ private function convertRelationshipQueries(
             foreach ($group['queries'] as $queryData) {
                 $relatedQueries[] = new Query(
                     $queryData['method'],
-                    $queryData['field'],
+                    $queryData['attribute'],
                     $queryData['values']
                 );
             }
@@ -8126,7 +8136,7 @@ private function convertRelationshipQueries(
                         return null;
                     }
                 } else {
-                    // For other types, filter by the relationship field
+                    // For other types, filter by the relationship attribute
                     if (!empty($matchingIds)) {
                         $additionalQueries[] = Query::equal($relationshipKey, $matchingIds);
                     } else {

src/Database/Validator/Index.php

@@ -326,6 +326,10 @@ public function isValid($value): bool
             return false;
         }
 
+        if (!$this->checkMultipleFulltextIndex($value)) {
+            return false;
+        }
+
         if (!$this->checkFulltextIndexNonString($value)) {
             return false;
         }
@@ -346,10 +350,6 @@ public function isValid($value): bool
             return false;
         }
 
-        if (!$this->checkMultipleFulltextIndex($value)) {
-            return false;
-        }
-
         if (!$this->checkIdenticalIndex($value)) {
             return false;
         }

src/Database/Validator/Key.php

@@ -11,12 +11,12 @@ class Key extends Validator
     /**
      * Maximum length for Key validation
      */
-    protected const KEY_MAX_LENGTH = 255;
+    protected int $maxLength;
 
     /**
      * @var string
      */
-    protected string $message = 'Parameter must contain at most ' . self::KEY_MAX_LENGTH . ' chars. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can\'t start with a special char';
+    protected string $message;
 
     /**
      * Get Description.
@@ -33,9 +33,11 @@ public function getDescription(): string
     /**
      * Expression constructor
      */
-    public function __construct(bool $allowInternal = false)
+    public function __construct(bool $allowInternal = false, int $maxLength = 255)
     {
         $this->allowInternal = $allowInternal;
+        $this->maxLength = $maxLength;
+        $this->message = 'Parameter must contain at most ' . $this->maxLength . ' chars. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can\'t start with a special char';
     }
 
     /**
@@ -81,8 +83,8 @@ public function isValid($value): bool
         if (\preg_match('/[^A-Za-z0-9\_\-\.]/', $value)) {
             return false;
         }
-        // At most KEY_MAX_LENGTH chars
-        if (\mb_strlen($value) > self::KEY_MAX_LENGTH) {
+        // At most maxLength chars
+        if (\mb_strlen($value) > $this->maxLength) {
             return false;
         }
 

src/Database/Validator/Label.php

@@ -4,7 +4,11 @@
 
 class Label extends Key
 {
-    protected string $message = 'Value must be a valid string between 1 and ' . self::KEY_MAX_LENGTH . ' chars containing only alphanumeric chars';
+    public function __construct(bool $allowInternal = false, int $maxLength = 255)
+    {
+        parent::__construct($allowInternal, $maxLength);
+        $this->message = 'Value must be a valid string between 1 and ' . $this->maxLength . ' chars containing only alphanumeric chars';
+    }
 
     /**
      * Is valid.

src/Database/Validator/Query/Order.php

@@ -38,6 +38,11 @@ protected function isValidAttribute(string $attribute): bool
             // For relationships, just validate the top level.
             // Will validate each nested level during the recursive calls.
             $attribute = \explode('.', $attribute)[0];
+
+            if (isset($this->schema[$attribute])) {
+                $this->message = 'Cannot order by nested attribute: ' . $attribute;
+                return false;
+            }
         }
 
         // Search for attribute in schema

src/Database/Validator/UID.php

@@ -4,6 +4,14 @@
 
 class UID extends Key
 {
+    /**
+     * Expression constructor
+     */
+    public function __construct(int $maxLength = 255)
+    {
+        parent::__construct(false, $maxLength);
+    }
+
     /**
      * Get Description.
      *
@@ -13,6 +21,6 @@ class UID extends Key
      */
     public function getDescription(): string
     {
-        return 'UID must contain at most ' . self::KEY_MAX_LENGTH . ' chars. Valid chars are a-z, A-Z, 0-9, and underscore. Can\'t start with a leading underscore';
+        return 'UID must contain at most ' . $this->maxLength . ' chars. Valid chars are a-z, A-Z, 0-9, and underscore. Can\'t start with a leading underscore';
     }
 }