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: diff --git a/config/database.php b/config/database.php index 952298daf528..ff5880bd2e8e 100644 --- a/config/database.php +++ b/config/database.php @@ -48,7 +48,27 @@ 'password' => env('DB_PASSWORD', ''), 'unix_socket' => env('DB_SOCKET', ''), 'charset' => 'utf8mb4', - 'collation' => 'utf8mb4_unicode_ci', + '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'), + '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_uca1400_ai_ci', 'prefix' => '', 'prefix_indexes' => true, 'strict' => true,