Merge pull request #1 from seamuslee001/agileware-patch-2

Regenerate DAOs and Upgrade step to fix current installs
seamuslee001 · Aug 14, 2017 · 72572a6 · 72572a6
2 parents 30878e6 + 1435405
commit 72572a6
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 33 deletions.
diff --git a/CRM/Report/DAO/ReportInstance.php b/CRM/Report/DAO/ReportInstance.php
@@ -30,7 +30,7 @@
  *
  * Generated from xml/schema/CRM/Report/ReportInstance.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:857f3f19bbbb33bf039b6ea95f2097c5)
+ * (GenCodeChecksum:e28abdd2a3696c4a6072dfbfd4f54d68)
  */
 require_once 'CRM/Core/DAO.php';
 require_once 'CRM/Utils/Type.php';
@@ -257,8 +257,8 @@ static function &fields() {
           'title' => ts('Report template ID') ,
           'description' => 'FK to civicrm_option_value for the report template',
           'required' => true,
-          'maxlength' => 64,
-          'size' => CRM_Utils_Type::BIG,
+          'maxlength' => 512,
+          'size' => CRM_Utils_Type::HUGE,
           'table_name' => 'civicrm_report_instance',
           'entity' => 'ReportInstance',
           'bao' => 'CRM_Report_BAO_ReportInstance',

diff --git a/CRM/Upgrade/Incremental/sql/4.7.25.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.25.mysql.tpl
@@ -2,3 +2,6 @@
 
 ALTER TABLE `civicrm_menu`
 ADD COLUMN `module_data` text    COMMENT 'All other menu metadata not stored in other fields';
+
+--CRM-21061 Increase report_id size from 64 to 512 to match civicrm_option_value.value column
+ALTER TABLE civicrm_report_instance CHANGE COLUMN report_id report_id varchar(512) COMMENT 'FK to civicrm_option_value for the report template';
diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql