summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2011-09-24 02:12:36 +0000
committerTom Lane2011-09-24 02:12:36 +0000
commitc7f144b643b82352fb7c3a3917a41f959ed01058 (patch)
tree08ddac95e8ccbc2b60f8361f205de0f066f2ac09
parent8ab067da917398e6bcf733fcb835c5d4852ff03b (diff)
Fix our mapping of Windows timezones for Central America.
We were mapping "Central America Standard Time" to "CST6CDT", which seems entirely wrong, because according to the Olson timezone database noplace in Central America observes daylight savings time on any regular basis --- and certainly not according to the USA DST rules that are implied by "CST6CDT". (Mexico is an exception, but they can be disregarded since they have a separate timezone name in Windows.) So, map this zone name to plain "CST6", which will provide a fixed UTC offset. As written, this patch will also result in mapping "Central America Daylight Time" to CST6. I considered hacking things so that would still map to CST6CDT, but it seems it would confuse win32tzlist.pl to put those two names in separate entries. Since there's little evidence that any such zone name is used in the wild, much less that CST6CDT would be a good match for it, I'm not too worried about what we do with it. Per complaint from Pratik Chirania.
-rw-r--r--src/timezone/pgtz.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/timezone/pgtz.c b/src/timezone/pgtz.c
index ce6e7d1add9..685016c133e 100644
--- a/src/timezone/pgtz.c
+++ b/src/timezone/pgtz.c
@@ -716,9 +716,10 @@ static const struct
"Cen. Australia Standard Time", "Cen. Australia Daylight Time",
"Australia/Adelaide"
}, /* (GMT+09:30) Adelaide */
+ /* Central America (other than Mexico) generally does not observe DST */
{
"Central America Standard Time", "Central America Daylight Time",
- "CST6CDT"
+ "CST6"
}, /* (GMT-06:00) Central America */
{
"Central Asia Standard Time", "Central Asia Daylight Time",