From f95e07dbccd6657b44ce916a1f140aafcaa8bc74 Mon Sep 17 00:00:00 2001 From: Nabeel Shahzad Date: Wed, 6 Dec 2017 14:00:35 -0600 Subject: [PATCH] cleanup for db config --- .env.dev.example | 2 +- config/database.php | 16 +++++----------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/.env.dev.example b/.env.dev.example index 3148cef5..0dd76f1c 100644 --- a/.env.dev.example +++ b/.env.dev.example @@ -10,7 +10,7 @@ APP_LOG_LEVEL=debug APP_LOG_MAX_FILES=7 DB_CONNECTION=sqlite -DB_PATH=storage/dev.sqlite +DB_DATABASE=storage/dev.sqlite CACHE_DRIVER=array CACHE_PREFIX= diff --git a/config/database.php b/config/database.php index 23212118..c8a4f364 100755 --- a/config/database.php +++ b/config/database.php @@ -4,47 +4,41 @@ return [ 'fetch' => PDO::FETCH_ASSOC, 'default' => env('DB_CONNECTION', 'local'), - 'connections' => [ - 'mysql' => [ 'driver' => 'mysql', 'host' => env('DB_HOST', '127.0.0.1'), 'port' => env('DB_PORT', '3306'), - 'database' => env('DB_DATABASE', 'phpvms'), - 'username' => env('DB_USERNAME', 'phpvms'), - 'password' => env('DB_PASSWORD', 'phpvms'), + 'database' => env('DB_DATABASE', 'forge'), + 'username' => env('DB_USERNAME', 'forge'), + 'password' => env('DB_PASSWORD', ''), + 'unix_socket' => env('DB_SOCKET', ''), 'charset' => 'utf8', 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => true, 'engine' => null, ], - 'sqlite' => [ 'driver' => 'sqlite', - 'database' => env('DB_PATH', storage_path('db.sqlite')), + 'database' => env('DB_DATABASE', storage_path('db.sqlite')), 'prefix' => '', ], - 'local' => [ 'driver' => 'sqlite', 'database' => storage_path('local.sqlite'), 'prefix' => '', ], - 'unittest' => [ 'driver' => 'sqlite', 'database' => storage_path('unittest.sqlite'), 'prefix' => '', ], - 'memory' => [ 'driver' => 'sqlite', 'database' => ':memory:', 'prefix' => '', ], - ], 'migrations' => 'migrations',