Merge pull request #173 from mattwire/upgrader

CRM-20192 Upgrader: Check for existing columns before trying to add new ones

CRM/CiviDiscount/Upgrader.php

@@ -12,15 +12,31 @@ class CRM_CiviDiscount_Upgrader extends CRM_CiviDiscount_Upgrader_Base {
    *
    */
   public function upgrade_2201() {
-    $this->ctx->log->info('Applying update 2201');
-    CRM_Core_DAO::executeQuery('ALTER TABLE cividiscount_item ADD COLUMN discount_msg_enabled TINYINT(1) DEFAULT 0 AFTER is_active');
-    CRM_Core_DAO::executeQuery('ALTER TABLE cividiscount_item ADD COLUMN discount_msg VARCHAR(255) AFTER discount_msg_enabled');
+    if (CRM_Core_BAO_SchemaHandler::checkIfFieldExists('cividiscount_item', 'discount_msg_enabled')) {
+      $this->ctx->log->info('Skipped cividiscount update 2201.  Column discount_msg_enabled already present on cividiscount_item table.');
+    }
+    else {
+      $this->ctx->log->info('Applying cividiscount update 2201.  Adding discount_msg_enabled to the cividiscount_item table.');
+      CRM_Core_DAO::executeQuery('ALTER TABLE cividiscount_item ADD COLUMN discount_msg_enabled TINYINT(1) DEFAULT 0 AFTER is_active');
+    }
+    if (CRM_Core_BAO_SchemaHandler::checkIfFieldExists('cividiscount_item', 'discount_msg')) {
+      $this->ctx->log->info('Skipped cividiscount update 2201.  Column discount_msg already present on cividiscount_item table.');
+    }
+    else {
+      $this->ctx->log->info('Applying cividiscount update 2201.  Adding discount_msg to the cividiscount_item table.');
+      CRM_Core_DAO::executeQuery('ALTER TABLE cividiscount_item ADD COLUMN discount_msg VARCHAR(255) AFTER discount_msg_enabled');
+    }
     return TRUE;
   }
 
   public function upgrade_2202() {
-    $this->ctx->log->info('Applying update 2202');
-    CRM_Core_DAO::executeQuery('ALTER TABLE cividiscount_item ADD COLUMN filters VARCHAR(255)');
+    if (CRM_Core_BAO_SchemaHandler::checkIfFieldExists('cividiscount_item', 'filters')) {
+      $this->ctx->log->info('Skipped cividiscount update 2202.  Column filters already present on cividiscount_item table.');
+    }
+    else {
+      $this->ctx->log->info('Applying cividiscount update 2202.  Adding filters to the cividiscount_item table.');
+      CRM_Core_DAO::executeQuery('ALTER TABLE cividiscount_item ADD COLUMN filters VARCHAR(255)');
+    }
     return TRUE;
   }
 
@@ -36,4 +52,4 @@ public function upgrade_2203() {
     }
     return TRUE;
   }
-}
+}