From 02d277d0458e3d39435bb18e358b23e86480c01c Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Thu, 16 Feb 2023 10:30:07 +0200 Subject: [PATCH] drop mariadb 10.1 --- README.md | 2 +- .../MysqlColumnPreparator.php | 26 +++---------------- .../Espo/Resources/defaults/systemConfig.php | 2 +- 3 files changed, 6 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index e07ec6d943..d43c10415e 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ It's a web application with a frontend designed as a single page application and ### Requirements * PHP 8.0 and later; -* MySQL 5.7 (and later), or MariaDB 10.1 (and later). +* MySQL 5.7 (and later), or MariaDB 10.2 (and later). For more information about server configuration see [this article](https://docs.espocrm.com/administration/server-configuration/). diff --git a/application/Espo/Core/Utils/Database/Schema/ColumnPreparators/MysqlColumnPreparator.php b/application/Espo/Core/Utils/Database/Schema/ColumnPreparators/MysqlColumnPreparator.php index bda04dd235..b9d5279167 100644 --- a/application/Espo/Core/Utils/Database/Schema/ColumnPreparators/MysqlColumnPreparator.php +++ b/application/Espo/Core/Utils/Database/Schema/ColumnPreparators/MysqlColumnPreparator.php @@ -197,34 +197,16 @@ class MysqlColumnPreparator implements ColumnPreparator */ private function detectMaxIndexLength(): int { - $databaseType = $this->helper->getType(); - $tableEngine = $this->getTableEngine(); if (!$tableEngine) { return self::DEFAULT_INDEX_LIMIT; } - switch ($tableEngine) { - case 'InnoDB': - $version = $this->helper->getVersion(); - - switch ($databaseType) { - case self::TYPE_MARIADB: - if (version_compare($version, '10.2.2') >= 0) { - return 3072; // InnoDB, MariaDB 10.2.2+ - } - - break; - - case self::TYPE_MYSQL: - return 3072; - } - - return 767; // InnoDB - } - - return 1000; // MyISAM + return match ($tableEngine) { + 'InnoDB' => 3072, + default => 1000, + }; } /** diff --git a/application/Espo/Resources/defaults/systemConfig.php b/application/Espo/Resources/defaults/systemConfig.php index 6a563aff45..b8871c3266 100644 --- a/application/Espo/Resources/defaults/systemConfig.php +++ b/application/Espo/Resources/defaults/systemConfig.php @@ -261,7 +261,7 @@ return [ ], 'requiredMysqlVersion' => '5.7.0', 'recommendedMysqlParams' => [], - 'requiredMariadbVersion' => '10.1.0', + 'requiredMariadbVersion' => '10.2.2', 'recommendedMariadbParams' => [], /** Max execution time (in seconds) allocated for a single job. If exceeded then set to Failed.*/ 'jobPeriod' => 7800,