From 9cdf43a2c93c9c35a2f58760dae6e03aae7a820e Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 7 Feb 2015 10:24:54 +0100 Subject: [PATCH] Commit new env files. --- .env | 1 + .env.example | 1 + .env.testing | 1 + .travis.yml | 1 + config/database.php | 2 +- 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.env b/.env index 10cba06398..f8cf313b30 100644 --- a/.env +++ b/.env @@ -2,6 +2,7 @@ APP_ENV=homestead APP_DEBUG=true APP_KEY=SomeRandomString +DB_CONNECTION=mysql DB_HOST=localhost DB_DATABASE=homestead DB_USERNAME=homestead diff --git a/.env.example b/.env.example index 4eb0845889..d591731926 100644 --- a/.env.example +++ b/.env.example @@ -2,6 +2,7 @@ APP_ENV=local APP_DEBUG=true APP_KEY=SomeRandomString +DB_CONNECTION=mysql DB_HOST=localhost DB_DATABASE=homestead DB_USERNAME=homestead diff --git a/.env.testing b/.env.testing index e5ad163cfa..8c3486bf72 100644 --- a/.env.testing +++ b/.env.testing @@ -2,6 +2,7 @@ APP_ENV=testing APP_DEBUG=true APP_KEY=SomeRandomString +DB_CONNECTION=sqlite DB_HOST=localhost DB_DATABASE=homestead DB_USERNAME=homestead diff --git a/.travis.yml b/.travis.yml index 9113086402..4a9b02c2ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ install: - rm composer.lock - composer install - php artisan env + - mv -v .env.testing .env script: - ./tests/_data/db.sh diff --git a/config/database.php b/config/database.php index 54c6db0fcc..7dc436d13e 100644 --- a/config/database.php +++ b/config/database.php @@ -26,7 +26,7 @@ return [ | */ - 'default' => 'mysql', + 'default' => env('DB_CONNECTION', 'mysql'), /* |--------------------------------------------------------------------------