From 1b7f6b95f180e01699283007f8a2507da7307867 Mon Sep 17 00:00:00 2001 From: Julius Kiekbusch Date: Tue, 19 Sep 2023 16:42:44 +0200 Subject: [PATCH 1/3] Add MariaDB to databases config and Change MySQL 8 collation --- config/database.php | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/config/database.php b/config/database.php index 952298daf528..609334f2baf3 100644 --- a/config/database.php +++ b/config/database.php @@ -39,6 +39,26 @@ ], 'mysql' => [ + 'driver' => 'mysql', + 'url' => env('DB_URL'), + 'host' => env('DB_HOST', '127.0.0.1'), + 'port' => env('DB_PORT', '3306'), + 'database' => env('DB_DATABASE', 'forge'), + 'username' => env('DB_USERNAME', 'forge'), + 'password' => env('DB_PASSWORD', ''), + 'unix_socket' => env('DB_SOCKET', ''), + 'charset' => 'utf8mb4', + 'collation' => 'utf8mb4_0900_ai_ci', + 'prefix' => '', + 'prefix_indexes' => true, + 'strict' => true, + 'engine' => null, + 'options' => extension_loaded('pdo_mysql') ? array_filter([ + PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'), + ]) : [], + ], + + 'mariadb' => [ 'driver' => 'mysql', 'url' => env('DB_URL'), 'host' => env('DB_HOST', '127.0.0.1'), From 15afe536a6ec4913f22e6cbf1fb7eda451fc9dfa Mon Sep 17 00:00:00 2001 From: Julius Kiekbusch Date: Tue, 19 Sep 2023 16:48:50 +0200 Subject: [PATCH 2/3] Update tests workflow for MariaDB --- .github/workflows/databases.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/databases.yml b/.github/workflows/databases.yml index 37ffbe3c2cae..2d31da69b8f9 100644 --- a/.github/workflows/databases.yml +++ b/.github/workflows/databases.yml @@ -140,7 +140,7 @@ jobs: - name: Execute tests run: vendor/bin/phpunit tests/Integration/Database env: - DB_CONNECTION: mysql + DB_CONNECTION: mariadb DB_USERNAME: root pgsql: From 2f594c61fe8ad837d8e2e59b4682dcc7bad4654e Mon Sep 17 00:00:00 2001 From: Julius Kiekbusch Date: Wed, 8 Nov 2023 09:29:06 +0100 Subject: [PATCH 3/3] Update default collation for mariadb --- config/database.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/database.php b/config/database.php index 609334f2baf3..ff5880bd2e8e 100644 --- a/config/database.php +++ b/config/database.php @@ -68,7 +68,7 @@ 'password' => env('DB_PASSWORD', ''), 'unix_socket' => env('DB_SOCKET', ''), 'charset' => 'utf8mb4', - 'collation' => 'utf8mb4_unicode_ci', + 'collation' => 'utf8mb4_uca1400_ai_ci', 'prefix' => '', 'prefix_indexes' => true, 'strict' => true,