FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rewrite how mysql db is created to avoid external processes #132

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-01-09 20:47:03 -06:00
parent 07ca62920f
commit f16748167b
3 changed files with 86 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/Installer/Services/DatabaseService.php
View File

@@ -17,7 +17,7 @@ class DatabaseService {
Log::info('Testing Connection: '.$driver.'::'.$user.':'.$pass.'@'.$host.':'.$port.';'.$name);
if($driver === 'mysql') {
$dsn = "mysql:host=$host;port=$port;";
$dsn = "mysql:host=$host;port=$port;dbname=$name";
Log::info('Connection string: '. $dsn);
try {
$conn = new PDO($dsn, $user, $pass);
@@ -26,7 +26,7 @@ class DatabaseService {
}
}
// Needs testing
// TODO: Needs testing
elseif ($driver === 'postgres') {
$dsn = "pgsql:host=$host;port=$port;dbname=$name";
try {
@@ -46,8 +46,10 @@ class DatabaseService {
{
$output = '';
\Artisan::call('database:create');
$output .= \Artisan::output();
if(config('database.default') === 'sqlite') {
\Artisan::call('database:create');
$output .= \Artisan::output();
}
\Artisan::call('migrate');
$output .= trim(\Artisan::output());