aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2011-09-23 22:07:52 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2011-09-23 22:07:52 -0400
commit4c5d837e69cf92e906acfa3000d848d4524beee9 (patch)
tree1e26116f9eca91592354b5dc171b44b16f31007b
parent14a183261a1f9b15dc73ad34295d118ada538b5b (diff)
downloadpostgresql-4c5d837e69cf92e906acfa3000d848d4524beee9.tar.gz
postgresql-4c5d837e69cf92e906acfa3000d848d4524beee9.zip
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/bin/initdb/findtimezone.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/bin/initdb/findtimezone.c b/src/bin/initdb/findtimezone.c
index 6d45674b5b8..87b8e9a34d2 100644
--- a/src/bin/initdb/findtimezone.c
+++ b/src/bin/initdb/findtimezone.c
@@ -658,9 +658,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",