Skip to content

Commit

Permalink
Merge branch '3.8.x' into 4.0.x
Browse files Browse the repository at this point in the history
* 3.8.x:
  Fix documentation of supported MariaDB releases (#6407)
  • Loading branch information
derrabus committed May 16, 2024
2 parents b36ede0 + 9cf787c commit 0b77350
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 9 deletions.
9 changes: 5 additions & 4 deletions docs/en/reference/platforms.rst
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,15 @@ 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.
- ``MySQLPlatform`` for version 5.7.9 and above.
- ``MySQL80Platform`` for version 8.0 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.4.3 and above.
- ``MariaDb1052Platform`` for version 10.5.2 and above.
- ``MariaDb1060Platform`` for version 10.6 and above.

Oracle
^^^^^^
Expand Down
4 changes: 1 addition & 3 deletions src/Platforms/MariaDB1052Platform.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@
use Doctrine\DBAL\Schema\TableDiff;

/**
* Provides the behavior, features and SQL dialect of the MariaDB 10.5 (10.5.2 GA) database platform.
*
* Note: Should not be used with versions prior to 10.5.2.
* Provides the behavior, features and SQL dialect of the MariaDB 10.5 database platform.
*/
class MariaDB1052Platform extends MariaDBPlatform
{
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 MariaDB1052Platform
{
Expand Down
2 changes: 1 addition & 1 deletion src/Platforms/MySQL80Platform.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
use Doctrine\DBAL\SQL\Builder\SelectSQLBuilder;

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

0 comments on commit 0b77350

Please sign in to comment.