Sync 3.x

src/Database/Adapter.php

@@ -1079,6 +1079,13 @@ abstract public function getSupportForSpatialAttributes(): bool;
      */
     abstract public function getSupportForObject(): bool;
 
+    /**
+     * Are object (JSON) indexes supported?
+     *
+     * @return bool
+     */
+    abstract public function getSupportForObjectIndexes(): bool;
+
     /**
      * Does the adapter support null values in spatial indexes?
      *
@@ -1442,4 +1449,38 @@ public function enableAlterLocks(bool $enable): self
 
         return $this;
     }
+
+    /**
+     * Does the adapter support trigram index?
+     *
+     * @return bool
+     */
+    abstract public function getSupportForTrigramIndex(): bool;
+
+    /**
+     * Is PCRE regex supported?
+     * PCRE (Perl Compatible Regular Expressions) supports \b for word boundaries
+     *
+     * @return bool
+     */
+    abstract public function getSupportForPCRERegex(): bool;
+
+    /**
+     * Is POSIX regex supported?
+     * POSIX regex uses \y for word boundaries instead of \b
+     *
+     * @return bool
+     */
+    abstract public function getSupportForPOSIXRegex(): bool;
+
+    /**
+     * Is regex supported at all?
+     * Returns true if either PCRE or POSIX regex is supported
+     *
+     * @return bool
+     */
+    public function getSupportForRegex(): bool
+    {
+        return $this->getSupportForPCRERegex() || $this->getSupportForPOSIXRegex();
+    }
 }

src/Database/Adapter/MariaDB.php

@@ -2140,6 +2140,16 @@ public function getSupportForObject(): bool
         return false;
     }
 
+    /**
+     * Are object (JSON) indexes supported?
+     *
+     * @return bool
+     */
+    public function getSupportForObjectIndexes(): bool
+    {
+        return false;
+    }
+
     /**
      * Get Support for Null Values in Spatial Indexes
      *
@@ -2230,4 +2240,19 @@ public function getSupportForAlterLocks(): bool
     {
         return true;
     }
+
+    public function getSupportForTrigramIndex(): bool
+    {
+        return false;
+    }
+
+    public function getSupportForPCRERegex(): bool
+    {
+        return true;
+    }
+
+    public function getSupportForPOSIXRegex(): bool
+    {
+        return false;
+    }
 }

src/Database/Adapter/Mongo.php

@@ -5,6 +5,7 @@
 use Exception;
 use MongoDB\BSON\Regex;
 use MongoDB\BSON\UTCDateTime;
+use stdClass;
 use Utopia\Database\Adapter;
 use Utopia\Database\Change;
 use Utopia\Database\Database;
@@ -43,6 +44,8 @@ class Mongo extends Adapter
         '$not',
         '$nor',
         '$exists',
+        '$elemMatch',
+        '$exists'
     ];
 
     protected Client $client;
@@ -415,7 +418,6 @@ public function createCollection(string $name, array $attributes = [], array $in
         try {
             $options = $this->getTransactionOptions();
             $this->getClient()->createCollection($id, $options);
-
         } catch (MongoException $e) {
             $e = $this->processException($e);
             if ($e instanceof DuplicateException) {
@@ -1232,7 +1234,7 @@ public function castingAfter(Document $collection, Document $document): Document
                     case Database::VAR_INTEGER:
                         $node = (int)$node;
                         break;
-                    case Database::VAR_DATETIME :
+                    case Database::VAR_DATETIME:
                         if ($node instanceof UTCDateTime) {
                             // Handle UTCDateTime objects
                             $node = DateTime::format($node->toDateTime());
@@ -1258,6 +1260,12 @@ public function castingAfter(Document $collection, Document $document): Document
                             }
                         }
                         break;
+                    case Database::VAR_OBJECT:
+                        // Convert stdClass objects to arrays for object attributes
+                        if (is_object($node) && get_class($node) === stdClass::class) {
+                            $node = $this->convertStdClassToArray($node);
+                        }
+                        break;
                     default:
                         break;
                 }
@@ -1266,9 +1274,33 @@ public function castingAfter(Document $collection, Document $document): Document
             $document->setAttribute($key, ($array) ? $value : $value[0]);
         }
 
+        if (!$this->getSupportForAttributes()) {
+            foreach ($document->getArrayCopy() as $key => $value) {
+                // mongodb results out a stdclass for objects
+                if (is_object($value) && get_class($value) === stdClass::class) {
+                    $document->setAttribute($key, $this->convertStdClassToArray($value));
+                }
+            }
+        }
         return $document;
     }
 
+    private function convertStdClassToArray(mixed $value): mixed
+    {
+        if (is_object($value) && get_class($value) === stdClass::class) {
+            return array_map($this->convertStdClassToArray(...), get_object_vars($value));
+        }
+
+        if (is_array($value)) {
+            return array_map(
+                fn ($v) => $this->convertStdClassToArray($v),
+                $value
+            );
+        }
+
+        return $value;
+    }
+
     /**
      * Returns the document after casting to
      * @param Document $collection
@@ -1319,6 +1351,9 @@ public function castingBefore(Document $collection, Document $document): Documen
                             $node = new UTCDateTime(new \DateTime($node));
                         }
                         break;
+                    case Database::VAR_OBJECT:
+                        $node = json_decode($node);
+                        break;
                     default:
                         break;
                 }
@@ -1592,7 +1627,6 @@ public function upsertDocuments(Document $collection, string $attribute, array $
                 $operations,
                 options: $options
             );
-
         } catch (MongoException $e) {
             throw $this->processException($e);
         }
@@ -1977,7 +2011,7 @@ public function find(Document $collection, array $queries = [], ?int $limit = 25
             // Process first batch
             foreach ($results as $result) {
                 $record = $this->replaceChars('_', '$', (array)$result);
-                $found[] = new Document($record);
+                $found[] = new Document($this->convertStdClassToArray($record));
             }
 
             // Get cursor ID for subsequent batches
@@ -1999,7 +2033,6 @@ public function find(Document $collection, array $queries = [], ?int $limit = 25
 
                 $cursorId = (int)($moreResponse->cursor->id ?? 0);
             }
-
         } catch (MongoException $e) {
             throw $this->processException($e);
         } finally {
@@ -2335,6 +2368,15 @@ protected function buildFilters(array $queries, string $separator = '$and'): arr
         foreach ($queries as $query) {
             /* @var $query Query */
             if ($query->isNested()) {
+                if ($query->getMethod() === Query::TYPE_ELEM_MATCH) {
+                    $filters[$separator][] = [
+                        $query->getAttribute() => [
+                            '$elemMatch' => $this->buildFilters($query->getValues(), $separator)
+                        ]
+                    ];
+                    continue;
+                }
+
                 $operator = $this->getQueryOperator($query->getMethod());
 
                 $filters[$separator][] = $this->buildFilters($query->getValues(), $operator);
@@ -2385,6 +2427,10 @@ protected function buildFilter(Query $query): array
         };
 
         $filter = [];
+        if ($query->isObjectAttribute() && in_array($query->getMethod(), [Query::TYPE_EQUAL, Query::TYPE_CONTAINS, Query::TYPE_NOT_CONTAINS, Query::TYPE_NOT_EQUAL])) {
+            $this->handleObjectFilters($query, $filter);
+            return $filter;
+        }
 
         if ($operator == '$eq' && \is_array($value)) {
             $filter[$attribute]['$in'] = $value;
@@ -2448,6 +2494,88 @@ protected function buildFilter(Query $query): array
         return $filter;
     }
 
+    /**
+     * @param Query $query
+     * @param array<string, mixed> $filter
+     * @return void
+     */
+    private function handleObjectFilters(Query $query, array &$filter): void
+    {
+        $conditions = [];
+        $isNot = in_array($query->getMethod(), [Query::TYPE_NOT_CONTAINS,Query::TYPE_NOT_EQUAL]);
+        $values = $query->getValues();
+        foreach ($values as $attribute => $value) {
+            $flattendQuery = $this->flattenWithDotNotation(is_string($attribute) ? $attribute : '', $value);
+            $flattenedObjectKey = array_key_first($flattendQuery);
+            $queryValue = $flattendQuery[$flattenedObjectKey];
+            $flattenedObjectKey = $query->getAttribute() . '.' . array_key_first($flattendQuery);
+            switch ($query->getMethod()) {
+
+                case Query::TYPE_CONTAINS:
+                case Query::TYPE_NOT_CONTAINS: {
+                    $arrayValue = \is_array($queryValue) ? $queryValue : [$queryValue];
+                    $operator = $isNot ? '$nin' : '$in';
+                    $conditions[] = [ $flattenedObjectKey => [ $operator => $arrayValue] ];
+                    break;
+                }
+
+                case Query::TYPE_EQUAL:
+                case Query::TYPE_NOT_EQUAL: {
+                    if (\is_array($queryValue)) {
+                        $operator = $isNot ? '$nin' : '$in';
+                        $conditions[] = [ $flattenedObjectKey => [ $operator => $queryValue] ];
+                    } else {
+                        $operator = $isNot ? '$ne' : '$eq';
+                        $conditions[] = [ $flattenedObjectKey => [ $operator => $queryValue] ];
+                    }
+
+                    break;
+                }
+            }
+        }
+
+        $logicalOperator = $isNot ? '$and' : '$or';
+        if (count($conditions) && isset($filter[$logicalOperator])) {
+            $filter[$logicalOperator] = array_merge($filter[$logicalOperator], $conditions);
+        } else {
+            $filter[$logicalOperator] = $conditions;
+        }
+    }
+
+    /**
+     * Flatten a nested associative array into Mongo-style dot notation.
+     *
+     * @param string $key
+     * @param mixed $value
+     * @param string $prefix
+     * @return array<string, mixed>
+     */
+    private function flattenWithDotNotation(string $key, mixed $value, string $prefix = ''): array
+    {
+        /** @var array<string, mixed> $result */
+        $result = [];
+
+        $stack = [];
+
+        $initialKey = $prefix === '' ? $key : $prefix . '.' . $key;
+        $stack[] = [$initialKey, $value];
+        while (!empty($stack)) {
+            [$currentPath, $currentValue] = array_pop($stack);
+            if (is_array($currentValue) && !array_is_list($currentValue)) {
+                foreach ($currentValue as $nextKey => $nextValue) {
+                    $nextKey = (string)$nextKey;
+                    $nextPath = $currentPath === '' ? $nextKey : $currentPath . '.' . $nextKey;
+                    $stack[] = [$nextPath,  $nextValue];
+                }
+            } else {
+                // leaf node
+                $result[$currentPath] = $currentValue;
+            }
+        }
+
+        return $result;
+    }
+
     /**
      * Get Query Operator
      *
@@ -2476,11 +2604,13 @@ protected function getQueryOperator(string $operator): string
             Query::TYPE_STARTS_WITH,
             Query::TYPE_NOT_STARTS_WITH,
             Query::TYPE_ENDS_WITH,
-            Query::TYPE_NOT_ENDS_WITH => '$regex',
+            Query::TYPE_NOT_ENDS_WITH,
+            Query::TYPE_REGEX => '$regex',
             Query::TYPE_OR => '$or',
             Query::TYPE_AND => '$and',
             Query::TYPE_EXISTS,
             Query::TYPE_NOT_EXISTS => '$exists',
+            Query::TYPE_ELEM_MATCH => '$elemMatch',
             default => throw new DatabaseException('Unknown operator:' . $operator . '. Must be one of ' . Query::TYPE_EQUAL . ', ' . Query::TYPE_NOT_EQUAL . ', ' . Query::TYPE_LESSER . ', ' . Query::TYPE_LESSER_EQUAL . ', ' . Query::TYPE_GREATER . ', ' . Query::TYPE_GREATER_EQUAL . ', ' . Query::TYPE_IS_NULL . ', ' . Query::TYPE_IS_NOT_NULL . ', ' . Query::TYPE_BETWEEN . ', ' . Query::TYPE_NOT_BETWEEN . ', ' . Query::TYPE_STARTS_WITH . ', ' . Query::TYPE_NOT_STARTS_WITH . ', ' . Query::TYPE_ENDS_WITH . ', ' . Query::TYPE_NOT_ENDS_WITH . ', ' . Query::TYPE_CONTAINS . ', ' . Query::TYPE_NOT_CONTAINS . ', ' . Query::TYPE_SEARCH . ', ' . Query::TYPE_NOT_SEARCH . ', ' . Query::TYPE_SELECT),
         };
     }
@@ -2749,6 +2879,26 @@ public function getSupportForGetConnectionId(): bool
         return false;
     }
 
+    /**
+     * Is PCRE regex supported?
+     *
+     * @return bool
+     */
+    public function getSupportForPCRERegex(): bool
+    {
+        return true;
+    }
+
+    /**
+     * Is POSIX regex supported?
+     *
+     * @return bool
+     */
+    public function getSupportForPOSIXRegex(): bool
+    {
+        return false;
+    }
+
     /**
      * Is cache fallback supported?
      *
@@ -2800,6 +2950,16 @@ public function getSupportForBatchCreateAttributes(): bool
     }
 
     public function getSupportForObject(): bool
+    {
+        return true;
+    }
+
+    /**
+     * Are object (JSON) indexes supported?
+     *
+     * @return bool
+     */
+    public function getSupportForObjectIndexes(): bool
     {
         return false;
     }
@@ -3230,4 +3390,9 @@ public function getSupportForAlterLocks(): bool
     {
         return false;
     }
+
+    public function getSupportForTrigramIndex(): bool
+    {
+        return false;
+    }
 }