From 82e4411b45734b7414a59caad1a23f183785869e Mon Sep 17 00:00:00 2001 From: James Brooks Date: Wed, 23 Mar 2016 10:12:56 +0000 Subject: [PATCH] Allow setting of DB_SCHEMA and DB_PREFIX. Closes #1649 --- .env.example | 1 + config/database.php | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.env.example b/.env.example index bff24dd7..317c1170 100644 --- a/.env.example +++ b/.env.example @@ -9,6 +9,7 @@ DB_DATABASE=cachet DB_USERNAME=homestead DB_PASSWORD=secret DB_PORT=null +DB_PREFIX=null CACHE_DRIVER=file SESSION_DRIVER=file diff --git a/config/database.php b/config/database.php index 8859e79e..e507778d 100644 --- a/config/database.php +++ b/config/database.php @@ -58,7 +58,7 @@ return [ 'sqlite' => [ 'driver' => 'sqlite', 'database' => env('DB_HOST', storage_path().'/database.sqlite'), - 'prefix' => '', + 'prefix' => env('DB_PREFIX', null), ], 'mysql' => [ @@ -70,7 +70,7 @@ return [ 'port' => env('DB_PORT', '3306'), 'charset' => 'utf8', 'collation' => 'utf8_unicode_ci', - 'prefix' => '', + 'prefix' => env('DB_PREFIX', null), 'strict' => false, 'engine' => null, ], @@ -83,8 +83,8 @@ return [ 'password' => env('DB_PASSWORD', null), 'port' => env('DB_PORT', '5432'), 'charset' => 'utf8', - 'prefix' => '', - 'schema' => 'public', + 'prefix' => env('DB_PREFIX', null), + 'schema' => env('DB_SCHEMA', 'public'), ], 'sqlsrv' => [ @@ -94,7 +94,7 @@ return [ 'username' => env('DB_USERNAME', null), 'password' => env('DB_PASSWORD', null), 'port' => env('DB_PORT', null), - 'prefix' => '', + 'prefix' => env('DB_PREFIX', null), ], ],