Skip to content

Commit

Permalink
Merge branch '4.1.x' into 5.0.x
Browse files Browse the repository at this point in the history
* 4.1.x:
  Fix documentation of supported MariaDB releases (#6407)
  • Loading branch information
derrabus committed May 16, 2024
2 parents 8c43133 + f293a9b commit aee1de3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
9 changes: 4 additions & 5 deletions docs/en/reference/platforms.rst
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,14 @@ can be found as follows:
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.
- ``MySQLPlatform`` for version 8.0 and above.
- ``MySQL84Platform`` for version 8.4 and above.

MariaDB
^^^^^

- ``MariaDBPlatform`` for version 10.4 (10.4.3 GA) and above.
- ``MariaDB1052Platform`` for version 10.5 (10.5.2 GA) and above.
- ``MariaDBPlatform`` for version 10.5.2 and above.
- ``MariaDb1060Platform`` for version 10.6 and above.

Oracle
^^^^^^
Expand Down
2 changes: 1 addition & 1 deletion src/Platforms/MariaDB1060Platform.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
use Doctrine\DBAL\SQL\Builder\SelectSQLBuilder;

/**
* Provides the behavior, features and SQL dialect of the MariaDB 10.6 (10.6.0 GA) database platform.
* Provides the behavior, features and SQL dialect of the MariaDB 10.6 database platform.
*/
class MariaDB1060Platform extends MariaDBPlatform
{
Expand Down
2 changes: 1 addition & 1 deletion src/Platforms/MySQL84Platform.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
use Doctrine\DBAL\Platforms\Keywords\MySQL84Keywords;

/**
* Provides the behavior, features and SQL dialect of the MySQL 8.4 (8.4 GA) database platform.
* Provides the behavior, features and SQL dialect of the MySQL 8.4 database platform.
*/
class MySQL84Platform extends MySQLPlatform
{
Expand Down

0 comments on commit aee1de3

Please sign in to comment.