From 864645e029c2b9fb9f87c904adb56d1d37b6e595 Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Sat, 13 Aug 2016 20:15:17 +1000 Subject: [PATCH] CRM-19034 further country fixes --- CRM/Upgrade/Incremental/sql/4.7.11.mysql.tpl | 27 +++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/CRM/Upgrade/Incremental/sql/4.7.11.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.11.mysql.tpl index 8e2848a7c1..64ff7ebd63 100644 --- a/CRM/Upgrade/Incremental/sql/4.7.11.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/4.7.11.mysql.tpl @@ -45,7 +45,7 @@ UPDATE civicrm_country SET name = "Botswana" WHERE lower(name) = lower("Botswana UPDATE civicrm_country SET name = "Bouvet Island" WHERE lower(name) = lower("Bouvet Island"); UPDATE civicrm_country SET name = "Brazil" WHERE lower(name) = lower("Brazil"); UPDATE civicrm_country SET name = "British Indian Ocean Territory" WHERE lower(name) = lower("British Indian Ocean Territory"); -UPDATE civicrm_country SET name = "Virgin Islands" WHERE lower(name) = lower("Virgin Islands"); +UPDATE civicrm_country SET name = "Virgin Islands, U.S." WHERE lower(name) = lower("Virgin Islands, U.S."); UPDATE civicrm_country SET name = "Brunei Darussalam" WHERE lower(name) = lower("Brunei Darussalam"); UPDATE civicrm_country SET name = "Bulgaria" WHERE lower(name) = lower("Bulgaria"); UPDATE civicrm_country SET name = "Burkina Faso" WHERE lower(name) = lower("Burkina Faso"); @@ -64,11 +64,11 @@ UPDATE civicrm_country SET name = "Christmas Island" WHERE lower(name) = lower(" UPDATE civicrm_country SET name = "Cocos (Keeling) Islands" WHERE lower(name) = lower("Cocos (Keeling) Islands"); UPDATE civicrm_country SET name = "Colombia" WHERE lower(name) = lower("Colombia"); UPDATE civicrm_country SET name = "Comoros" WHERE lower(name) = lower("Comoros"); -UPDATE civicrm_country SET name = "Congo" WHERE lower(name) = lower("Congo"); -UPDATE civicrm_country SET name = "Congo" WHERE lower(name) = lower("Congo"); +UPDATE civicrm_country SET name = "Congo, Republic Of The" WHERE lower(name) = lower("Congo, Republic of The"); +UPDATE civicrm_country SET name = "Congo, The Democratic Republic of the" WHERE lower(name) = lower("Congo, The Democratic Republic of the"); UPDATE civicrm_country SET name = "Cook Islands" WHERE lower(name) = lower("Cook Islands"); UPDATE civicrm_country SET name = "Costa Rica" WHERE lower(name) = lower("Costa Rica"); -UPDATE civicrm_country SET name = "Côte d\'Ivoire" WHERE lower(name) = lower("Côte d\'Ivoire"); +UPDATE civicrm_country SET name = "Côte d'Ivoire" WHERE lower(name) = lower("Côte d'Ivoire"); UPDATE civicrm_country SET name = "Croatia" WHERE lower(name) = lower("Croatia"); UPDATE civicrm_country SET name = "Cuba" WHERE lower(name) = lower("Cuba"); UPDATE civicrm_country SET name = "Cyprus" WHERE lower(name) = lower("Cyprus"); @@ -117,7 +117,7 @@ UPDATE civicrm_country SET name = "Hungary" WHERE lower(name) = lower("Hungary") UPDATE civicrm_country SET name = "Iceland" WHERE lower(name) = lower("Iceland"); UPDATE civicrm_country SET name = "India" WHERE lower(name) = lower("India"); UPDATE civicrm_country SET name = "Indonesia" WHERE lower(name) = lower("Indonesia"); -UPDATE civicrm_country SET name = "Iran" WHERE lower(name) = lower("Iran"); +UPDATE civicrm_country SET name = "Iran, Islamic Republic of" WHERE lower(name) = lower("Iran, Islamic Republic of"); UPDATE civicrm_country SET name = "Iraq" WHERE lower(name) = lower("Iraq"); UPDATE civicrm_country SET name = "Ireland" WHERE lower(name) = lower("Ireland"); UPDATE civicrm_country SET name = "Israel" WHERE lower(name) = lower("Israel"); @@ -128,8 +128,8 @@ UPDATE civicrm_country SET name = "Jordan" WHERE lower(name) = lower("Jordan"); UPDATE civicrm_country SET name = "Kazakhstan" WHERE lower(name) = lower("Kazakhstan"); UPDATE civicrm_country SET name = "Kenya" WHERE lower(name) = lower("Kenya"); UPDATE civicrm_country SET name = "Kiribati" WHERE lower(name) = lower("Kiribati"); -UPDATE civicrm_country SET name = "Korea" WHERE lower(name) = lower("Korea"); -UPDATE civicrm_country SET name = "Korea" WHERE lower(name) = lower("Korea"); +UPDATE civicrm_country SET name = "Korea, Democratic People's Republic of" WHERE lower(name) = lower("Korea, Democratic People's Republic of"); +UPDATE civicrm_country SET name = "Korea, Republic of" WHERE lower(name) = lower("Korea, Republic of"); UPDATE civicrm_country SET name = "Kuwait" WHERE lower(name) = lower("Kuwait"); UPDATE civicrm_country SET name = "Kyrgyzstan" WHERE lower(name) = lower("Kyrgyzstan"); UPDATE civicrm_country SET name = "Lao People\'s Democratic Republic" WHERE lower(name) = lower("Lao People\'s Democratic Republic"); @@ -142,7 +142,7 @@ UPDATE civicrm_country SET name = "Liechtenstein" WHERE lower(name) = lower("Lie UPDATE civicrm_country SET name = "Lithuania" WHERE lower(name) = lower("Lithuania"); UPDATE civicrm_country SET name = "Luxembourg" WHERE lower(name) = lower("Luxembourg"); UPDATE civicrm_country SET name = "Macao" WHERE lower(name) = lower("Macao"); -UPDATE civicrm_country SET name = "Macedonia" WHERE lower(name) = lower("Macedonia"); +UPDATE civicrm_country SET name = "Macedonia, Republic of" WHERE lower(name) = lower("Macedonia, Republic of"); UPDATE civicrm_country SET name = "Madagascar" WHERE lower(name) = lower("Madagascar"); UPDATE civicrm_country SET name = "Malawi" WHERE lower(name) = lower("Malawi"); UPDATE civicrm_country SET name = "Malaysia" WHERE lower(name) = lower("Malaysia"); @@ -155,7 +155,7 @@ UPDATE civicrm_country SET name = "Mauritania" WHERE lower(name) = lower("Maurit UPDATE civicrm_country SET name = "Mauritius" WHERE lower(name) = lower("Mauritius"); UPDATE civicrm_country SET name = "Mayotte" WHERE lower(name) = lower("Mayotte"); UPDATE civicrm_country SET name = "Mexico" WHERE lower(name) = lower("Mexico"); -UPDATE civicrm_country SET name = "Micronesia" WHERE lower(name) = lower("Micronesia"); +UPDATE civicrm_country SET name = "Micronesia, Federated States of" WHERE lower(name) = lower("Micronesia, Federated States of"); UPDATE civicrm_country SET name = "Moldova" WHERE lower(name) = lower("Moldova"); UPDATE civicrm_country SET name = "Monaco" WHERE lower(name) = lower("Monaco"); UPDATE civicrm_country SET name = "Mongolia" WHERE lower(name) = lower("Mongolia"); @@ -223,7 +223,7 @@ UPDATE civicrm_country SET name = "Syrian Arab Republic" WHERE lower(name) = low UPDATE civicrm_country SET name = "Sao Tome and Principe" WHERE lower(name) = lower("Sao Tome and Principe"); UPDATE civicrm_country SET name = "Taiwan" WHERE lower(name) = lower("Taiwan"); UPDATE civicrm_country SET name = "Tajikistan" WHERE lower(name) = lower("Tajikistan"); -UPDATE civicrm_country SET name = "Tanzania" WHERE lower(name) = lower("Tanzania"); +UPDATE civicrm_country SET name = "Tanzania, United Republic of" WHERE lower(name) = lower("Tanzania, United Republic of"); UPDATE civicrm_country SET name = "Thailand" WHERE lower(name) = lower("Thailand"); UPDATE civicrm_country SET name = "Bahamas" WHERE lower(name) = lower("Bahamas"); UPDATE civicrm_country SET name = "Gambia" WHERE lower(name) = lower("Gambia"); @@ -247,7 +247,7 @@ UPDATE civicrm_country SET name = "Uzbekistan" WHERE lower(name) = lower("Uzbeki UPDATE civicrm_country SET name = "Vanuatu" WHERE lower(name) = lower("Vanuatu"); UPDATE civicrm_country SET name = "Venezuela" WHERE lower(name) = lower("Venezuela"); UPDATE civicrm_country SET name = "Viet Nam" WHERE lower(name) = lower("Viet Nam"); -UPDATE civicrm_country SET name = "Virgin Islands" WHERE lower(name) = lower("Virgin Islands"); +UPDATE civicrm_country SET name = "Virgin Islands, British" WHERE lower(name) = lower("Virgin Islands, British"); UPDATE civicrm_country SET name = "Wallis and Futuna" WHERE lower(name) = lower("Wallis and Futuna"); UPDATE civicrm_country SET name = "Western Sahara" WHERE lower(name) = lower("Western Sahara"); UPDATE civicrm_country SET name = "Yemen" WHERE lower(name) = lower("Yemen"); @@ -263,7 +263,10 @@ UPDATE civicrm_country SET name = "Isle of Man" WHERE lower(name) = lower("Isle UPDATE civicrm_country SET name = "South Sudan" WHERE lower(name) = lower("South Sudan"); UPDATE civicrm_country SET name = "Curaçao" WHERE lower(name) = lower("Curaçao"); UPDATE civicrm_country SET name = "Sint Maarten (Dutch Part)" WHERE lower(name) = lower("Sint Maarten (Dutch Part)"); -UPDATE civicrm_country SET name = "Bonaire" WHERE lower(name) = lower("Bonaire"); +UPDATE civicrm_country SET name = "Bonaire, Saint Eustatius and Saba" WHERE lower(name) = lower("Bonaire, Saint Eustatius and Saba"); UPDATE civicrm_country SET name = "Kosovo" WHERE lower(name) = lower("Kosovo"); UPDATE civicrm_country SET name = "Saint Barthélemy" WHERE lower(name) = lower("Saint Barthélemy"); UPDATE civicrm_country SET name = "Saint Martin (French part)" WHERE lower(name) = lower("Saint Martin (French part)"); +UPDATE civicrm_country SET name = "Afghanistan" WHERE lower(name) = lower("Afghanistan"); +UPDATE civicrm_country SET name = "Albania" WHERE lower(name) = lower("Albania"); +UPDATE civicrm_country SET name = "Algeria" WHERE lower(name) = lower("Algeria"); -- 2.25.1