Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 3.8.x into 4.0.x #6473

Merged
merged 5 commits into from
Jul 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -349,10 +349,11 @@ jobs:
strategy:
matrix:
php-version:
- "8.1"
- "8.3"
mysql-version:
- "5.7"
- "8.0"
- "9.0"
extension:
- "mysqli"
- "pdo_mysql"
Expand All @@ -363,18 +364,19 @@ jobs:
php-version: "8.1"
mysql-version: "8.0"
extension: "mysqli"
- php-version: "8.2"
- php-version: "8.1"
mysql-version: "8.0"
extension: "mysqli"
- php-version: "8.3"
- php-version: "8.1"
mysql-version: "8.0"
extension: "pdo_mysql"
- php-version: "8.1"
# Workaround for https://bugs.mysql.com/114876
- php-version: "8.3"
mysql-version: "8.4"
extension: "mysqli"
custom-entrypoint: >-
--entrypoint sh mysql:8.4 -c "exec docker-entrypoint.sh mysqld --mysql-native-password=ON"
- php-version: "8.1"
- php-version: "8.3"
mysql-version: "8.4"
extension: "pdo_mysql"
custom-entrypoint: >-
Expand Down
3 changes: 2 additions & 1 deletion src/Driver/API/MySQL/ExceptionConverter.php
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ public function convert(Exception $exception, ?Query $query): DriverException
2002,
2005,
2054 => new ConnectionException($exception, $query),
2006 => new ConnectionLost($exception, $query),
2006,
4031 => new ConnectionLost($exception, $query),
1048,
1121,
1138,
Expand Down
3 changes: 2 additions & 1 deletion src/Schema/AbstractAsset.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
* The abstract asset allows to reset the name of all assets without publishing this to the public userland.
*
* This encapsulation hack is necessary to keep a consistent state of the database schema. Say we have a list of tables
* array($tableName => Table($tableName)); if you want to rename the table, you have to make sure
* array($tableName => Table($tableName)); if you want to rename the table, you have to make sure this does not get
* recreated during schema migration.
*/
abstract class AbstractAsset
{
Expand Down
2 changes: 2 additions & 0 deletions tests/Driver/VersionAwarePlatformDriverTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ public static function mySQLVersionProvider(): array
return [
['5.7.0', MySQLPlatform::class],
['8.0.11', MySQL80Platform::class],
['8.4.1', MySQL80Platform::class],
['9.0.0', MySQL80Platform::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],
Expand Down