From 6a2d3987b51cb68709a86abdcdadc7e6beac683f Mon Sep 17 00:00:00 2001 From: JKingsnorth Date: Wed, 18 May 2016 13:04:54 +0100 Subject: [PATCH] CRM-18526: Move upgrade code to 4.7.8 --- CRM/Upgrade/Incremental/php/FourSeven.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CRM/Upgrade/Incremental/php/FourSeven.php b/CRM/Upgrade/Incremental/php/FourSeven.php index d5f230a01f..6a33eceda4 100644 --- a/CRM/Upgrade/Incremental/php/FourSeven.php +++ b/CRM/Upgrade/Incremental/php/FourSeven.php @@ -192,9 +192,12 @@ class CRM_Upgrade_Incremental_php_FourSeven extends CRM_Upgrade_Incremental_Base * * @param string $rev */ - public function upgrade_4_7_5($rev) { + public function upgrade_4_7_7($rev) { $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev); - $this->addTask('Upgrade mailing foreign key constraints', 'upgradeMailingFKs'); + // https://issues.civicrm.org/jira/browse/CRM-18006 + if (CRM_Core_DAO::checkTableExists('civicrm_install_canary')) { + CRM_Core_DAO::executeQuery('ALTER TABLE civicrm_install_canary ENGINE=InnoDB'); + } } /** @@ -202,12 +205,9 @@ class CRM_Upgrade_Incremental_php_FourSeven extends CRM_Upgrade_Incremental_Base * * @param string $rev */ - public function upgrade_4_7_7($rev) { + public function upgrade_4_7_8($rev) { $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev); - // https://issues.civicrm.org/jira/browse/CRM-18006 - if (CRM_Core_DAO::checkTableExists('civicrm_install_canary')) { - CRM_Core_DAO::executeQuery('ALTER TABLE civicrm_install_canary ENGINE=InnoDB'); - } + $this->addTask('Upgrade mailing foreign key constraints', 'upgradeMailingFKs'); } /* -- 2.25.1