Merge branch '4.1.x' into 5.0.x

* 4.1.x:
  MySQL 8.4 Platform (#6385)

docs/en/reference/platforms.rst

@@ -35,6 +35,7 @@ MySQL
 
 -  ``MySQLPlatform`` for version 5.7 (5.7.9 GA) and above.
 -  ``MySQL80Platform`` for version 8.0 (8.0 GA) and above.
+-  ``MySQL84Platform`` for version 8.4 (8.4 GA) and above.
 
 MariaDB
 ^^^^^

src/Driver/AbstractMySQLDriver.php

@@ -11,6 +11,7 @@
 use Doctrine\DBAL\Platforms\Exception\InvalidPlatformVersion;
 use Doctrine\DBAL\Platforms\MariaDB1060Platform;
 use Doctrine\DBAL\Platforms\MariaDBPlatform;
+use Doctrine\DBAL\Platforms\MySQL84Platform;
 use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\ServerVersionProvider;
 
@@ -40,6 +41,10 @@ public function getDatabasePlatform(ServerVersionProvider $versionProvider): Abs
             return new MariaDBPlatform();
         }
 
+        if (version_compare($version, '8.4.0', '>=')) {
+            return new MySQL84Platform();
+        }
+
         return new MySQLPlatform();
     }
 

src/Platforms/Keywords/MySQL84Keywords.php

@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\DBAL\Platforms\Keywords;
+
+use function array_merge;
+
+/**
+ * MySQL 8.4 reserved keywords list.
+ */
+class MySQL84Keywords extends MySQLKeywords
+{
+    /**
+     * {@inheritDoc}
+     *
+     * @link https://dev.mysql.com/doc/refman/8.4/en/keywords.html#keywords-new-in-current-series
+     */
+    protected function getKeywords(): array
+    {
+        $keywords = parent::getKeywords();
+
+        $keywords = array_merge($keywords, [
+            'AUTO',
+            'BERNOULLI',
+            'GTIDS',
+            'LOG',
+            'MANUAL',
+            'PARALLEL',
+            'PARSE_TREE',
+            'QUALIFY',
+            'S3',
+            'TABLESAMPLE',
+        ]);
+
+        return $keywords;
+    }
+}

src/Platforms/MySQL84Platform.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\DBAL\Platforms;
+
+use Doctrine\DBAL\Platforms\Keywords\KeywordList;
+use Doctrine\DBAL\Platforms\Keywords\MySQL84Keywords;
+
+/**
+ * Provides the behavior, features and SQL dialect of the MySQL 8.4 (8.4 GA) database platform.
+ */
+class MySQL84Platform extends MySQLPlatform
+{
+    protected function createReservedKeywordsList(): KeywordList
+    {
+        return new MySQL84Keywords();
+    }
+}

tests/Driver/VersionAwarePlatformDriverTest.php

@@ -9,6 +9,7 @@
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Platforms\MariaDB1060Platform;
 use Doctrine\DBAL\Platforms\MariaDBPlatform;
+use Doctrine\DBAL\Platforms\MySQL84Platform;
 use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
 use PHPUnit\Framework\Attributes\DataProvider;
@@ -33,6 +34,7 @@ public static function mySQLVersionProvider(): array
     {
         return [
             ['8.0.11', MySQLPlatform::class],
+            ['8.4.0', MySQL84Platform::class],
             ['5.5.40-MariaDB-1~wheezy', MariaDBPlatform::class],
             ['5.5.5-MariaDB-10.2.8+maria~xenial-log', MariaDBPlatform::class],
             ['10.2.8-MariaDB-10.2.8+maria~xenial-log', MariaDBPlatform::class],