Pull main

Author: fogelito

composer.lock

@@ -61,7 +61,7 @@ public function delete(string $name): bool
         $sql = "DROP DATABASE `{$name}`;";
 
         $sql = $this->trigger(Database::EVENT_DATABASE_DELETE, $sql);
-
+var_dump($sql);
         return $this->getPDO()
             ->prepare($sql)
             ->execute();

src/Database/Adapter/MariaDB.php

@@ -173,6 +173,7 @@ public function exists(string $database, ?string $collection = null): bool
             $stmt->execute();
             $document = $stmt->fetchAll();
             $stmt->closeCursor();
+            var_dump($document);
         } catch (PDOException $e) {
             $e = $this->processException($e);
 

src/Database/Adapter/SQL.php

@@ -6569,7 +6569,7 @@ public function getSchemaAttributes(string $collection): array
     /**
      * @param string $collectionId
      * @param string|null $documentId
-     * @param array<string> $selects
+     * @param array<Query> $selects
      * @return array{0: ?string, 1: ?string, 2: ?string}
      */
     public function getCacheKeys(string $collectionId, ?string $documentId = null, array $selects = []): array
@@ -6597,7 +6597,7 @@ public function getCacheKeys(string $collectionId, ?string $documentId = null, a
             $documentKey = $documentHashKey = "{$collectionKey}:{$documentId}";
 
             if (!empty($selects)) {
-                $documentHashKey = $documentKey . ':' . \md5(\implode($selects));
+                $documentHashKey = $documentKey . ':' . \md5(\serialize($selects));
             }
         }
 

src/Database/Database.php

@@ -81,6 +81,25 @@ class Query
         self::TYPE_OR,
     ];
 
+    protected const FILTER_TYPES = [
+        self::TYPE_EQUAL,
+        self::TYPE_NOT_EQUAL,
+        self::TYPE_LESSER,
+        self::TYPE_LESSER_EQUAL,
+        self::TYPE_GREATER,
+        self::TYPE_GREATER_EQUAL,
+        self::TYPE_CONTAINS,
+        self::TYPE_SEARCH,
+        self::TYPE_IS_NULL,
+        self::TYPE_IS_NOT_NULL,
+        self::TYPE_BETWEEN,
+        self::TYPE_STARTS_WITH,
+        self::TYPE_ENDS_WITH,
+        self::TYPE_AND,
+        self::TYPE_OR,
+        self::TYPE_RELATION_EQUAL,
+    ];
+
     protected string $method = '';
     protected string $collection = '';
     protected string $alias = '';
@@ -844,24 +863,7 @@ public function getCursorDocument(?Query $query): Document
      */
     public static function getFilterQueries(array $queries): array
     {
-        return self::getByType($queries, [
-            self::TYPE_EQUAL,
-            self::TYPE_NOT_EQUAL,
-            self::TYPE_LESSER,
-            self::TYPE_LESSER_EQUAL,
-            self::TYPE_GREATER,
-            self::TYPE_GREATER_EQUAL,
-            self::TYPE_CONTAINS,
-            self::TYPE_SEARCH,
-            self::TYPE_IS_NULL,
-            self::TYPE_IS_NOT_NULL,
-            self::TYPE_BETWEEN,
-            self::TYPE_STARTS_WITH,
-            self::TYPE_ENDS_WITH,
-            self::TYPE_AND,
-            self::TYPE_OR,
-            self::TYPE_RELATION_EQUAL,
-        ]);
+        return self::getByType($queries, self::FILTER_TYPES);
     }
 
     /**
@@ -879,7 +881,7 @@ public static function getFilterQueries(array $queries): array
      *     cursorDirection: string|null
      * }
      */
-    public static function groupByType(array $queries): array
+    public static function groupByType_deprecated(array $queries): array
     {
         $filters = [];
         $joins = [];
@@ -996,6 +998,11 @@ public function isJoin(): bool
         return false;
     }
 
+    public static function isFilter(string $method): bool
+    {
+        return in_array($method, self::FILTER_TYPES);
+    }
+
     public function onArray(): bool
     {
         return $this->onArray;

src/Database/Query.php

@@ -247,10 +247,6 @@ public function isValid($value, string $scope = ''): bool
                     case Query::TYPE_SELECT:
                         $this->validateSelect($query);
 
-                        break;
-                        //                    case Query::TYPE_SELECTION:
-                        //                        $this->validateSelections($query);
-
                         break;
                     case Query::TYPE_ORDER_ASC:
                     case Query::TYPE_ORDER_DESC:
@@ -404,6 +400,9 @@ protected function validateValues(string $attributeId, string $alias, array $val
 
         $attribute = $this->schema[$collection->getId()][$attributeId];
 
+        $array = $attribute['array'] ?? false;
+        $filters = $attribute['filters'] ?? [];
+
         foreach ($values as $value) {
 
             $validator = null;
@@ -466,8 +465,6 @@ protected function validateValues(string $attributeId, string $alias, array $val
             }
         }
 
-        $array = $attribute['array'] ?? false;
-
         if (
             ! $array &&
             $method === Query::TYPE_CONTAINS &&
@@ -482,6 +479,10 @@ protected function validateValues(string $attributeId, string $alias, array $val
         ) {
             throw new \Exception('Invalid query: Cannot query '.$method.' on attribute "'.$attributeId.'" because it is an array.');
         }
+
+        if (Query::isFilter($method) && \in_array('encrypt', $filters)) {
+            throw new \Exception('Cannot query encrypted attribute: ' . $attributeId);
+        }
     }
 
     /**

src/Database/Validator/Queries/V2.php

@@ -7,6 +7,7 @@
 use Tests\E2E\Adapter\Scopes\CollectionTests;
 use Tests\E2E\Adapter\Scopes\DocumentTests;
 use Tests\E2E\Adapter\Scopes\GeneralTests;
+use Tests\E2E\Adapter\Scopes\JoinsTests;
 use Tests\E2E\Adapter\Scopes\IndexTests;
 use Tests\E2E\Adapter\Scopes\PermissionTests;
 use Tests\E2E\Adapter\Scopes\RelationshipTests;
@@ -21,6 +22,7 @@ abstract class Base extends TestCase
     use DocumentTests;
     use AttributeTests;
     use IndexTests;
+    use JoinsTests;
     use PermissionTests;
     use RelationshipTests;
     use GeneralTests;

tests/e2e/Adapter/Base.php

@@ -219,7 +219,7 @@ public function testAttributeNamesWithDots(): void
         ));
 
         $document = static::getDatabase()->find('dots.parent', [
-            Query::select(['dots.name']),
+            Query::select('dots.name'),
         ]);
         $this->assertEmpty($document);
 
@@ -260,7 +260,7 @@ public function testAttributeNamesWithDots(): void
         ]));
 
         $documents = static::getDatabase()->find('dots.parent', [
-            Query::select(['*']),
+            Query::select('*'),
         ]);
 
         $this->assertEquals('Bill clinton', $documents[0]['dots.name']);
@@ -1598,6 +1598,9 @@ public function testCreateDatetime(): void
             'Tue Dec 31 2024',
         ];
 
+        /**
+         * ConvertQueries method will fix the dates
+         */
         foreach ($validDates as $date) {
             $docs = static::getDatabase()->find('datetime', [
                 Query::equal('$createdAt', [$date])