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

Fix migrations when table prefix is involved #442 (#555)

Browse Source 
* Fix migrations when table prefix is involved #442

* Formatting
This commit is contained in:
Nabeel S
2020-02-18 08:23:32 -05:00
committed by GitHub
parent 2d36376e29
commit 8300a69ad5
7 changed files with 38 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/Installer/Http/Controllers/InstallerController.php
View File

@@ -18,6 +18,7 @@ use Illuminate\Http\Request;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Validator;
use Laracasts\Flash\Flash;
use Modules\Installer\Services\ConfigService;
use Modules\Installer\Services\RequirementsService;
@@ -196,7 +197,7 @@ class InstallerController extends Controller
Log::error('Testing db before writing configs failed');
Log::error($e->getMessage());
flash()->error($e->getMessage());
Flash::error($e->getMessage());
return redirect(route('installer.step2'))->withInput();
}
@@ -224,7 +225,7 @@ class InstallerController extends Controller
Log::error('Config files failed to write');
Log::error($e->getMessage());
flash()->error($e->getMessage());
Flash::error($e->getMessage());
return redirect(route('installer.step2'))->withInput();
}
@@ -238,7 +239,7 @@ class InstallerController extends Controller
*
* @param Request $request
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View
* @return mixed
*/
public function dbsetup(Request $request)
{
@@ -250,9 +251,9 @@ class InstallerController extends Controller
$this->seederSvc->syncAllSeeds();
} catch (QueryException $e) {
Log::error('Error on db setup: '.$e->getMessage());
dd($e);
$this->envSvc->removeConfigFiles();
flash()->error($e->getMessage());
Flash::error($e->getMessage());
return redirect(route('installer.step2'))->withInput();
}