Commit 6c5f9161 authored by Tom Lane's avatar Tom Lane

Update Windows timezone name list to include currently-known zones.

Thanks to Juan José Santamaría Flecha.

Discussion: https://postgr.es/m/5752.1587740484@sss.pgh.pa.us
parent bd8c5cee
...@@ -736,7 +736,7 @@ static const struct ...@@ -736,7 +736,7 @@ static const struct
/* /*
* This list was built from the contents of the registry at * This list was built from the contents of the registry at
* HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time * HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time
* Zones on Windows 10 and Windows 7. * Zones on Windows 7, Windows 10, and Windows Server 2019.
* *
* The zones have been matched to IANA timezones by looking at the cities * The zones have been matched to IANA timezones by looking at the cities
* listed in the win32 display name (in the comment here) in most cases. * listed in the win32 display name (in the comment here) in most cases.
...@@ -938,7 +938,7 @@ static const struct ...@@ -938,7 +938,7 @@ static const struct
"Australia/Brisbane" "Australia/Brisbane"
}, },
{ {
/* (UTC+02:00) E. Europe */ /* (UTC+02:00) Chisinau */
"E. Europe Standard Time", "E. Europe Daylight Time", "E. Europe Standard Time", "E. Europe Daylight Time",
"Europe/Bucharest" "Europe/Bucharest"
}, },
...@@ -988,7 +988,7 @@ static const struct ...@@ -988,7 +988,7 @@ static const struct
"Asia/Tbilisi" "Asia/Tbilisi"
}, },
{ {
/* (UTC) Dublin, Edinburgh, Lisbon, London */ /* (UTC+00:00) Dublin, Edinburgh, Lisbon, London */
"GMT Standard Time", "GMT Daylight Time", "GMT Standard Time", "GMT Daylight Time",
"Europe/London" "Europe/London"
}, },
...@@ -998,7 +998,7 @@ static const struct ...@@ -998,7 +998,7 @@ static const struct
"America/Godthab" "America/Godthab"
}, },
{ {
/* (UTC) Monrovia, Reykjavik */ /* (UTC+00:00) Monrovia, Reykjavik */
"Greenwich Standard Time", "Greenwich Daylight Time", "Greenwich Standard Time", "Greenwich Daylight Time",
"Africa/Casablanca" "Africa/Casablanca"
}, },
...@@ -1063,10 +1063,15 @@ static const struct ...@@ -1063,10 +1063,15 @@ static const struct
"Australia/Lord_Howe" "Australia/Lord_Howe"
}, },
{ {
/* (UTC+10:00) Magadan */ /* (UTC+11:00) Magadan */
"Magadan Standard Time", "Magadan Daylight Time", "Magadan Standard Time", "Magadan Daylight Time",
"Asia/Magadan" "Asia/Magadan"
}, },
{
/* (UTC-03:00) Punta Arenas */
"Magallanes Standard Time", "Magallanes Daylight Time",
"America/Punta_Arenas"
},
{ {
/* (UTC-09:30) Marquesas Islands */ /* (UTC-09:30) Marquesas Islands */
"Marquesas Standard Time", "Marquesas Daylight Time", "Marquesas Standard Time", "Marquesas Daylight Time",
...@@ -1103,7 +1108,7 @@ static const struct ...@@ -1103,7 +1108,7 @@ static const struct
"America/Montevideo" "America/Montevideo"
}, },
{ {
/* (UTC) Casablanca */ /* (UTC+01:00) Casablanca */
"Morocco Standard Time", "Morocco Daylight Time", "Morocco Standard Time", "Morocco Daylight Time",
"Africa/Casablanca" "Africa/Casablanca"
}, },
...@@ -1128,7 +1133,7 @@ static const struct ...@@ -1128,7 +1133,7 @@ static const struct
"Asia/Novosibirsk" "Asia/Novosibirsk"
}, },
{ {
/* (UTC+01:00) Windhoek */ /* (UTC+02:00) Windhoek */
"Namibia Standard Time", "Namibia Daylight Time", "Namibia Standard Time", "Namibia Daylight Time",
"Africa/Windhoek" "Africa/Windhoek"
}, },
...@@ -1163,12 +1168,22 @@ static const struct ...@@ -1163,12 +1168,22 @@ static const struct
"Asia/Krasnoyarsk" "Asia/Krasnoyarsk"
}, },
{ {
/* (UTC+08:30) Pyongyang */ /* (UTC+09:00) Pyongyang */
"North Korea Standard Time", "North Korea Daylight Time", "North Korea Standard Time", "North Korea Daylight Time",
"Asia/Pyongyang" "Asia/Pyongyang"
}, },
{ {
/* (UTC-03:00) Santiago */ /* (UTC+07:00) Novosibirsk */
"Novosibirsk Standard Time", "Novosibirsk Daylight Time",
"Asia/Novosibirsk"
},
{
/* (UTC+06:00) Omsk */
"Omsk Standard Time", "Omsk Daylight Time",
"Asia/Omsk"
},
{
/* (UTC-04:00) Santiago */
"Pacific SA Standard Time", "Pacific SA Daylight Time", "Pacific SA Standard Time", "Pacific SA Daylight Time",
"America/Santiago" "America/Santiago"
}, },
...@@ -1192,28 +1207,33 @@ static const struct ...@@ -1192,28 +1207,33 @@ static const struct
"Paraguay Standard Time", "Paraguay Daylight Time", "Paraguay Standard Time", "Paraguay Daylight Time",
"America/Asuncion" "America/Asuncion"
}, },
{
/* (UTC+05:00) Qyzylorda */
"Qyzylorda Standard Time", "Qyzylorda Daylight Time",
"Asia/Qyzylorda"
},
{ {
/* (UTC+01:00) Brussels, Copenhagen, Madrid, Paris */ /* (UTC+01:00) Brussels, Copenhagen, Madrid, Paris */
"Romance Standard Time", "Romance Daylight Time", "Romance Standard Time", "Romance Daylight Time",
"Europe/Brussels" "Europe/Brussels"
}, },
{ {
/* (UTC+02:00) Kaliningrad (RTZ 1) */ /* (UTC+02:00) Kaliningrad */
"Russia TZ 1 Standard Time", "Russia TZ 1 Daylight Time", "Russia TZ 1 Standard Time", "Russia TZ 1 Daylight Time",
"Europe/Kaliningrad" "Europe/Kaliningrad"
}, },
{ {
/* (UTC+03:00) Moscow, St. Petersburg, Volgograd (RTZ 2) */ /* (UTC+03:00) Moscow, St. Petersburg */
"Russia TZ 2 Standard Time", "Russia TZ 2 Daylight Time", "Russia TZ 2 Standard Time", "Russia TZ 2 Daylight Time",
"Europe/Moscow" "Europe/Moscow"
}, },
{ {
/* (UTC+04:00) Izhevsk, Samara (RTZ 3) */ /* (UTC+04:00) Izhevsk, Samara */
"Russia TZ 3 Standard Time", "Russia TZ 3 Daylight Time", "Russia TZ 3 Standard Time", "Russia TZ 3 Daylight Time",
"Europe/Samara" "Europe/Samara"
}, },
{ {
/* (UTC+05:00) Ekaterinburg (RTZ 4) */ /* (UTC+05:00) Ekaterinburg */
"Russia TZ 4 Standard Time", "Russia TZ 4 Daylight Time", "Russia TZ 4 Standard Time", "Russia TZ 4 Daylight Time",
"Asia/Yekaterinburg" "Asia/Yekaterinburg"
}, },
...@@ -1223,32 +1243,32 @@ static const struct ...@@ -1223,32 +1243,32 @@ static const struct
"Asia/Novosibirsk" "Asia/Novosibirsk"
}, },
{ {
/* (UTC+07:00) Krasnoyarsk (RTZ 6) */ /* (UTC+07:00) Krasnoyarsk */
"Russia TZ 6 Standard Time", "Russia TZ 6 Daylight Time", "Russia TZ 6 Standard Time", "Russia TZ 6 Daylight Time",
"Asia/Krasnoyarsk" "Asia/Krasnoyarsk"
}, },
{ {
/* (UTC+08:00) Irkutsk (RTZ 7) */ /* (UTC+08:00) Irkutsk */
"Russia TZ 7 Standard Time", "Russia TZ 7 Daylight Time", "Russia TZ 7 Standard Time", "Russia TZ 7 Daylight Time",
"Asia/Irkutsk" "Asia/Irkutsk"
}, },
{ {
/* (UTC+09:00) Yakutsk (RTZ 8) */ /* (UTC+09:00) Yakutsk */
"Russia TZ 8 Standard Time", "Russia TZ 8 Daylight Time", "Russia TZ 8 Standard Time", "Russia TZ 8 Daylight Time",
"Asia/Yakutsk" "Asia/Yakutsk"
}, },
{ {
/* (UTC+10:00) Vladivostok, Magadan (RTZ 9) */ /* (UTC+10:00) Vladivostok */
"Russia TZ 9 Standard Time", "Russia TZ 9 Daylight Time", "Russia TZ 9 Standard Time", "Russia TZ 9 Daylight Time",
"Asia/Vladivostok" "Asia/Vladivostok"
}, },
{ {
/* (UTC+11:00) Chokurdakh (RTZ 10) */ /* (UTC+11:00) Chokurdakh */
"Russia TZ 10 Standard Time", "Russia TZ 10 Daylight Time", "Russia TZ 10 Standard Time", "Russia TZ 10 Daylight Time",
"Asia/Magadan" "Asia/Magadan"
}, },
{ {
/* (UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky (RTZ 11) */ /* (UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky */
"Russia TZ 11 Standard Time", "Russia TZ 11 Daylight Time", "Russia TZ 11 Standard Time", "Russia TZ 11 Daylight Time",
"Asia/Anadyr" "Asia/Anadyr"
}, },
...@@ -1282,6 +1302,16 @@ static const struct ...@@ -1282,6 +1302,16 @@ static const struct
"Samoa Standard Time", "Samoa Daylight Time", "Samoa Standard Time", "Samoa Daylight Time",
"Pacific/Samoa" "Pacific/Samoa"
}, },
{
/* (UTC+00:00) Sao Tome */
"Sao Tome Standard Time", "Sao Tome Daylight Time",
"Africa/Sao_Tome"
},
{
/* (UTC+04:00) Saratov */
"Saratov Standard Time", "Saratov Daylight Time",
"Europe/Saratov"
},
{ {
/* (UTC+07:00) Bangkok, Hanoi, Jakarta */ /* (UTC+07:00) Bangkok, Hanoi, Jakarta */
"SE Asia Standard Time", "SE Asia Daylight Time", "SE Asia Standard Time", "SE Asia Daylight Time",
...@@ -1307,6 +1337,11 @@ static const struct ...@@ -1307,6 +1337,11 @@ static const struct
"Sri Lanka Standard Time", "Sri Lanka Daylight Time", "Sri Lanka Standard Time", "Sri Lanka Daylight Time",
"Asia/Colombo" "Asia/Colombo"
}, },
{
/* (UTC+02:00) Khartoum */
"Sudan Standard Time", "Sudan Daylight Time",
"Africa/Khartoum"
},
{ {
/* (UTC+02:00) Damascus */ /* (UTC+02:00) Damascus */
"Syria Standard Time", "Syria Daylight Time", "Syria Standard Time", "Syria Daylight Time",
...@@ -1348,12 +1383,12 @@ static const struct ...@@ -1348,12 +1383,12 @@ static const struct
"Asia/Chita" "Asia/Chita"
}, },
{ {
/* (UTC+02:00) Istanbul */ /* (UTC+03:00) Istanbul */
"Turkey Standard Time", "Turkey Daylight Time", "Turkey Standard Time", "Turkey Daylight Time",
"Europe/Istanbul" "Europe/Istanbul"
}, },
{ {
/* (UTC-04:00) Turks and Caicos */ /* (UTC-05:00) Turks and Caicos */
"Turks and Caicos Standard Time", "Turks and Caicos Daylight Time", "Turks and Caicos Standard Time", "Turks and Caicos Daylight Time",
"America/Grand_Turk" "America/Grand_Turk"
}, },
...@@ -1382,6 +1417,11 @@ static const struct ...@@ -1382,6 +1417,11 @@ static const struct
"UTC+12", "UTC+12", "UTC+12", "UTC+12",
"Etc/GMT+12" "Etc/GMT+12"
}, },
{
/* (UTC+13:00) Coordinated Universal Time+13 */
"UTC+13", "UTC+13",
"Etc/GMT+13"
},
{ {
/* (UTC-02:00) Coordinated Universal Time-02 */ /* (UTC-02:00) Coordinated Universal Time-02 */
"UTC-02", "UTC-02", "UTC-02", "UTC-02",
...@@ -1403,7 +1443,7 @@ static const struct ...@@ -1403,7 +1443,7 @@ static const struct
"Etc/GMT-11" "Etc/GMT-11"
}, },
{ {
/* (UTC-04:30) Caracas */ /* (UTC-04:00) Caracas */
"Venezuela Standard Time", "Venezuela Daylight Time", "Venezuela Standard Time", "Venezuela Daylight Time",
"America/Caracas", "America/Caracas",
}, },
...@@ -1412,6 +1452,11 @@ static const struct ...@@ -1412,6 +1452,11 @@ static const struct
"Vladivostok Standard Time", "Vladivostok Daylight Time", "Vladivostok Standard Time", "Vladivostok Daylight Time",
"Asia/Vladivostok" "Asia/Vladivostok"
}, },
{
/* (UTC+04:00) Volgograd */
"Volgograd Standard Time", "Volgograd Daylight Time",
"Europe/Volgograd"
},
{ {
/* (UTC+08:00) Perth */ /* (UTC+08:00) Perth */
"W. Australia Standard Time", "W. Australia Daylight Time", "W. Australia Standard Time", "W. Australia Daylight Time",
......
...@@ -124,7 +124,7 @@ if (@add) ...@@ -124,7 +124,7 @@ if (@add)
for my $z (@add) for my $z (@add)
{ {
print print
"\t{\n\t\t\"$z->{std}\", \"$z->{dlt}\",\n\t\t\"FIXME\"\n\t},\t\t\t\t\t\t\t/* $z->{display} */\n"; "\t{\n\t\t/* $z->{display} */\n\t\t\"$z->{std}\", \"$z->{dlt}\",\n\t\t\"FIXME\"\n\t},\n";
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment