From ce33da5a552037e233a2af5b472a9a21fb23c3d2 Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Fri, 3 May 2019 06:22:41 +1000 Subject: [PATCH] Resolve dev/core#931 by not doing translation on the query if field exists during the upgrade process --- CRM/Upgrade/Incremental/Base.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CRM/Upgrade/Incremental/Base.php b/CRM/Upgrade/Incremental/Base.php index 1ee17e37e8..c787ca4ac2 100644 --- a/CRM/Upgrade/Incremental/Base.php +++ b/CRM/Upgrade/Incremental/Base.php @@ -156,12 +156,12 @@ class CRM_Upgrade_Incremental_Base { $domain = new CRM_Core_DAO_Domain(); $domain->find(TRUE); $queries = []; - if (!CRM_Core_BAO_SchemaHandler::checkIfFieldExists($table, $column)) { + if (!CRM_Core_BAO_SchemaHandler::checkIfFieldExists($table, $column, FALSE)) { if ($domain->locales) { if ($localizable) { $locales = explode(CRM_Core_DAO::VALUE_SEPARATOR, $domain->locales); foreach ($locales as $locale) { - if (!CRM_Core_BAO_SchemaHandler::checkIfFieldExists($table, "{$column}_{$locale}")) { + if (!CRM_Core_BAO_SchemaHandler::checkIfFieldExists($table, "{$column}_{$locale}", FALSE)) { $queries[] = "ALTER TABLE `$table` ADD COLUMN `{$column}_{$locale}` $properties"; } } -- 2.25.1