From 5fcb5fdaa51117cdae20203f454265db0027b387 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 7 Sep 2019 20:44:02 +0200 Subject: [PATCH] Fix for #2231 --- config/database.php | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/config/database.php b/config/database.php index 92002884ba..3445e76455 100644 --- a/config/database.php +++ b/config/database.php @@ -29,11 +29,13 @@ $password = ''; $database = ''; if (!(false === $databaseUrl)) { + $options = parse_url($databaseUrl); - $host = $options['host']; - $username = $options['user']; - $password = $options['pass']; - $database = substr($options['path'], 1); + $host = $options['host'] ?? 'firefly_iii_db'; + $username = $options['user'] ?? 'firefly'; + $port = $options['port'] ?? '5432'; + $password = $options['pass'] ?? 'secret_firefly_password'; + $database = substr($options['path'] ?? '/firefly', 1); } return [ @@ -47,11 +49,11 @@ return [ ], 'mysql' => [ 'driver' => 'mysql', - 'host' => envNonEmpty('DB_HOST', '127.0.0.1'), - 'port' => envNonEmpty('DB_PORT', '3306'), - 'database' => envNonEmpty('DB_DATABASE', 'forge'), - 'username' => envNonEmpty('DB_USERNAME', 'forge'), - 'password' => env('DB_PASSWORD', ''), + 'host' => envNonEmpty('DB_HOST', $host), + 'port' => envNonEmpty('DB_PORT', $port), + 'database' => envNonEmpty('DB_DATABASE', $database), + 'username' => envNonEmpty('DB_USERNAME', $username), + 'password' => env('DB_PASSWORD', $password), 'unix_socket' => env('DB_SOCKET', ''), 'charset' => 'utf8mb4', 'collation' => 'utf8mb4_unicode_ci', @@ -62,7 +64,7 @@ return [ 'pgsql' => [ 'driver' => 'pgsql', 'host' => envNonEmpty('DB_HOST', $host), - 'port' => envNonEmpty('DB_PORT', '5432'), + 'port' => envNonEmpty('DB_PORT', $port), 'database' => envNonEmpty('DB_DATABASE', $database), 'username' => envNonEmpty('DB_USERNAME', $username), 'password' => env('DB_PASSWORD', $password),