diff --git a/src/Model/Define.php b/src/Model/Define.php index f5873bb6e..dd057afc9 100644 --- a/src/Model/Define.php +++ b/src/Model/Define.php @@ -388,7 +388,7 @@ class Define ]; public const DATABASE_VERSION = [ - 'mysql' => ['min' => '5.7.8', 'max_lt' => '8.1.0'], + 'mysql' => ['min' => '5.7.8'], 'mariadb' => ['min' => '10.2.7'], 'sqlsrv' => ['min' => '13.0.0.0'], ]; diff --git a/src/Services/Installer/DatabaseForm.php b/src/Services/Installer/DatabaseForm.php index a99ee6615..961dcf971 100644 --- a/src/Services/Installer/DatabaseForm.php +++ b/src/Services/Installer/DatabaseForm.php @@ -146,28 +146,13 @@ protected function checkDatabaseVersion() $database_version = Define::DATABASE_VERSION[$this->database_default]; - $result = true; - $message_lt = false; // check min - if (version_compare($version, $database_version['min']) < 0) { - $result = false; - } - - // check max(less than) - if (array_has($database_version, 'max_lt')) { - $message_lt = true; - if (version_compare($version, $database_version['max_lt']) >= 0) { - $result = false; - } - } - - if ($result) { + if (version_compare($version, $database_version['min']) >= 0) { return true; } - $errorMessage = exmtrans('install.error.not_require_database_version_' . ($message_lt ? 'min_maxlt' : 'min'), [ + $errorMessage = exmtrans('install.error.not_require_database_version_min', [ 'min' => $database_version['min'], - 'max_lt' => ($message_lt ? $database_version['max_lt'] : null), 'database' => Define::DATABASE_TYPE[$this->database_default], 'current' => $version ]);