Skip to content

Commit ad74006

Browse files
tglsfdctglsfdc
committed
Re-alphabetize the win32_tzmap[] array.
The original intent seems to have been to sort case-insensitively by the Windows zone name, but various changes over the years did not get that memo. This commit just moves a few entries to restore exact alphabetic order, to ease comparison to the outputs of processing scripts. Back-patch to all supported branches, as is our usual practice for time zone data updates. Discussion: https://postgr.es/m/3266414.1633045628@sss.pgh.pa.us
1 parent 2b0da03 commit ad74006

File tree

1 file changed

+35
-35
lines changed

1 file changed

+35
-35
lines changed

‎src/bin/initdb/findtimezone.c

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -832,26 +832,21 @@ static const struct
832832
"Bangladesh Standard Time", "Bangladesh Daylight Time",
833833
"Asia/Dhaka"
834834
},
835-
{
836-
/* (UTC+11:00) Bougainville Island */
837-
"Bougainville Standard Time", "Bougainville Daylight Time",
838-
"Pacific/Bougainville"
839-
},
840835
{
841836
/* (UTC+03:00) Minsk */
842837
"Belarus Standard Time", "Belarus Daylight Time",
843838
"Europe/Minsk"
844839
},
840+
{
841+
/* (UTC+11:00) Bougainville Island */
842+
"Bougainville Standard Time", "Bougainville Daylight Time",
843+
"Pacific/Bougainville"
844+
},
845845
{
846846
/* (UTC-01:00) Cabo Verde Is. */
847847
"Cabo Verde Standard Time", "Cabo Verde Daylight Time",
848848
"Atlantic/Cape_Verde"
849849
},
850-
{
851-
/* (UTC+12:45) Chatham Islands */
852-
"Chatham Islands Standard Time", "Chatham Islands Daylight Time",
853-
"Pacific/Chatham"
854-
},
855850
{
856851
/* (UTC-06:00) Saskatchewan */
857852
"Canada Central Standard Time", "Canada Central Daylight Time",
@@ -913,11 +908,21 @@ static const struct
913908
"Central Standard Time (Mexico)", "Central Daylight Time (Mexico)",
914909
"America/Mexico_City"
915910
},
911+
{
912+
/* (UTC+12:45) Chatham Islands */
913+
"Chatham Islands Standard Time", "Chatham Islands Daylight Time",
914+
"Pacific/Chatham"
915+
},
916916
{
917917
/* (UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi */
918918
"China Standard Time", "China Daylight Time",
919919
"Asia/Hong_Kong"
920920
},
921+
{
922+
/* (UTC) Coordinated Universal Time */
923+
"Coordinated Universal Time", "Coordinated Universal Time",
924+
"UTC"
925+
},
921926
{
922927
/* (UTC-05:00) Havana */
923928
"Cuba Standard Time", "Cuba Daylight Time",
@@ -948,6 +953,11 @@ static const struct
948953
"E. South America Standard Time", "E. South America Daylight Time",
949954
"America/Araguaina"
950955
},
956+
{
957+
/* (UTC-06:00) Easter Island */
958+
"Easter Island Standard Time", "Easter Island Daylight Time",
959+
"Pacific/Easter"
960+
},
951961
{
952962
/* (UTC-05:00) Eastern Time (US & Canada) */
953963
"Eastern Standard Time", "Eastern Daylight Time",
@@ -958,11 +968,6 @@ static const struct
958968
"Eastern Standard Time (Mexico)", "Eastern Daylight Time (Mexico)",
959969
"America/Mexico_City"
960970
},
961-
{
962-
/* (UTC-06:00) Easter Island */
963-
"Easter Island Standard Time", "Easter Island Daylight Time",
964-
"Pacific/Easter"
965-
},
966971
{
967972
/* (UTC+02:00) Cairo */
968973
"Egypt Standard Time", "Egypt Daylight Time",
@@ -1073,6 +1078,11 @@ static const struct
10731078
"Magallanes Standard Time", "Magallanes Daylight Time",
10741079
"America/Punta_Arenas"
10751080
},
1081+
{
1082+
/* (UTC+08:00) Kuala Lumpur, Singapore */
1083+
"Malay Peninsula Standard Time", "Malay Peninsula Daylight Time",
1084+
"Asia/Kuala_Lumpur"
1085+
},
10761086
{
10771087
/* (UTC-09:30) Marquesas Islands */
10781088
"Marquesas Standard Time", "Marquesas Daylight Time",
@@ -1298,6 +1308,11 @@ static const struct
12981308
"Saint Pierre Standard Time", "Saint Pierre Daylight Time",
12991309
"America/Miquelon"
13001310
},
1311+
{
1312+
/* (UTC+11:00) Sakhalin */
1313+
"Sakhalin Standard Time", "Sakhalin Daylight Time",
1314+
"Asia/Sakhalin"
1315+
},
13011316
{
13021317
/* (UTC+13:00) Samoa */
13031318
"Samoa Standard Time", "Samoa Daylight Time",
@@ -1318,16 +1333,6 @@ static const struct
13181333
"SE Asia Standard Time", "SE Asia Daylight Time",
13191334
"Asia/Bangkok"
13201335
},
1321-
{
1322-
/* (UTC+08:00) Kuala Lumpur, Singapore */
1323-
"Malay Peninsula Standard Time", "Malay Peninsula Daylight Time",
1324-
"Asia/Kuala_Lumpur"
1325-
},
1326-
{
1327-
/* (UTC+11:00) Sakhalin */
1328-
"Sakhalin Standard Time", "Sakhalin Daylight Time",
1329-
"Asia/Sakhalin"
1330-
},
13311336
{
13321337
/* (UTC+02:00) Harare, Pretoria */
13331338
"South Africa Standard Time", "South Africa Daylight Time",
@@ -1368,16 +1373,16 @@ static const struct
13681373
"Tokyo Standard Time", "Tokyo Daylight Time",
13691374
"Asia/Tokyo"
13701375
},
1371-
{
1372-
/* (UTC+13:00) Nuku'alofa */
1373-
"Tonga Standard Time", "Tonga Daylight Time",
1374-
"Pacific/Tongatapu"
1375-
},
13761376
{
13771377
/* (UTC+07:00) Tomsk */
13781378
"Tomsk Standard Time", "Tomsk Daylight Time",
13791379
"Asia/Tomsk"
13801380
},
1381+
{
1382+
/* (UTC+13:00) Nuku'alofa */
1383+
"Tonga Standard Time", "Tonga Daylight Time",
1384+
"Pacific/Tongatapu"
1385+
},
13811386
{
13821387
/* (UTC+09:00) Chita */
13831388
"Transbaikal Standard Time", "Transbaikal Daylight Time",
@@ -1408,11 +1413,6 @@ static const struct
14081413
"US Mountain Standard Time", "US Mountain Daylight Time",
14091414
"US/Arizona"
14101415
},
1411-
{
1412-
/* (UTC) Coordinated Universal Time */
1413-
"Coordinated Universal Time", "Coordinated Universal Time",
1414-
"UTC"
1415-
},
14161416
{
14171417
/* (UTC+12:00) Coordinated Universal Time+12 */
14181418
"UTC+12", "UTC+12",

0 commit comments

Comments
 (0)