From 973b87f0f0558ebcdc9d4f20584833eb9d2e3945 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Fri, 16 Jan 2015 22:32:34 +0000 Subject: [PATCH] Fix being unable to find SQLite databases --- app/config/database.php | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/app/config/database.php b/app/config/database.php index 7bf173b3..0fc4fd6a 100644 --- a/app/config/database.php +++ b/app/config/database.php @@ -26,7 +26,7 @@ return [ | */ - 'default' => $_ENV['DB_DRIVER'], + 'default' => getenv('DB_DRIVER') ?: 'sqlite', /* |-------------------------------------------------------------------------- @@ -48,16 +48,16 @@ return [ 'sqlite' => [ 'driver' => 'sqlite', - 'database' => __DIR__.'/../database/'.$_ENV['DB_DATABASE'], + 'database' => app_path('database').'/'.getenv('DB_DATABASE') ?: null, 'prefix' => '', ], 'mysql' => [ 'driver' => 'mysql', - 'host' => $_ENV['DB_HOST'], - 'database' => $_ENV['DB_DATABASE'], - 'username' => $_ENV['DB_USERNAME'], - 'password' => $_ENV['DB_PASSWORD'], + 'host' => getenv('DB_HOST') ?: null, + 'database' => getenv('DB_DATABASE') ?: null, + 'username' => getenv('DB_USERNAME') ?: null, + 'password' => getenv('DB_PASSWORD') ?: null, 'charset' => 'utf8', 'collation' => 'utf8_unicode_ci', 'prefix' => '', @@ -65,10 +65,10 @@ return [ 'pgsql' => [ 'driver' => 'pgsql', - 'host' => $_ENV['DB_HOST'], - 'database' => $_ENV['DB_DATABASE'], - 'username' => $_ENV['DB_USERNAME'], - 'password' => $_ENV['DB_PASSWORD'], + 'host' => getenv('DB_HOST') ?: null, + 'database' => getenv('DB_DATABASE') ?: null, + 'username' => getenv('DB_USERNAME') ?: null, + 'password' => getenv('DB_PASSWORD') ?: null, 'charset' => 'utf8', 'prefix' => '', 'schema' => 'public', @@ -76,10 +76,10 @@ return [ 'sqlsrv' => [ 'driver' => 'sqlsrv', - 'host' => $_ENV['DB_HOST'], - 'database' => $_ENV['DB_DATABASE'], - 'username' => $_ENV['DB_USERNAME'], - 'password' => $_ENV['DB_PASSWORD'], + 'host' => getenv('DB_HOST') ?: null, + 'database' => getenv('DB_DATABASE') ?: null, + 'username' => getenv('DB_USERNAME') ?: null, + 'password' => getenv('DB_PASSWORD') ?: null, 'prefix' => '', ],