From 6846f08825f2233ea04b5df9858c39cba83fe336 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 15 Dec 2016 17:57:49 -0500
Subject: [PATCH] Upgrade cleanup - use addColumn utility instead of sql

---
 CRM/Upgrade/Incremental/php/FourSeven.php    | 18 +++++-------------
 CRM/Upgrade/Incremental/sql/4.7.15.mysql.tpl |  3 ---
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/CRM/Upgrade/Incremental/php/FourSeven.php b/CRM/Upgrade/Incremental/php/FourSeven.php
index 1c434052f5..140eafc0e2 100644
--- a/CRM/Upgrade/Incremental/php/FourSeven.php
+++ b/CRM/Upgrade/Incremental/php/FourSeven.php
@@ -260,7 +260,8 @@ class CRM_Upgrade_Incremental_php_FourSeven extends CRM_Upgrade_Incremental_Base
    */
   public function upgrade_4_7_13($rev) {
     $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev);
-    $this->addTask('Add column to allow for payment processors to set what card types are accepted', 'addAcceptedCardTypesField');
+    $this->addTask('CRM-19372 - Add column to allow for payment processors to set what card types are accepted', 'addColumn',
+      'civicrm_payment_processor', 'accepted_credit_cards', "text DEFAULT NULL COMMENT 'array of accepted credit card types'");
   }
 
   /**
@@ -279,8 +280,10 @@ class CRM_Upgrade_Incremental_php_FourSeven extends CRM_Upgrade_Incremental_Base
    * @param string $rev
    */
   public function upgrade_4_7_15($rev) {
-    $this->addTask('Add icon column to civicrm_option_value', 'addColumn',
+    $this->addTask('CRM-19723 - Add icon column to civicrm_option_value', 'addColumn',
       'civicrm_option_value', 'icon', "varchar(255) COMMENT 'crm-i icon class' DEFAULT NULL");
+    $this->addTask('CRM-19626 - Add min_amount column to civicrm_price_set', 'addColumn',
+      'civicrm_price_set', 'min_amount', "INT(10) UNSIGNED DEFAULT '0' COMMENT 'Minimum Amount required for this set.'");
     $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev);
   }
 
@@ -897,17 +900,6 @@ FROM `civicrm_dashboard_contact` JOIN `civicrm_contact` WHERE civicrm_dashboard_
     return TRUE;
   }
 
-  /**
-   * CRM-19372 Add field to store accepted credit credit cards for a payment processor.
-   * @return bool
-   */
-  public static function addAcceptedCardTypesField() {
-    if (!CRM_Core_BAO_SchemaHandler::checkIfFieldExists('civicrm_payment_processor', 'accepted_credit_cards')) {
-      CRM_Core_DAO::executeQuery("ALTER TABLE civicrm_payment_processor ADD COLUMN `accepted_credit_cards` text   DEFAULT NULL COMMENT 'array of accepted credit card types'");
-    }
-    return TRUE;
-  }
-
   /**
    * CRM-19372 Add field to store accepted credit credit cards for a payment processor.
    * @return bool
diff --git a/CRM/Upgrade/Incremental/sql/4.7.15.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.15.mysql.tpl
index cc19448b25..6210d2d5b1 100644
--- a/CRM/Upgrade/Incremental/sql/4.7.15.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.7.15.mysql.tpl
@@ -3,9 +3,6 @@
 -- CRM-19685 (fix for inconsistencies)
 UPDATE civicrm_contact SET preferred_mail_format = 'Both' WHERE preferred_mail_format IS NULL;
 
--- CRM-19626
-ALTER TABLE civicrm_price_set ADD min_amount INT(10) UNSIGNED DEFAULT '0' COMMENT 'Minimum Amount required for this set.';
-
 -- CRM-19723 add icons
 SELECT @option_group_id_act := max(id) from civicrm_option_group where name = 'activity_type';
 UPDATE civicrm_option_value SET icon = 'fa-slideshare' WHERE option_group_id = @option_group_id_act AND name = 'Meeting';
-- 
2.25.1