Alex/freescout
1
0
Fork 0
mirror of https://github.com/freescout-helpdesk/freescout.git synced 2024-11-23 19:02:46 +01:00
Code Issues Releases Wiki Activity

Fix installation wizard with PostgreSQL - closes #654

Browse Source
This commit is contained in:
FreeScout 2020-07-19 02:22:19 -07:00
parent 068b89fe72
commit 661ce426dd
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
overrides/RachidLaasri/LaravelInstaller/Controllers/EnvironmentController.php
View File

@ -128,7 +128,7 @@ class EnvironmentController extends Controller
$request->database_charset = 'utf8';
$request->database_collation = 'utf8_unicode_ci';
$this->testDbConnect($request);
// $this->testDbConnect($request);
} else {
throw $e;
}
@ -158,16 +158,25 @@ class EnvironmentController extends Controller
public function testDbConnect($request, $params = [])
{
$params = array_merge([
'driver' => 'mysql',
$driver = $request->database_connection ?? 'mysql';
$config = config('database.connections.'.$driver);
if (!$config) {
$config = [];
}
$params = array_merge($config, $params);
$params = array_merge($params, [
'driver' => $driver,
'host' => $request->database_hostname,
'port' => $request->database_port,
'database' => $request->database_name,
'username' => $request->database_username,
'password' => $request->database_password,
'charset' => 'utf8mb4',
'collation' => 'utf8mb4_unicode_ci',
'prefix' => '',
], $params);
// 'charset' => 'utf8mb4',
// 'collation' => 'utf8mb4_unicode_ci',
// 'prefix' => '',
]);
$params_hash = md5(json_encode($params));
\Config::set('database.connections.install'.$params_hash, $params);