CRM-13998 - upgrade checks for missing report_instance columns.

----------------------------------------
* CRM-13998: Upgrade is missing alter statements for civicrm_report_instance
  http://issues.civicrm.org/jira/browse/CRM-13998

diff --git a/CRM/Upgrade/Incremental/php/FourFour.php b/CRM/Upgrade/Incremental/php/FourFour.php
index e27bb917e77991d0ecf15f1ba5609e70a667898d..bb027fdafab42d8c143492f62ea30d66b3fae22c 100644 (file)
--- a/CRM/Upgrade/Incremental/php/FourFour.php
+++ b/CRM/Upgrade/Incremental/php/FourFour.php
@@ -280,6 +280,10 @@ ALTER TABLE civicrm_dashboard
   END;
     ";
     CRM_Core_DAO::executeQuery($query, array(), TRUE, NULL, FALSE, FALSE);
+ 
+    // CRM-13998 : missing alter statements for civicrm_report_instance
+    $this->addTask(ts('Confirm civicrm_report_instance sql table for upgrades'), 'updateReportInstanceTable');
+
 
     return TRUE;
   }
@@ -541,4 +545,37 @@ CREATE TABLE IF NOT EXISTS `civicrm_word_replacement` (
     ));
     CRM_Core_BAO_WordReplacement::rebuild();
   }
+
+  
+  /***
+   * CRM-13998 missing alter statements for civicrm_report_instance
+   ***/
+  public function updateReportInstanceTable() {
+
+    // add civicrm_report_instance.name 
+
+    $sql = "SELECT count(*) FROM information_schema.columns "
+      . "WHERE table_schema = database() AND table_name = 'civicrm_report_instance' AND COLUMN_NAME = 'name' ";
+
+    $res = CRM_Core_DAO::singleValueQuery($sql);
+
+    if ($res <= 0 ) {
+      $sql = "ALTER TABLE civicrm_report_instance ADD `name` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'when combined with report_id/template uniquely identifies the instance'";
+      $res = CRM_Core_DAO::executeQuery($sql);
+    }
+
+    // add civicrm_report_instance args 
+
+    $sql = "SELECT count(*) FROM information_schema.columns WHERE table_schema = database() AND table_name = 'civicrm_report_instance' AND COLUMN_NAME = 'args' ";
+
+    $res = CRM_Core_DAO::singleValueQuery($sql);
+
+    if ($res <= 0 ) {
+      $sql = "ALTER TABLE civicrm_report_instance ADD `args` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'arguments that are passed in the url when invoking the instance'";
+
+      $res = CRM_Core_DAO::executeQuery($sql);
+    }
+
+    return TRUE;
+  }
 }

diff --git a/CRM/Upgrade/Incremental/sql/4.4.4.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.4.4.mysql.tpl
index 40c61108ce4b07b80c1bc2a195b88bceebe03ec2..5017a4851e0e80c7131a3d15609f9d8e7f5f813c 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/4.4.4.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.4.4.mysql.tpl
@@ -1 +1,4 @@
 {* file to handle db changes in 4.4.4 during upgrade *}
+
+{* update comment for civicrm_report_instance.grouprole *}
+ALTER TABLE civicrm_report_instance MODIFY grouprole varchar(1024) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'role required to be able to run this instance';