CRM-12151

diff --git a/CRM/Upgrade/Incremental/php/FourThree.php b/CRM/Upgrade/Incremental/php/FourThree.php
index bbe9a35d6e43e12b9961019a359a8b5e6751a216..c1a9c93cfb8d2365296633334eeb9722a647b198 100644 (file)
--- a/CRM/Upgrade/Incremental/php/FourThree.php
+++ b/CRM/Upgrade/Incremental/php/FourThree.php
@@ -203,7 +203,11 @@ WHERE    entity_value = '' OR entity_value IS NULL
     $query = "SELECT * FROM civicrm_saved_search WHERE form_values LIKE '%contribution_type%'";
     $this->addTask('Replace contribution_type to financial_type in table civicrm_saved_search', 'replaceContributionTypeId', $query, 'savedSearch');
   }
-  
+
+  function upgrade_4_3_beta4($rev) {
+    $this->addTask(ts('Upgrade DB to 4.3.beta4: SQL'), 'task_4_3_x_runSql', $rev);
+  }
+
   //CRM-11636
   function assignFinancialTypeToPriceRecords() {
     $upgrade = new CRM_Upgrade_Form();
@@ -732,12 +736,12 @@ AND TABLE_SCHEMA = '{$dbUf['database']}'";
         $saveDao = new CRM_Contact_DAO_SavedSearch();
       }
       else {
-        $saveDao = new CRM_Report_DAO_Instance();        
+        $saveDao = new CRM_Report_DAO_Instance();
       }
       $saveDao->id = $dao->id;
 
       if ($table == 'savedSearch') {
-        if (array_key_exists('mapper', $formValues)) { 
+        if (array_key_exists('mapper', $formValues)) {
           foreach ($formValues['mapper'] as $key => $values) {
             foreach ($values as $k => $v) {
               if (preg_grep('/contribution_/', $v)) {
@@ -758,7 +762,7 @@ AND TABLE_SCHEMA = '{$dbUf['database']}'";
         }
         if (preg_match('/contribution_type/', $dao->where_clause)) {
           $saveDao->where_clause = preg_replace('/contribution_type/', 'financial_type', $dao->where_clause);
-        }        
+        }
       }
       $saveDao->form_values = serialize($formValues);
 

diff --git a/CRM/Upgrade/Incremental/sql/4.3.beta4.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.3.beta4.mysql.tpl
index 7f93e23161fd2614eda8fb0b448ad4b42a9e4149..e8fbb154a9b4d1f15e160e7811154a5ff4c88582 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/4.3.beta4.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.3.beta4.mysql.tpl
@@ -1,5 +1,15 @@
 -- CRM-12142
 {if !$multilingual}
-  ALTER TABLE `civicrm_premiums` 
-    ADD COLUMN premiums_nothankyou_label varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'Label displayed for No Thank-you option in premiums block (e.g. No thank you)';
-{/if}
\ No newline at end of file
+  ALTER TABLE `civicrm_premiums`
+    ADD COLUMN premiums_nothankyou_label varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'Label displayed for No Thank-you
+ option in premiums block (e.g. No thank you)';
+{/if}
+
+-- CRM-12151
+ALTER TABLE civicrm_option_value
+  DROP INDEX index_option_group_id_value,
+  ADD INDEX index_option_group_id_value (value(128), option_group_id),
+  DROP INDEX index_option_group_id_name,
+  ADD INDEX index_option_group_id_name (option_group_id, name(128));
+
+

diff --git a/xml/schema/Core/OptionValue.xml b/xml/schema/Core/OptionValue.xml
index 75fb066f0eec0685d9b71e44b530fff6cc521f0f..2dd7d8a3442046a1706ab17b69b3d02758b3b5a2 100644 (file)
--- a/xml/schema/Core/OptionValue.xml
+++ b/xml/schema/Core/OptionValue.xml
@@ -49,7 +49,7 @@
       <required>true</required>
       <comment>The actual value stored (as a foreign key) in the data record. Functions which need lookup option_value.title should use civicrm_option_value.option_group_id plus civicrm_option_value.value as the key.</comment>
        <add>1.5</add>
-       <change>3.3</change>      
+       <change>3.3</change>
   </field>
   <field>
        <name>name</name>
@@ -130,7 +130,7 @@
        <table>civicrm_component</table>
        <key>id</key>
        <add>2.0</add>
-  </foreignKey>  
+  </foreignKey>
   <field>
       <name>domain_id</name>
       <type>int unsigned</type>
@@ -151,14 +151,14 @@
   </field>
   <index>
        <name>index_option_group_id_value</name>
-       <fieldName>value</fieldName>
+       <fieldName length="128">value</fieldName>
        <fieldName>option_group_id</fieldName>
        <add>1.5</add>
   </index>
   <index>
     <name>index_option_group_id_name</name>
+    <fieldName length="128">name</fieldName>
     <fieldName>option_group_id</fieldName>
-    <fieldName>name</fieldName>
     <add>2.2</add>
   </index>
 </table>