BC! Update database configuration and unify env settings(DB_NAME => D…

…B_DATABASE, DB_USER => DB_USERNAME) and remove unused settings
NNTmux · Dec 20, 2018 · fa5c9a9 · fa5c9a9
1 parent d34c564
commit fa5c9a9
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 18 deletions.
diff --git a/.env.example b/.env.example
@@ -1,12 +1,10 @@
-DB_CONNECTION=nntmux
-DB_SYSTEM=mysql
+DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
 DB_PORT=3306
 DB_SOCKET=
-DB_USER=
+DB_USERNAME=
 DB_PASSWORD=
-DB_NAME=nntmux
-DB_PCONNECT=false
+DB_DATABASE=nntmux
 
 NNTP_USERNAME=
 NNTP_PASSWORD=

diff --git a/.env.scrutinizer b/.env.scrutinizer
@@ -1,12 +1,10 @@
-DB_CONNECTION=nntmux
-DB_SYSTEM = mysql
+DB_CONNECTION=mysql
 DB_HOST = localhost
 DB_PORT =  3306
 DB_SOCKET =
-DB_USER = root
+DB_USERNAME = root
 DB_PASSWORD =
-DB_NAME = scrutinizer
-DB_PCONNECT = false
+DB_DATABASE = scrutinizer
 
 NNTP_USERNAME =
 NNTP_PASSWORD =

diff --git a/.env.travis b/.env.travis
@@ -1,11 +1,10 @@
-DB_SYSTEM = mysql
+DB_CONNECTION=mysql
 DB_HOST = localhost
 DB_PORT =  3306
 DB_SOCKET =
-DB_USER = TEST
+DB_USERNAME = TEST
 DB_PASSWORD = TEST
-DB_NAME = TEST
-DB_PCONNECT = false
+DB_DATABASE = TEST
 
 NNTP_USERNAME =
 NNTP_PASSWORD =

diff --git a/Changelog b/Changelog
@@ -1,5 +1,6 @@
 2018-12-20 DariusIII
-	* Chg: BC remove nntmux and edit mysql database connection, make mysql default connection
+	* Chg: BC! Update database configuration and unify env settings(DB_NAME => DB_DATABASE, DB_USER => DB_USERNAME) and remove unused settings
+	* Chg: BC! Remove nntmux and edit mysql database connection, make mysql default connection
 	* Chg: Add used branch to tmux output
 	* Fix: Fix wrong class used in TmuxOutput class _getHeader function
 	* Chg: Update TmuxOutput _getHeader function

diff --git a/config/database.php b/config/database.php
@@ -40,11 +40,11 @@
         ],
 
         'mysql' => [
-            'driver'      => env('DB_SYSTEM', 'mysql'),
+            'driver'      => 'mysql',
             'host'        => env('DB_HOST', '127.0.0.1'),
             'port'        => env('DB_PORT', '3306'),
-            'database'    => env('DB_NAME', 'nntmux'),
-            'username'    => env('DB_USER', 'nntmux'),
+            'database'    => env('DB_DATABASE', 'nntmux'),
+            'username'    => env('DB_USERNAME', 'nntmux'),
             'password'    => env('DB_PASSWORD', ''),
             'unix_socket' => env('DB_SOCKET', ''),
             'charset'     => 'utf8',