Added support functional indexes for MySQL and Postgres

src/Driver/AbstractMySQLDriver.php

@@ -12,6 +12,7 @@
 use Doctrine\DBAL\Platforms\MariaDB1052Platform;
 use Doctrine\DBAL\Platforms\MariaDB1060Platform;
 use Doctrine\DBAL\Platforms\MariaDBPlatform;
+use Doctrine\DBAL\Platforms\MySQL8013Platform;
 use Doctrine\DBAL\Platforms\MySQL80Platform;
 use Doctrine\DBAL\Platforms\MySQL84Platform;
 use Doctrine\DBAL\Platforms\MySQLPlatform;
@@ -47,7 +48,7 @@ public function getDatabasePlatform(ServerVersionProvider $versionProvider): Abs
 
             Deprecation::trigger(
                 'doctrine/dbal',
-                'https://github.com/doctrine/dbal/pull/6343',
+                'https://github.com/doctrine/dbal/pull/6414',
                 'Support for MariaDB < 10.5.2 is deprecated and will be removed in DBAL 5',
             );
 
@@ -58,13 +59,23 @@ public function getDatabasePlatform(ServerVersionProvider $versionProvider): Abs
             return new MySQL84Platform();
         }
 
+        if (version_compare($version, '8.0.13', '>=')) {
+            return new MySQL8013Platform();
+        }
+
         if (version_compare($version, '8.0.0', '>=')) {
+            Deprecation::trigger(
+                'doctrine/dbal',
+                'https://github.com/doctrine/dbal/pull/6414',
+                'Support for MySQL <= 8.0.13 is deprecated and will be removed in DBAL 5',
+            );
+
             return new MySQL80Platform();
         }
 
         Deprecation::trigger(
             'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pull/6343',
+            'https://github.com/doctrine/dbal/pull/6414',
             'Support for MySQL < 8 is deprecated and will be removed in DBAL 5',
         );
 

src/Platforms/AbstractMySQLPlatform.php

@@ -43,6 +43,11 @@ abstract class AbstractMySQLPlatform extends AbstractPlatform
     final public const LENGTH_LIMIT_BLOB       = 65535;
     final public const LENGTH_LIMIT_MEDIUMBLOB = 16777215;
 
+    public function getColumnOrExpressionNameForIndexFetching(): string
+    {
+        return 'COLUMN_NAME';
+    }
+
     protected function doModifyLimitQuery(string $query, ?int $limit, int $offset): string
     {
         if ($limit !== null) {

src/Platforms/AbstractPlatform.php

@@ -42,6 +42,7 @@
 use function assert;
 use function count;
 use function explode;
+use function get_debug_type;
 use function implode;
 use function in_array;
 use function is_array;
@@ -794,6 +795,16 @@ private function buildCreateTableSQL(Table $table, bool $createForeignKeys): arr
         $options['primary']           = [];
 
         foreach ($table->getIndexes() as $index) {
+            if ($index->isFunctional() && ! $this->supportsFunctionalIndex()) {
+                throw new InvalidArgumentException(sprintf(
+                    'Index "%s" on table "%s" contains a functional part, ' .
+                    'but platform "%s" does not support functional indexes.',
+                    $index->getName(),
+                    $table->getName(),
+                    get_debug_type($this),
+                ));
+            }
+
             if (! $index->isPrimary()) {
                 $options['indexes'][$index->getQuotedName($this)] = $index;
 
@@ -1081,6 +1092,16 @@ public function getCreateIndexSQL(Index $index, string $table): string
             ));
         }
 
+        if ($index->isFunctional() && ! $this->supportsFunctionalIndex()) {
+            throw new InvalidArgumentException(sprintf(
+                'Index "%s" on table "%s" contains a functional part, ' .
+                'but platform "%s" does not support functional indexes.',
+                $name,
+                $table,
+                get_debug_type($this),
+            ));
+        }
+
         if ($index->isPrimary()) {
             return $this->getCreatePrimaryKeySQL($index, $table);
         }
@@ -1533,6 +1554,15 @@ public function getIndexDeclarationSQL(Index $index): string
             throw new InvalidArgumentException('Incomplete definition. "columns" required.');
         }
 
+        if ($index->isFunctional() && ! $this->supportsFunctionalIndex()) {
+            throw new InvalidArgumentException(sprintf(
+                'Index "%s" contains a functional part, ' .
+                'but platform "%s" does not support functional indexes.',
+                $index->getName(),
+                get_debug_type($this),
+            ));
+        }
+
         return $this->getCreateIndexSQLFlags($index) . 'INDEX ' . $index->getQuotedName($this)
             . ' (' . implode(', ', $index->getQuotedColumns($this)) . ')' . $this->getPartialIndexSQL($index);
     }
@@ -1973,6 +2003,14 @@ public function supportsColumnCollation(): bool
         return false;
     }
 
+    /**
+     * A flag that indicates whether the platform supports functional indexes.
+     */
+    public function supportsFunctionalIndex(): bool
+    {
+        return true;
+    }
+
     /**
      * Gets the format string, as accepted by the date() function, that describes
      * the format of a stored datetime value of this platform.

src/Platforms/MariaDBPlatform.php

@@ -162,4 +162,9 @@ protected function createReservedKeywordsList(): KeywordList
     {
         return new MariaDBKeywords();
     }
+
+    public function supportsFunctionalIndex(): bool
+    {
+        return false;
+    }
 }

src/Platforms/MySQL8013Platform.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\DBAL\Platforms;
+
+/**
+ * Provides features of the MySQL since 8.0.13 database platform.
+ *
+ * Note: Should not be used with versions prior to 8.0.13.
+ */
+class MySQL8013Platform extends MySQLPlatform
+{
+    public function getColumnOrExpressionNameForIndexFetching(): string
+    {
+        return <<<'SQL'
+            COALESCE(
+                COLUMN_NAME,
+                (CASE WHEN SUBSTR(EXPRESSION, 1, 1) != '('
+                    THEN CONCAT('(', REPLACE(EXPRESSION, '\'', ''''), ')')
+                    ELSE REPLACE(EXPRESSION, '\'', '''')
+                END)
+            )
+        SQL;
+    }
+}

src/Platforms/MySQL80Platform.php

@@ -24,4 +24,9 @@ public function createSelectSQLBuilder(): SelectSQLBuilder
     {
         return AbstractPlatform::createSelectSQLBuilder();
     }
+
+    public function supportsFunctionalIndex(): bool
+    {
+        return false;
+    }
 }

src/Platforms/MySQL84Platform.php

@@ -10,7 +10,7 @@
 /**
  * Provides the behavior, features and SQL dialect of the MySQL 8.4 database platform.
  */
-class MySQL84Platform extends MySQL80Platform
+class MySQL84Platform extends MySQL8013Platform
 {
     protected function createReservedKeywordsList(): KeywordList
     {

src/Platforms/PostgreSQLPlatform.php

@@ -781,4 +781,9 @@ public function createSchemaManager(Connection $connection): PostgreSQLSchemaMan
     {
         return new PostgreSQLSchemaManager($connection, $this);
     }
+
+    public function supportsFunctionalIndex(): bool
+    {
+        return true;
+    }
 }

src/Platforms/SQLitePlatform.php

@@ -31,6 +31,7 @@
 use function array_values;
 use function count;
 use function explode;
+use function get_debug_type;
 use function implode;
 use function sprintf;
 use function str_replace;
@@ -561,6 +562,16 @@ public function getCreateIndexSQL(Index $index, string $table): string
             ));
         }
 
+        if ($index->isFunctional() && ! $this->supportsFunctionalIndex()) {
+            throw new InvalidArgumentException(sprintf(
+                'Index "%s" on table "%s" contains a functional part, ' .
+                'but platform "%s" does not support functional indexes.',
+                $name,
+                $table,
+                get_debug_type($this),
+            ));
+        }
+
         if ($index->isPrimary()) {
             return $this->getCreatePrimaryKeySQL($index, $table);
         }

src/Schema/Index.php

@@ -12,6 +12,8 @@
 use function array_search;
 use function array_shift;
 use function count;
+use function str_ends_with;
+use function str_starts_with;
 use function strtolower;
 
 class Index extends AbstractAsset
@@ -27,6 +29,8 @@ class Index extends AbstractAsset
 
     protected bool $_isPrimary = false;
 
+    protected bool $_isFunctional = false;
+
     /**
      * Platform specific flags for indexes.
      *
@@ -58,6 +62,12 @@ public function __construct(
 
         foreach ($columns as $column) {
             $this->_addColumn($column);
+
+            if ($this->_isFunctional === true) {
+                continue;
+            }
+
+            $this->_isFunctional = self::isColumnNameAnExpression($column);
         }
 
         foreach ($flags as $flag) {
@@ -101,10 +111,14 @@ public function getQuotedColumns(AbstractPlatform $platform): array
         foreach ($this->_columns as $column) {
             $length = array_shift($subParts);
 
-            $quotedColumn = $column->getQuotedName($platform);
+            if ($this->isFunctional()) {
+                $quotedColumn = $column->getName();
+            } else {
+                $quotedColumn = $column->getQuotedName($platform);
 
-            if ($length !== null) {
-                $quotedColumn .= '(' . $length . ')';
+                if ($length !== null) {
+                    $quotedColumn .= '(' . $length . ')';
+                }
             }
 
             $columns[] = $quotedColumn;
@@ -137,6 +151,11 @@ public function isPrimary(): bool
         return $this->_isPrimary;
     }
 
+    public function isFunctional(): bool
+    {
+        return $this->_isFunctional;
+    }
+
     public function hasColumnAtPosition(string $name, int $pos = 0): bool
     {
         $name         = $this->trimQuotes(strtolower($name));
@@ -283,6 +302,11 @@ public function getOptions(): array
         return $this->options;
     }
 
+    public static function isColumnNameAnExpression(string $columnName): bool
+    {
+        return str_starts_with($columnName, '(') && str_ends_with($columnName, ')');
+    }
+
     /**
      * Return whether the two indexes have the same partial index
      */

src/Schema/MySQLSchemaManager.php

@@ -390,10 +390,12 @@ protected function selectIndexColumns(string $databaseName, ?string $tableName =
             $sql .= ' TABLE_NAME,';
         }
 
-        $sql .= <<<'SQL'
+        $columnName = $this->getColumnNameForIndexFetch();
+
+        $sql .= <<<SQL
         NON_UNIQUE  AS Non_Unique,
         INDEX_NAME  AS Key_name,
-        COLUMN_NAME AS Column_Name,
+        {$columnName},
         SUB_PART    AS Sub_Part,
         INDEX_TYPE  AS Index_Type
 FROM information_schema.STATISTICS
@@ -539,4 +541,17 @@ private function getDefaultTableOptions(): DefaultTableOptions
 
         return $this->defaultTableOptions;
     }
+
+    /**
+     * EXPRESSION
+     *
+     * MySQL 8.0.13 and higher supports functional key parts (see Functional Key Parts), which affects both
+     * the COLUMN_NAME and EXPRESSION columns:
+     * For a nonfunctional key part, COLUMN_NAME indicates the column indexed by the key part and EXPRESSION is NULL.
+     * For a functional key part, COLUMN_NAME column is NULL and EXPRESSION indicates the expression for the key part.
+     */
+    private function getColumnNameForIndexFetch(): string
+    {
+        return $this->platform->getColumnOrExpressionNameForIndexFetching() . ' as Column_Name';
+    }
 }