Merge https://github.com/civicrm/civicrm-core/pull/6276

[civicrm-core.git] / CRM / Upgrade / Incremental / sql / 4.7.alpha1.mysql.tpl

diff --git a/CRM/Upgrade/Incremental/sql/4.7.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.alpha1.mysql.tpl
index bb05c6a73458b8e2fd826685792b99933cc5bcc2..217f0928f62e208933271689044ba6989f41319a 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/4.7.alpha1.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.7.alpha1.mysql.tpl
@@ -24,6 +24,47 @@ UPDATE civicrm_option_value SET {localize field="label"}label = 'Activity Summar
 
 {include file='../CRM/Upgrade/4.7.alpha1.msg_template/civicrm_msg_template.tpl'}
 
+-- CRM-16478 Remove custom fatal error template path
+DELETE FROM civicrm_setting WHERE name = 'fatalErrorTemplate';
+
+UPDATE civicrm_state_province SET name = 'Bataan' WHERE name = 'Batasn';
+
+--CRM-16914
+ALTER TABLE civicrm_payment_processor
+ADD COLUMN
+`payment_instrument_id` int unsigned   DEFAULT 1 COMMENT 'Payment Instrument ID';
+
+ALTER TABLE civicrm_payment_processor_type
+ADD COLUMN
+`payment_instrument_id` int unsigned   DEFAULT 1 COMMENT 'Payment Instrument ID';
+
+-- CRM-16876 Set country names to UPPERCASE
+UPDATE civicrm_country SET `name` = UPPER( `name` );
+
+-- CRM-16447
+UPDATE civicrm_state_province SET name = 'Northern Ostrobothnia' WHERE name = 'Nothern Ostrobothnia';
+
+-- CRM-14078
+UPDATE civicrm_option_group SET {localize field="title"}title = '{ts escape="sql"}Payment Methods{/ts}'{/localize} WHERE name = 'payment_instrument';
+UPDATE civicrm_navigation SET label = '{ts escape="sql"}Payment Methods{/ts}' WHERE name = 'Payment Instruments';
+
+-- CRM-16176
+{if $multilingual}
+  {foreach from=$locales item=locale}
+     ALTER TABLE civicrm_relationship_type ADD label_a_b_{$locale} varchar(64);
+     ALTER TABLE civicrm_relationship_type ADD label_b_a_{$locale} varchar(64);
+     ALTER TABLE civicrm_relationship_type ADD description_{$locale} varchar(255);
+
+     UPDATE civicrm_relationship_type SET label_a_b_{$locale} = label_a_b;
+     UPDATE civicrm_relationship_type SET label_b_a_{$locale} = label_b_a;
+     UPDATE civicrm_relationship_type SET description_{$locale} = description;
+  {/foreach}
+
+  ALTER TABLE civicrm_relationship_type DROP label_a_b;
+  ALTER TABLE civicrm_relationship_type DROP label_b_a;
+  ALTER TABLE civicrm_relationship_type DROP description;
+{/if}
+
 -- CRM-13283
 CREATE TABLE IF NOT EXISTS `civicrm_status_pref` (
      `id` int unsigned NOT NULL AUTO_INCREMENT  COMMENT 'Unique Status Preference ID',