From 0b68a01644c8dd659e336e462c51a43f7a9c3409 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Thu, 14 Dec 2017 19:12:48 -0700 Subject: [PATCH] xml/version (etal) - Renumber 4.7.29 as 4.7.30 --- CRM/Upgrade/Incremental/sql/4.7.29.mysql.tpl | 15 --------------- CRM/Upgrade/Incremental/sql/4.7.30.mysql.tpl | 16 ++++++++++++++++ sql/civicrm_generated.mysql | 2 +- xml/version.xml | 2 +- 4 files changed, 18 insertions(+), 17 deletions(-) create mode 100644 CRM/Upgrade/Incremental/sql/4.7.30.mysql.tpl diff --git a/CRM/Upgrade/Incremental/sql/4.7.29.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.29.mysql.tpl index 228b4453f8..444a0ba0e1 100644 --- a/CRM/Upgrade/Incremental/sql/4.7.29.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/4.7.29.mysql.tpl @@ -1,16 +1 @@ {* file to handle db changes in 4.7.29 during upgrade *} - --- CRM-21407 ISO compliance for German counties -UPDATE `civicrm_state_province` SET `name` = 'Baden-Württemberg' WHERE `name` = 'Baden-Wuerttemberg' AND `country_id` = 1082; -UPDATE `civicrm_state_province` SET `abbreviation` = 'BE' WHERE `name` = 'Berlin' AND `abbreviation` = 'BR' AND `country_id` = 1082; -UPDATE `civicrm_state_province` SET `name` = 'Thüringen' WHERE `name` = 'Thueringen' AND `country_id` = 1082; - --- CRM-21378 Ensure that email abuse reports are treated as spam -SELECT @bounceTypeID := max(id) FROM civicrm_mailing_bounce_type WHERE name = 'Spam'; -INSERT INTO civicrm_mailing_bounce_pattern (bounce_type_id, pattern) VALUES (@bounceTypeID, 'abuse report'); - - --- CRM-21532 Add French state/departments -SELECT @country_id := id from civicrm_country where name = 'France' AND iso_code = 'FR'; -INSERT INTO `civicrm_state_province` (`id`, `country_id`, `abbreviation`, `name`) VALUES -(NULL, @country_id, "52", "Haute-Marne"); \ No newline at end of file diff --git a/CRM/Upgrade/Incremental/sql/4.7.30.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.30.mysql.tpl new file mode 100644 index 0000000000..bd097d6381 --- /dev/null +++ b/CRM/Upgrade/Incremental/sql/4.7.30.mysql.tpl @@ -0,0 +1,16 @@ +{* file to handle db changes in 4.7.30 during upgrade *} + +-- CRM-21407 ISO compliance for German counties +UPDATE `civicrm_state_province` SET `name` = 'Baden-Württemberg' WHERE `name` = 'Baden-Wuerttemberg' AND `country_id` = 1082; +UPDATE `civicrm_state_province` SET `abbreviation` = 'BE' WHERE `name` = 'Berlin' AND `abbreviation` = 'BR' AND `country_id` = 1082; +UPDATE `civicrm_state_province` SET `name` = 'Thüringen' WHERE `name` = 'Thueringen' AND `country_id` = 1082; + +-- CRM-21378 Ensure that email abuse reports are treated as spam +SELECT @bounceTypeID := max(id) FROM civicrm_mailing_bounce_type WHERE name = 'Spam'; +INSERT INTO civicrm_mailing_bounce_pattern (bounce_type_id, pattern) VALUES (@bounceTypeID, 'abuse report'); + + +-- CRM-21532 Add French state/departments +SELECT @country_id := id from civicrm_country where name = 'France' AND iso_code = 'FR'; +INSERT INTO `civicrm_state_province` (`id`, `country_id`, `abbreviation`, `name`) VALUES +(NULL, @country_id, "52", "Haute-Marne"); \ No newline at end of file diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql index c0783b4acf..c1e212b199 100644 --- a/sql/civicrm_generated.mysql +++ b/sql/civicrm_generated.mysql @@ -399,7 +399,7 @@ UNLOCK TABLES; LOCK TABLES `civicrm_domain` WRITE; /*!40000 ALTER TABLE `civicrm_domain` DISABLE KEYS */; -INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `config_backend`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,NULL,'4.7.29',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}'); +INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `config_backend`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,NULL,'4.7.30',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}'); /*!40000 ALTER TABLE `civicrm_domain` ENABLE KEYS */; UNLOCK TABLES; diff --git a/xml/version.xml b/xml/version.xml index 2d9306a70e..6b6cf1f35d 100644 --- a/xml/version.xml +++ b/xml/version.xml @@ -1,4 +1,4 @@ - 4.7.29 + 4.7.30 -- 2.25.1