From dfd5282bf340c0c0b99b7f85c5ffb35a45fc4322 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sun, 6 Sep 2009 15:25:39 +0000 Subject: [PATCH] Update the tznames reference files, and add IDT (Israel Daylight Time) to the Default timezone abbreviation set. Back-port the the current file set to all branches that contain tznames. This includes adding SGT to the Default set in pre-8.4 releases. Joachim Wieland --- src/timezone/tznames/Africa.txt | 8 +++++++- src/timezone/tznames/America.txt | 2 +- src/timezone/tznames/Asia.txt | 8 ++++++-- src/timezone/tznames/Australia.txt | 4 +++- src/timezone/tznames/Default | 5 ++++- src/timezone/tznames/Europe.txt | 3 ++- src/timezone/tznames/Indian.txt | 2 +- src/timezone/tznames/README | 11 ++++++++++- 8 files changed, 34 insertions(+), 9 deletions(-) diff --git a/src/timezone/tznames/Africa.txt b/src/timezone/tznames/Africa.txt index c0fc16de54..d419167202 100644 --- a/src/timezone/tznames/Africa.txt +++ b/src/timezone/tznames/Africa.txt @@ -4,7 +4,7 @@ # a template for timezones you could need. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/Africa.txt,v 1.2 2006/07/25 13:49:21 tgl Exp $ +# $PostgreSQL: pgsql/src/timezone/tznames/Africa.txt,v 1.2.4.1 2009/09/06 15:25:39 tgl Exp $ # CAT 7200 # Central Africa Time @@ -161,6 +161,12 @@ WAT 3600 # West Africa Time # (Africa/Niamey) # (Africa/Porto-Novo) # (Africa/Windhoek) +WEST 3600 D # Western Europe Summer Time + # (Africa/Casablanca) + # (Atlantic/Canary) + # (Atlantic/Faeroe) + # (Atlantic/Madeira) + # (Europe/Lisbon) WET 0 # Western Europe Time # (Africa/Casablanca) # (Africa/El_Aaiun) diff --git a/src/timezone/tznames/America.txt b/src/timezone/tznames/America.txt index b41ca9aec9..e92f0509d6 100644 --- a/src/timezone/tznames/America.txt +++ b/src/timezone/tznames/America.txt @@ -4,7 +4,7 @@ # a template for timezones you could need. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/America.txt,v 1.3.2.1 2008/03/02 00:10:28 tgl Exp $ +# $PostgreSQL: pgsql/src/timezone/tznames/America.txt,v 1.3.2.2 2009/09/06 15:25:39 tgl Exp $ # # Acre time is sometimes called Acre Standard Time (AST) which leads to a diff --git a/src/timezone/tznames/Asia.txt b/src/timezone/tznames/Asia.txt index dbb3b9aeca..dbeeda2bed 100644 --- a/src/timezone/tznames/Asia.txt +++ b/src/timezone/tznames/Asia.txt @@ -4,7 +4,7 @@ # a template for timezones you could need. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/Asia.txt,v 1.3 2006/12/15 16:54:43 tgl Exp $ +# $PostgreSQL: pgsql/src/timezone/tznames/Asia.txt,v 1.3.2.1 2009/09/06 15:25:39 tgl Exp $ # # CONFLICT! ADT is not unique @@ -138,10 +138,15 @@ ICT 25200 # Indochina Time # (Asia/Phnom_Penh) # (Asia/Saigon) # (Asia/Vientiane) +IDT 10800 D # Israel Daylight Time +IRDT 16200 D # Iran Daylight Time + # (Asia/Tehran) IRKST 32400 D # Irkutsk Summer Time # (Asia/Irkutsk) IRKT 28800 # Irkutsk Time # (Asia/Irkutsk) +IRST 12600 # Iran Standard Time + # (Asia/Tehran) IRT 12600 # Iran Time (not in zic) # CONFLICT! IST is not unique # Other timezones: @@ -154,7 +159,6 @@ IST 19800 # Indian Standard Time # - IST: Irish Summer Time (Europe) # - IST: Indian Standard Time (Asia) IST 7200 # Israel Standard Time - # (this time zone is not contained in the ZIC database) JAYT 32400 # Jayapura Time (Indonesia) (not in zic) JST 32400 # Japan Standard Time # (Asia/Tokyo) diff --git a/src/timezone/tznames/Australia.txt b/src/timezone/tznames/Australia.txt index e790a1dd11..88509fd8fa 100644 --- a/src/timezone/tznames/Australia.txt +++ b/src/timezone/tznames/Australia.txt @@ -4,7 +4,7 @@ # a template for timezones you could need. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/Australia.txt,v 1.2 2006/07/25 13:49:21 tgl Exp $ +# $PostgreSQL: pgsql/src/timezone/tznames/Australia.txt,v 1.2.4.1 2009/09/06 15:25:39 tgl Exp $ # ACSST 37800 D # Central Australia (not in zic) @@ -25,6 +25,8 @@ CAST 34200 # Central Australia Standard Time (not in zic) CST 34200 # Central Standard Time (Australia) # (Australia/Adelaide) # (Australia/Broken_Hill) +CWST 31500 # Central Western Standard Time (Australia) + # (Australia/Eucla) # CONFLICT! EAST is not unique # Other timezones: # - EAST: Easter Island Time (Chile) (Pacific) diff --git a/src/timezone/tznames/Default b/src/timezone/tznames/Default index 390322f5db..2dfb707366 100644 --- a/src/timezone/tznames/Default +++ b/src/timezone/tznames/Default @@ -4,7 +4,7 @@ # timezone_abbreviations to 'Default'. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/Default,v 1.4.2.2 2009/03/05 14:28:04 heikki Exp $ +# $PostgreSQL: pgsql/src/timezone/tznames/Default,v 1.4.2.3 2009/09/06 15:25:39 tgl Exp $ #################### AFRICA #################### @@ -283,6 +283,7 @@ ICT 25200 # Indochina Time # (Asia/Phnom_Penh) # (Asia/Saigon) # (Asia/Vientiane) +IDT 10800 D # Israel Daylight Time IRKST 32400 D # Irkutsk Summer Time # (Asia/Irkutsk) IRKT 28800 # Irkutsk Time @@ -334,6 +335,8 @@ PETT 43200 # Petropavlovsk-Kamchatski Time # (Asia/Kamchatka) PHT 28800 # Phillipine Time (not in zic) PKT 18000 # Pakistan Time (not in zic) +SGT 28800 # Singapore Time + # (Asia/Singapore) TJT 18000 # Tajikistan Time # (Asia/Dushanbe) TMT 18000 # Turkmenistan Time diff --git a/src/timezone/tznames/Europe.txt b/src/timezone/tznames/Europe.txt index 206dbf3a24..10732ef96f 100644 --- a/src/timezone/tznames/Europe.txt +++ b/src/timezone/tznames/Europe.txt @@ -4,7 +4,7 @@ # a template for timezones you could need. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/Europe.txt,v 1.2 2006/07/25 13:49:21 tgl Exp $ +# $PostgreSQL: pgsql/src/timezone/tznames/Europe.txt,v 1.2.4.1 2009/09/06 15:25:39 tgl Exp $ # BST 3600 D # British Summer Time @@ -191,6 +191,7 @@ SAMST 18000 D # Samara Summer Time SAMT 14400 # Samara Time # (Europe/Samara) WEST 3600 D # Western Europe Summer Time + # (Africa/Casablanca) # (Atlantic/Canary) # (Atlantic/Faeroe) # (Atlantic/Madeira) diff --git a/src/timezone/tznames/Indian.txt b/src/timezone/tznames/Indian.txt index 9514ebabc5..85fd387977 100644 --- a/src/timezone/tznames/Indian.txt +++ b/src/timezone/tznames/Indian.txt @@ -4,7 +4,7 @@ # a template for timezones you could need. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/Indian.txt,v 1.2.4.1 2009/03/05 14:28:04 heikki Exp $ +# $PostgreSQL: pgsql/src/timezone/tznames/Indian.txt,v 1.2.4.2 2009/09/06 15:25:39 tgl Exp $ # CCT 23400 # Cocos Islands Time (Indian Ocean) diff --git a/src/timezone/tznames/README b/src/timezone/tznames/README index 3b1bdcce50..64186d04e9 100644 --- a/src/timezone/tznames/README +++ b/src/timezone/tznames/README @@ -1,3 +1,8 @@ +$PostgreSQL: pgsql/src/timezone/tznames/README,v 1.2.4.1 2009/09/06 15:25:39 tgl Exp $ + +tznames +======= + This directory contains files with timezone sets for PostgreSQL. The problem is that time zone abbreviations are not unique throughout the world and you might find out that a time zone abbreviation in the `Default' set collides @@ -18,5 +23,9 @@ Your set of time zone names can then be included in future releases. For the time being you can always add your own set. The files named Africa.txt, etc, are not intended to be used directly as -timezone abbreviation files. They contain reference definitions of timezone +time zone abbreviation files. They contain reference definitions of time zone names that can be copied into a custom abbreviation file as needed. + +Note that these files (*.txt) are already a subset of the zic timezone +database files: we tried to list only those time zones that (according to +the zic timezone database) appear to be still in use. -- GitLab