TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-28 04:01:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix mysql & mariadb requirement checks on installation

Browse Source
This commit is contained in:
Mohit Panjwani
2021-06-25 16:24:18 +05:30
parent 18a2e83348
commit 2ec87baa6f
3 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Space/EnvironmentManager.php
View File

@ -6,7 +6,6 @@ use Crater\Http\Requests\DatabaseEnvironmentRequest;
use Crater\Http\Requests\DiskEnvironmentRequest;
use Crater\Http\Requests\DomainEnvironmentRequest;
use Crater\Http\Requests\MailEnvironmentRequest;
use Crater\Http\Requests\PaymentSettingsRequest;
use Exception;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
@ -195,10 +194,7 @@ class EnvironmentManager
switch ($connection) {
case 'mysql':
$dbSupportInfo = $checker->checkMysqlVersion(
$conn,
config('crater.min_mysql_version')
);
$dbSupportInfo = $checker->checkMysqlVersion($conn);
break;

17
app/Space/RequirementsChecker.php
View File

@ -2,6 +2,7 @@
namespace Crater\Space;
use Illuminate\Support\Str;
use PDO;
use SQLite3;
@ -122,10 +123,16 @@ class RequirementsChecker
*
* @return array
*/
public function checkMysqlVersion($conn, string $minMysqlVersion = null)
public function checkMysqlVersion($conn)
{
$minVersionMysql = $minMysqlVersion;
$version_info = $conn->getAttribute(PDO::ATTR_SERVER_VERSION);
$isMariaDb = Str::contains($version_info, 'MariaDB');
$minVersionMysql = $isMariaDb ? config('crater.min_mariadb_version') : config('crater.min_mysql_version');
$currentMysqlVersion = $this->getMysqlVersionInfo($conn);
$supported = false;
if (version_compare($currentMysqlVersion, $minVersionMysql) >= 0) {
@ -148,9 +155,11 @@ class RequirementsChecker
*/
private static function getMysqlVersionInfo($pdo)
{
$currentVersion = $pdo->getAttribute(PDO::ATTR_SERVER_VERSION);
$version = $pdo->query('select version()')->fetchColumn();
return $currentVersion;
preg_match("/^[0-9\.]+/", $version, $match);
return $match[0];
}
/**