schemaless validators , tests fix

src/Database/Adapter/Mongo.php

@@ -14,6 +14,7 @@
 use Utopia\Database\Exception\Duplicate as DuplicateException;
 use Utopia\Database\Exception\Timeout as TimeoutException;
 use Utopia\Database\Exception\Transaction as TransactionException;
+use Utopia\Database\Exception\Type as TypeException;
 use Utopia\Database\Query;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Mongo\Client;
@@ -1655,15 +1656,19 @@ public function increaseDocumentAttribute(string $collection, string $id, string
         }
 
         $options = $this->getTransactionOptions();
-        $this->client->update(
-            $this->getNamespace() . '_' . $this->filter($collection),
-            $filters,
-            [
-                '$inc' => [$attribute => $value],
-                '$set' => ['_updatedAt' => $this->toMongoDatetime($updatedAt)],
-            ],
-            options: $options
-        );
+        try {
+            $this->client->update(
+                $this->getNamespace() . '_' . $this->filter($collection),
+                $filters,
+                [
+                    '$inc' => [$attribute => $value],
+                    '$set' => ['_updatedAt' => $this->toMongoDatetime($updatedAt)],
+                ],
+                options: $options
+            );
+        } catch (MongoException $e) {
+            throw $this->processException($e);
+        }
 
         return true;
     }
@@ -2323,7 +2328,18 @@ protected function buildFilter(Query $query): array
             $filter[$attribute]['$nin'] = $value;
         } elseif ($operator == '$in') {
             if ($query->getMethod() === Query::TYPE_CONTAINS && !$query->onArray()) {
-                $filter[$attribute]['$regex'] = $this->createSafeRegex($value, '.*%s.*');
+                // contains support array values
+                if (is_array($value)) {
+                    $filter['$or'] = array_map(function ($val) use ($attribute) {
+                        return [
+                            $attribute => [
+                                '$regex' => $this->createSafeRegex($val, '.*%s.*', 'i')
+                            ]
+                        ];
+                    }, $value);
+                } else {
+                    $filter[$attribute]['$regex'] = $this->createSafeRegex($value, '.*%s.*');
+                }
             } else {
                 $filter[$attribute]['$in'] = $query->getValues();
             }
@@ -2965,6 +2981,11 @@ protected function processException(Exception $e): \Exception
             return new TransactionException('No active transaction', $e->getCode(), $e);
         }
 
+        // Invalid operation(MongoDB error code 14)
+        if ($e->getCode() === 14) {
+            return new TypeException('Invalid operation', $e->getCode(), $e);
+        }
+
         return $e;
     }
 

src/Database/Database.php

@@ -3487,7 +3487,7 @@ public function getDocument(string $collection, string $id, array $queries = [],
         $this->checkQueriesType($queries);
 
         if ($this->validate) {
-            $validator = new DocumentValidator($attributes);
+            $validator = new DocumentValidator($attributes, $this->adapter->getSupportForAttributes());
             if (!$validator->isValid($queries)) {
                 throw new QueryException($validator->getDescription());
             }
@@ -5019,6 +5019,7 @@ public function updateDocuments(
                 $this->maxQueryValues,
                 $this->adapter->getMinDateTime(),
                 $this->adapter->getMaxDateTime(),
+                $this->adapter->getSupportForAttributes()
             );
 
             if (!$validator->isValid($queries)) {
@@ -5892,24 +5893,25 @@ public function increaseDocumentAttribute(
         }
 
         $collection = $this->silent(fn () => $this->getCollection($collection));
+        if ($this->adapter->getSupportForAttributes()) {
+            $attr = \array_filter($collection->getAttribute('attributes', []), function ($a) use ($attribute) {
+                return $a['$id'] === $attribute;
+            });
 
-        $attr = \array_filter($collection->getAttribute('attributes', []), function ($a) use ($attribute) {
-            return $a['$id'] === $attribute;
-        });
-
-        if (empty($attr)) {
-            throw new NotFoundException('Attribute not found');
-        }
+            if (empty($attr)) {
+                throw new NotFoundException('Attribute not found');
+            }
 
-        $whiteList = [
-            self::VAR_INTEGER,
-            self::VAR_FLOAT
-        ];
+            $whiteList = [
+                self::VAR_INTEGER,
+                self::VAR_FLOAT
+            ];
 
-        /** @var Document $attr */
-        $attr = \end($attr);
-        if (!\in_array($attr->getAttribute('type'), $whiteList) || $attr->getAttribute('array')) {
-            throw new TypeException('Attribute must be an integer or float and can not be an array.');
+            /** @var Document $attr */
+            $attr = \end($attr);
+            if (!\in_array($attr->getAttribute('type'), $whiteList) || $attr->getAttribute('array')) {
+                throw new TypeException('Attribute must be an integer or float and can not be an array.');
+            }
         }
 
         $document = $this->withTransaction(function () use ($collection, $id, $attribute, $value, $max) {
@@ -5990,25 +5992,27 @@ public function decreaseDocumentAttribute(
 
         $collection = $this->silent(fn () => $this->getCollection($collection));
 
-        $attr = \array_filter($collection->getAttribute('attributes', []), function ($a) use ($attribute) {
-            return $a['$id'] === $attribute;
-        });
+        if ($this->adapter->getSupportForAttributes()) {
+            $attr = \array_filter($collection->getAttribute('attributes', []), function ($a) use ($attribute) {
+                return $a['$id'] === $attribute;
+            });
 
-        if (empty($attr)) {
-            throw new NotFoundException('Attribute not found');
-        }
+            if (empty($attr)) {
+                throw new NotFoundException('Attribute not found');
+            }
 
-        $whiteList = [
-            self::VAR_INTEGER,
-            self::VAR_FLOAT
-        ];
+            $whiteList = [
+                self::VAR_INTEGER,
+                self::VAR_FLOAT
+            ];
 
-        /**
-         * @var Document $attr
-         */
-        $attr = \end($attr);
-        if (!\in_array($attr->getAttribute('type'), $whiteList) || $attr->getAttribute('array')) {
-            throw new TypeException('Attribute must be an integer or float and can not be an array.');
+            /**
+             * @var Document $attr
+             */
+            $attr = \end($attr);
+            if (!\in_array($attr->getAttribute('type'), $whiteList) || $attr->getAttribute('array')) {
+                throw new TypeException('Attribute must be an integer or float and can not be an array.');
+            }
         }
 
         $document = $this->withTransaction(function () use ($collection, $id, $attribute, $value, $min) {
@@ -6563,7 +6567,8 @@ public function deleteDocuments(
                 $this->adapter->getIdAttributeType(),
                 $this->maxQueryValues,
                 $this->adapter->getMinDateTime(),
-                $this->adapter->getMaxDateTime()
+                $this->adapter->getMaxDateTime(),
+                $this->adapter->getSupportForAttributes()
             );
 
             if (!$validator->isValid($queries)) {
@@ -6992,6 +6997,7 @@ public function count(string $collection, array $queries = [], ?int $max = null)
                 $this->maxQueryValues,
                 $this->adapter->getMinDateTime(),
                 $this->adapter->getMaxDateTime(),
+                $this->adapter->getSupportForAttributes()
             );
             if (!$validator->isValid($queries)) {
                 throw new QueryException($validator->getDescription());
@@ -7056,6 +7062,7 @@ public function sum(string $collection, string $attribute, array $queries = [],
                 $this->maxQueryValues,
                 $this->adapter->getMinDateTime(),
                 $this->adapter->getMaxDateTime(),
+                $this->adapter->getSupportForAttributes()
             );
             if (!$validator->isValid($queries)) {
                 throw new QueryException($validator->getDescription());
@@ -7460,10 +7467,11 @@ private function validateSelections(Document $collection, array $queries): array
                 $keys[] = $attribute['key'] ?? $attribute['$id'];
             }
         }
-
-        $invalid = \array_diff($selections, $keys);
-        if (!empty($invalid) && !\in_array('*', $invalid)) {
-            throw new QueryException('Cannot select attributes: ' . \implode(', ', $invalid));
+        if ($this->adapter->getSupportForAttributes()) {
+            $invalid = \array_diff($selections, $keys);
+            if (!empty($invalid) && !\in_array('*', $invalid)) {
+                throw new QueryException('Cannot select attributes: ' . \implode(', ', $invalid));
+            }
         }
 
         $selections = \array_merge($selections, $relationshipSelections);

src/Database/Validator/Index.php

@@ -232,6 +232,10 @@ public function checkIndexLength(Document $index): bool
             return true;
         }
 
+        if (!$this->supportForAttributes) {
+            return true;
+        }
+
         $total = 0;
         $lengths = $index->getAttribute('lengths', []);
         $attributes = $index->getAttribute('attributes', []);

src/Database/Validator/Queries/Document.php

@@ -11,9 +11,10 @@ class Document extends Queries
 {
     /**
      * @param array<mixed> $attributes
+     * @param bool $supportForAttributes
      * @throws Exception
      */
-    public function __construct(array $attributes)
+    public function __construct(array $attributes, $supportForAttributes = true)
     {
         $attributes[] = new \Utopia\Database\Document([
             '$id' => '$id',
@@ -35,7 +36,7 @@ public function __construct(array $attributes)
         ]);
 
         $validators = [
-            new Select($attributes),
+            new Select($attributes, $supportForAttributes),
         ];
 
         parent::__construct($validators);

src/Database/Validator/Query/Filter.php

@@ -113,6 +113,11 @@ protected function isValidAttributeAndValues(string $attribute, array $values, s
             return false;
         }
 
+        if (!$this->supportForAttributes && !isset($this->schema[$attribute])) {
+            return true;
+        }
+        $attributeSchema = $this->schema[$attribute];
+
         $attributeType = $attributeSchema['type'];
 
         // If the query method is spatial-only, the attribute must be a spatial type

tests/e2e/Adapter/Base.php

@@ -10,6 +10,7 @@
 use Tests\E2E\Adapter\Scopes\IndexTests;
 use Tests\E2E\Adapter\Scopes\PermissionTests;
 use Tests\E2E\Adapter\Scopes\RelationshipTests;
+use Tests\E2E\Adapter\Scopes\SchemalessTests;
 use Tests\E2E\Adapter\Scopes\SpatialTests;
 use Utopia\Database\Database;
 use Utopia\Database\Validator\Authorization;
@@ -25,6 +26,7 @@ abstract class Base extends TestCase
     use PermissionTests;
     use RelationshipTests;
     use SpatialTests;
+    use SchemalessTests;
     use GeneralTests;
 
     protected static string $namespace;

tests/e2e/Adapter/Scopes/AttributeTests.php

@@ -1523,7 +1523,7 @@ public function testArrayAttribute(): void
         ));
 
         if ($database->getAdapter()->getSupportForIndexArray()) {
-            if ($database->getAdapter()->getMaxIndexLength() > 0) {
+            if ($database->getAdapter()->getSupportForAttributes() && $database->getAdapter()->getMaxIndexLength() > 0) {
                 // If getMaxIndexLength() > 0 We clear length for array attributes
                 $database->createIndex($collection, 'indx1', Database::INDEX_KEY, ['long_size'], [], []);
                 $database->deleteIndex($collection, 'indx1');