Merge branch 'main' into joins8

Author: abnegate

src/Database/Database.php

@@ -68,6 +68,15 @@ class Database
     public const VAR_LINESTRING = 'linestring';
     public const VAR_POLYGON = 'polygon';
 
+    // All string types
+    public const STRING_TYPES = [
+        self::VAR_STRING,
+        self::VAR_VARCHAR,
+        self::VAR_TEXT,
+        self::VAR_MEDIUMTEXT,
+        self::VAR_LONGTEXT,
+    ];
+
     // All spatial types
     public const SPATIAL_TYPES = [
         self::VAR_POINT,
@@ -1687,7 +1696,7 @@ public function createCollection(string $id, array $attributes = [], array $inde
                         /**
                          * mysql does not save length in collection when length = attributes size
                          */
-                        if ($collectionAttribute->getAttribute('type') === Database::VAR_STRING) {
+                        if (in_array($collectionAttribute->getAttribute('type'), self::STRING_TYPES)) {
                             if (!empty($lengths[$i]) && $lengths[$i] === $collectionAttribute->getAttribute('size') && $this->adapter->getMaxIndexLength() > 0) {
                                 $lengths[$i] = null;
                             }
@@ -4482,7 +4491,7 @@ public function createIndex(string $collection, string $id, string $type, array
                     /**
                      * mysql does not save length in collection when length = attributes size
                      */
-                    if ($attributeType === self::VAR_STRING) {
+                    if (in_array($attributeType, self::STRING_TYPES)) {
                         if (!empty($lengths[$i]) && $lengths[$i] === $collectionAttribute->getAttribute('size') && $this->adapter->getMaxIndexLength() > 0) {
                             $lengths[$i] = null;
                         }

src/Database/Validator/Operator.php

@@ -402,7 +402,7 @@ private function validateOperatorForAttribute(
 
                 break;
             case DatabaseOperator::TYPE_STRING_CONCAT:
-                if ($type !== Database::VAR_STRING || $isArray) {
+                if (!in_array($type, Database::STRING_TYPES) || $isArray) {
                     $this->message = "Cannot apply {$method} operator to non-string field '{$operator->getAttribute()}'";
                     return false;
                 }
@@ -412,7 +412,7 @@ private function validateOperatorForAttribute(
                     return false;
                 }
 
-                if ($this->currentDocument !== null && $type === Database::VAR_STRING) {
+                if ($this->currentDocument !== null && in_array($type, Database::STRING_TYPES)) {
                     $currentString = $this->currentDocument->getAttribute($operator->getAttribute()) ?? '';
                     $concatValue = $values[0];
                     $predictedLength = strlen($currentString) + strlen($concatValue);
@@ -430,7 +430,7 @@ private function validateOperatorForAttribute(
                 break;
             case DatabaseOperator::TYPE_STRING_REPLACE:
                 // Replace only works on string types
-                if ($type !== Database::VAR_STRING) {
+                if (!in_array($type, Database::STRING_TYPES)) {
                     $this->message = "Cannot apply {$method} operator to non-string field '{$operator->getAttribute()}'";
                     return false;
                 }