Merge remote-tracking branch 'upstream/3.x' into mongo-object

Author: ArnabChatterjee20k

src/Database/Adapter.php

@@ -1449,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

@@ -2240,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

@@ -2601,7 +2601,8 @@ 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,
@@ -2875,6 +2876,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?
      *
@@ -3366,4 +3387,9 @@ public function getSupportForAlterLocks(): bool
     {
         return false;
     }
+
+    public function getSupportForTrigramIndex(): bool
+    {
+        return false;
+    }
 }

src/Database/Adapter/MySQL.php

@@ -31,6 +31,9 @@ public function setTimeout(int $milliseconds, string $event = Database::EVENT_AL
 
         $this->timeout = $milliseconds;
 
+        $pdo = $this->getPDO();
+        $pdo->exec("SET GLOBAL regexp_time_limit = {$milliseconds}");
+
         $this->before($event, 'timeout', function ($sql) use ($milliseconds) {
             return \preg_replace(
                 pattern: '/SELECT/',
@@ -152,6 +155,11 @@ protected function processException(PDOException $e): \Exception
             return new TimeoutException('Query timed out', $e->getCode(), $e);
         }
 
+        // Regex timeout
+        if ($e->getCode() === 'HY000' && isset($e->errorInfo[1]) && $e->errorInfo[1] === 3699) {
+            return new TimeoutException('Query timed out', $e->getCode(), $e);
+        }
+
         // Functional index dependency
         if ($e->getCode() === 'HY000' && isset($e->errorInfo[1]) && $e->errorInfo[1] === 3837) {
             return new DependencyException('Attribute cannot be deleted because it is used in an index', $e->getCode(), $e);

src/Database/Adapter/Pool.php

@@ -365,6 +365,21 @@ public function getSupportForFulltextWildcardIndex(): bool
         return $this->delegate(__FUNCTION__, \func_get_args());
     }
 
+    public function getSupportForPCRERegex(): bool
+    {
+        return $this->delegate(__FUNCTION__, \func_get_args());
+    }
+
+    public function getSupportForPOSIXRegex(): bool
+    {
+        return $this->delegate(__FUNCTION__, \func_get_args());
+    }
+
+    public function getSupportForTrigramIndex(): bool
+    {
+        return $this->delegate(__FUNCTION__, \func_get_args());
+    }
+
     public function getSupportForCasting(): bool
     {
         return $this->delegate(__FUNCTION__, \func_get_args());

src/Database/Adapter/Postgres.php

@@ -154,6 +154,7 @@ public function create(string $name): bool
         // Enable extensions
         $this->getPDO()->prepare('CREATE EXTENSION IF NOT EXISTS postgis')->execute();
         $this->getPDO()->prepare('CREATE EXTENSION IF NOT EXISTS vector')->execute();
+        $this->getPDO()->prepare('CREATE EXTENSION IF NOT EXISTS pg_trgm')->execute();
 
         $collation = "
             CREATE COLLATION IF NOT EXISTS utf8_ci_ai (
@@ -899,9 +900,10 @@ public function createIndex(string $collection, string $id, string $type, array
             Database::INDEX_SPATIAL,
             Database::INDEX_HNSW_EUCLIDEAN,
             Database::INDEX_HNSW_COSINE,
-            Database::INDEX_HNSW_DOT => 'INDEX',
+            Database::INDEX_HNSW_DOT,
+            Database::INDEX_OBJECT,
+            Database::INDEX_TRIGRAM => 'INDEX',
             Database::INDEX_UNIQUE => 'UNIQUE INDEX',
-            Database::INDEX_OBJECT => 'INDEX',
             default => throw new DatabaseException('Unknown index type: ' . $type . '. Must be one of ' . Database::INDEX_KEY . ', ' . Database::INDEX_UNIQUE . ', ' . Database::INDEX_FULLTEXT . ', ' . Database::INDEX_SPATIAL . ', ' . Database::INDEX_OBJECT . ', ' . Database::INDEX_HNSW_EUCLIDEAN . ', ' . Database::INDEX_HNSW_COSINE . ', ' . Database::INDEX_HNSW_DOT),
         };
 
@@ -922,6 +924,11 @@ public function createIndex(string $collection, string $id, string $type, array
             Database::INDEX_HNSW_COSINE => " USING HNSW ({$attributes} vector_cosine_ops)",
             Database::INDEX_HNSW_DOT => " USING HNSW ({$attributes} vector_ip_ops)",
             Database::INDEX_OBJECT => " USING GIN ({$attributes})",
+            Database::INDEX_TRIGRAM =>
+                " USING GIN (" . implode(', ', array_map(
+                    fn ($attr) => "$attr gin_trgm_ops",
+                    array_map(fn ($attr) => trim($attr), explode(',', $attributes))
+                )) . ")",
             default => " ({$attributes})",
         };
 
@@ -2112,6 +2119,21 @@ public function getSupportForVectors(): bool
         return true;
     }
 
+    public function getSupportForPCRERegex(): bool
+    {
+        return false;
+    }
+
+    public function getSupportForPOSIXRegex(): bool
+    {
+        return true;
+    }
+
+    public function getSupportForTrigramIndex(): bool
+    {
+        return true;
+    }
+
     /**
      * @return string
      */
@@ -2120,6 +2142,14 @@ public function getLikeOperator(): string
         return 'ILIKE';
     }
 
+    /**
+     * @return string
+     */
+    public function getRegexOperator(): string
+    {
+        return '~';
+    }
+
     protected function processException(PDOException $e): \Exception
     {
         // Timeout

src/Database/Adapter/SQL.php

@@ -1794,6 +1794,8 @@ protected function getSQLOperator(string $method): string
             case Query::TYPE_NOT_ENDS_WITH:
             case Query::TYPE_NOT_CONTAINS:
                 return $this->getLikeOperator();
+            case Query::TYPE_REGEX:
+                return $this->getRegexOperator();
             case Query::TYPE_VECTOR_DOT:
             case Query::TYPE_VECTOR_COSINE:
             case Query::TYPE_VECTOR_EUCLIDEAN:
@@ -2287,6 +2289,14 @@ public function getLikeOperator(): string
         return 'LIKE';
     }
 
+    /**
+     * @return string
+     */
+    public function getRegexOperator(): string
+    {
+        return 'REGEXP';
+    }
+
     public function getInternalIndexesKeys(): array
     {
         return [];

src/Database/Adapter/SQLite.php

@@ -1886,4 +1886,26 @@ public function getSupportForAlterLocks(): bool
     {
         return false;
     }
+
+    /**
+     * Is PCRE regex supported?
+     * SQLite does not have native REGEXP support - it requires compile-time option or user-defined function
+     *
+     * @return bool
+     */
+    public function getSupportForPCRERegex(): bool
+    {
+        return false;
+    }
+
+    /**
+     * Is POSIX regex supported?
+     * SQLite does not have native REGEXP support - it requires compile-time option or user-defined function
+     *
+     * @return bool
+     */
+    public function getSupportForPOSIXRegex(): bool
+    {
+        return false;
+    }
 }

src/Database/Database.php

@@ -85,6 +85,7 @@ class Database
     public const INDEX_HNSW_EUCLIDEAN = 'hnsw_euclidean';
     public const INDEX_HNSW_COSINE = 'hnsw_cosine';
     public const INDEX_HNSW_DOT = 'hnsw_dot';
+    public const INDEX_TRIGRAM = 'trigram';
 
     // Max limits
     public const MAX_INT = 2147483647;
@@ -1642,6 +1643,11 @@ public function createCollection(string $id, array $attributes = [], array $inde
                 $this->adapter->getSupportForMultipleFulltextIndexes(),
                 $this->adapter->getSupportForIdenticalIndexes(),
                 $this->adapter->getSupportForIndexObject(),
+                $this->adapter->getSupportForTrigramIndex(),
+                $this->adapter->getSupportForSpatialAttributes(),
+                $this->adapter->getSupportForIndex(),
+                $this->adapter->getSupportForUniqueIndex(),
+                $this->adapter->getSupportForFulltextIndex(),
             );
             foreach ($indexes as $index) {
                 if (!$validator->isValid($index)) {
@@ -2786,7 +2792,12 @@ public function updateAttribute(string $collection, string $id, ?string $type =
                         $this->adapter->getSupportForAttributes(),
                         $this->adapter->getSupportForMultipleFulltextIndexes(),
                         $this->adapter->getSupportForIdenticalIndexes(),
-                        $this->adapter->getSupportForIndexObject()
+                        $this->adapter->getSupportForIndexObject(),
+                        $this->adapter->getSupportForTrigramIndex(),
+                        $this->adapter->getSupportForSpatialAttributes(),
+                        $this->adapter->getSupportForIndex(),
+                        $this->adapter->getSupportForUniqueIndex(),
+                        $this->adapter->getSupportForFulltextIndex(),
                     );
 
                     foreach ($indexes as $index) {
@@ -3661,7 +3672,7 @@ public function createIndex(string $collection, string $id, string $type, array
                 break;
 
             case self::INDEX_OBJECT:
-                if (!$this->adapter->getSupportForIndexObject()) {
+                if (!$this->adapter->getSupportForObject()) {
                     throw new DatabaseException('Object indexes are not supported');
                 }
                 break;
@@ -3722,7 +3733,12 @@ public function createIndex(string $collection, string $id, string $type, array
                 $this->adapter->getSupportForAttributes(),
                 $this->adapter->getSupportForMultipleFulltextIndexes(),
                 $this->adapter->getSupportForIdenticalIndexes(),
-                $this->adapter->getSupportForIndexObject()
+                $this->adapter->getSupportForIndexObject(),
+                $this->adapter->getSupportForTrigramIndex(),
+                $this->adapter->getSupportForSpatialAttributes(),
+                $this->adapter->getSupportForIndex(),
+                $this->adapter->getSupportForUniqueIndex(),
+                $this->adapter->getSupportForFulltextIndex(),
             );
             if (!$validator->isValid($index)) {
                 throw new IndexException($validator->getDescription());

src/Database/Query.php

@@ -26,6 +26,7 @@ class Query
     public const TYPE_NOT_STARTS_WITH = 'notStartsWith';
     public const TYPE_ENDS_WITH = 'endsWith';
     public const TYPE_NOT_ENDS_WITH = 'notEndsWith';
+    public const TYPE_REGEX = 'regex';
     public const TYPE_EXISTS = 'exists';
     public const TYPE_NOT_EXISTS = 'notExists';
 
@@ -114,6 +115,7 @@ class Query
         self::TYPE_AND,
         self::TYPE_OR,
         self::TYPE_ELEM_MATCH,
+        self::TYPE_REGEX
     ];
 
     public const VECTOR_TYPES = [
@@ -1189,6 +1191,18 @@ public static function vectorEuclidean(string $attribute, array $vector): self
         return new self(self::TYPE_VECTOR_EUCLIDEAN, $attribute, [$vector]);
     }
 
+    /**
+     * Helper method to create Query with regex method
+     *
+     * @param string $attribute
+     * @param string $pattern
+     * @return Query
+     */
+    public static function regex(string $attribute, string $pattern): self
+    {
+        return new self(self::TYPE_REGEX, $attribute, [$pattern]);
+    }
+
     /**
      * Helper method to create Query with exists method
      *