CS-5724: Improves upgrade script for TimeZOne

Now matches 1 and +1, both as +1 GMT. Any other unknown value will be set to "", which equals disabled.
sourcefabric · May 18, 2015 · 8efc6a0 · 8efc6a0
1 parent 15da820
commit 8efc6a0
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/newscoop/install/Resources/sql/upgrade/4.4.x/2015.05.15/data-required.sql b/newscoop/install/Resources/sql/upgrade/4.4.x/2015.05.15/data-required.sql
@@ -1,16 +1,16 @@
 UPDATE `SystemPreferences` SET value = "Europe/London" WHERE varname = "TimeZone" AND value = "0";
-UPDATE `SystemPreferences` SET value = "Europe/Brussels" WHERE varname = "TimeZone" AND value = "1";
-UPDATE `SystemPreferences` SET value = "Europe/Athens" WHERE varname = "TimeZone" AND value = "2";
-UPDATE `SystemPreferences` SET value = "Asia/Baghdad" WHERE varname = "TimeZone" AND value = "3";
-UPDATE `SystemPreferences` SET value = "Asia/Muscat" WHERE varname = "TimeZone" AND value = "4";
-UPDATE `SystemPreferences` SET value = "Asia/Yekaterinburg" WHERE varname = "TimeZone" AND value = "5";
-UPDATE `SystemPreferences` SET value = "Asia/Almaty" WHERE varname = "TimeZone" AND value = "6";
-UPDATE `SystemPreferences` SET value = "Asia/Bangkok" WHERE varname = "TimeZone" AND value = "7";
-UPDATE `SystemPreferences` SET value = "Asia/Singapore" WHERE varname = "TimeZone" AND value = "8";
-UPDATE `SystemPreferences` SET value = "Asia/Tokyo" WHERE varname = "TimeZone" AND value = "9";
-UPDATE `SystemPreferences` SET value = "Asia/Vladivostok" WHERE varname = "TimeZone" AND value = "10";
-UPDATE `SystemPreferences` SET value = "Asia/Magadan" WHERE varname = "TimeZone" AND value = "11";
-UPDATE `SystemPreferences` SET value = "Asia/Kamchatka" WHERE varname = "TimeZone" AND value = "12";
+UPDATE `SystemPreferences` SET value = "Europe/Brussels" WHERE varname = "TimeZone" AND (value = "1" OR value = "+1");
+UPDATE `SystemPreferences` SET value = "Europe/Athens" WHERE varname = "TimeZone" AND (value = "2" OR value = "+2");
+UPDATE `SystemPreferences` SET value = "Asia/Baghdad" WHERE varname = "TimeZone" AND (value = "3" OR value = "+3");
+UPDATE `SystemPreferences` SET value = "Asia/Muscat" WHERE varname = "TimeZone" AND (value = "4" OR value = "+4");
+UPDATE `SystemPreferences` SET value = "Asia/Yekaterinburg" WHERE varname = "TimeZone" AND (value = "5" OR value = "+5");
+UPDATE `SystemPreferences` SET value = "Asia/Almaty" WHERE varname = "TimeZone" AND (value = "6" OR value = "+6");
+UPDATE `SystemPreferences` SET value = "Asia/Bangkok" WHERE varname = "TimeZone" AND (value = "7" OR value = "+7");
+UPDATE `SystemPreferences` SET value = "Asia/Singapore" WHERE varname = "TimeZone" AND (value = "8" OR value = "+8");
+UPDATE `SystemPreferences` SET value = "Asia/Tokyo" WHERE varname = "TimeZone" AND (value = "9" OR value = "+9");
+UPDATE `SystemPreferences` SET value = "Asia/Vladivostok" WHERE varname = "TimeZone" AND (value = "10" OR value = "+10");
+UPDATE `SystemPreferences` SET value = "Asia/Magadan" WHERE varname = "TimeZone" AND (value = "11" OR value = "+11");
+UPDATE `SystemPreferences` SET value = "Asia/Kamchatka" WHERE varname = "TimeZone" AND (value = "12" OR value = "+12");
 UPDATE `SystemPreferences` SET value = "Atlantic/Azores" WHERE varname = "TimeZone" AND value = "-1";
 UPDATE `SystemPreferences` SET value = "America/Noronha" WHERE varname = "TimeZone" AND value = "-2";
 UPDATE `SystemPreferences` SET value = "America/Argentina/Buenos_Aires" WHERE varname = "TimeZone" AND value = "-3";
@@ -23,3 +23,4 @@ UPDATE `SystemPreferences` SET value = "Pacific/Gambier" WHERE varname = "TimeZo
 UPDATE `SystemPreferences` SET value = "Pacific/Honolulu" WHERE varname = "TimeZone" AND value = "-10";
 UPDATE `SystemPreferences` SET value = "Pacific/Midway" WHERE varname = "TimeZone" AND value = "-11";
 UPDATE `SystemPreferences` SET value = "Pacific/Kwajalein" WHERE varname = "TimeZone" AND value = "-12";
+UPDATE `SystemPreferences` SET value = "" WHERE varname = "TimeZone" AND value NOT IN ("", "Europe/London", "Europe/Brussels", "Europe/Athens", "Asia/Baghdad", "Asia/Muscat", "Asia/Yekaterinburg", "Asia/Almaty", "Asia/Bangkok", "Asia/Singapore", "Asia/Tokyo", "Asia/Vladivostok", "Asia/Magadan", "Asia/Kamchatka", "Atlantic/Azores", "America/Noronha", "America/Argentina", "America/La_Paz", "America/Bogota", "America/Mexico_City", "America/Phoenix", "America/Metlakatla", "Pacific/Gambier", "Pacific/Honolulu", "Pacific/Midway", "Pacific/Kwajalein");