kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Fix #1382

Browse Source
This commit is contained in:
James Cole
2018-04-27 06:26:37 +02:00
parent 9026c9d6f1
commit a9dd8eb9e7
7 changed files with 41 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
config/database.php
View File

@@ -38,19 +38,19 @@ if (!($databaseUrl === false)) {
return [
'default' => env('DB_CONNECTION', 'mysql'),
'default' => envNonEmpty('DB_CONNECTION', 'mysql'),
'connections' => [
'sqlite' => [
'driver' => 'sqlite',
'database' => env('DB_DATABASE', storage_path('database/database.sqlite')),
'database' => envNonEmpty('DB_DATABASE', storage_path('database/database.sqlite')),
'prefix' => '',
],
'mysql' => [
'driver' => 'mysql',
'host' => env('DB_HOST', '127.0.0.1'),
'port' => env('DB_PORT', '3306'),
'database' => env('DB_DATABASE', 'forge'),
'username' => env('DB_USERNAME', 'forge'),
'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', ''),
'unix_socket' => env('DB_SOCKET', ''),
'charset' => 'utf8mb4',
@@ -61,10 +61,10 @@ return [
],
'pgsql' => [
'driver' => 'pgsql',
'host' => env('DB_HOST', $host),
'port' => env('DB_PORT', '5432'),
'database' => env('DB_DATABASE', $database),
'username' => env('DB_USERNAME', $username),
'host' => envNonEmpty('DB_HOST', $host),
'port' => envNonEmpty('DB_PORT', '5432'),
'database' => envNonEmpty('DB_DATABASE', $database),
'username' => envNonEmpty('DB_USERNAME', $username),
'password' => env('DB_PASSWORD', $password),
'charset' => 'utf8',
'prefix' => '',