diff --git a/application/Espo/Core/Utils/Database/DBAL/Schema/Index.php b/application/Espo/Core/Utils/Database/DBAL/Schema/Index.php index b0356fd521..e17154d599 100644 --- a/application/Espo/Core/Utils/Database/DBAL/Schema/Index.php +++ b/application/Espo/Core/Utils/Database/DBAL/Schema/Index.php @@ -94,4 +94,25 @@ class Index extends \Doctrine\DBAL\Schema\Index return $columns; } + + public function overrules(DBALIndex $other) + { + if ($other->isPrimary()) { + return false; + } else if ($this->isSimpleIndex() && $other->isUnique()) { + return false; + } + + /*espo*/ + if (count($other->getColumns()) != count($this->getColumns())) { + return false; + } + /*espo*/ + + if ($this->spansColumns($other->getColumns()) && ($this->isPrimary() || $this->isUnique())) { + return true; + } + + return false; + } } diff --git a/application/Espo/Resources/i18n/en_US/Admin.json b/application/Espo/Resources/i18n/en_US/Admin.json index 2805323b28..d6c4a6a4bc 100644 --- a/application/Espo/Resources/i18n/en_US/Admin.json +++ b/application/Espo/Resources/i18n/en_US/Admin.json @@ -206,7 +206,7 @@ "extensionInstalled": "Extension {name} {version} has been installed.", "installExtension": "Extension {name} {version} is ready for an installation.", "cronIsNotConfigured": "Scheduled jobs are not running. Hence inbound emails, notifications and reminders are not working. Please follow the [instructions](https://www.espocrm.com/documentation/administration/server-configuration/#user-content-setup-a-crontab) to setup cron job.", - "newVersionIsAvailable": "New EspoCRM version {latestVersion} is available.", + "newVersionIsAvailable": "New EspoCRM version {latestVersion} is available. Please follow the [instructions](https://www.espocrm.com/documentation/administration/upgrading/) to upgrade your instance." , "newExtensionVersionIsAvailable": "New {extensionName} version {latestVersion} is available.", "uninstallConfirmation": "Are you sure you want to uninstall the extension?", "upgradeInfo": "Check the [documentation]({url}) about how to upgrade your EspoCRM instance.",