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

diff --git a/src/bin/initdb/findtimezone.c b/src/bin/initdb/findtimezone.c
index 3c2b8d4e298f38391b9f5fa8235f06f6b2d5be44..82cd7eebdbeac2f48f0a953fb6f30d5f2b3b1e18 100644 (file)
--- a/src/bin/initdb/findtimezone.c
+++ b/src/bin/initdb/findtimezone.c
@@ -832,26 +832,21 @@ static const struct
                "Bangladesh Standard Time", "Bangladesh Daylight Time",
                "Asia/Dhaka"
        },
-       {
-               /* (UTC+11:00) Bougainville Island */
-               "Bougainville Standard Time", "Bougainville Daylight Time",
-               "Pacific/Bougainville"
-       },
        {
                /* (UTC+03:00) Minsk */
                "Belarus Standard Time", "Belarus Daylight Time",
                "Europe/Minsk"
        },
+       {
+               /* (UTC+11:00) Bougainville Island */
+               "Bougainville Standard Time", "Bougainville Daylight Time",
+               "Pacific/Bougainville"
+       },
        {
                /* (UTC-01:00) Cabo Verde Is. */
                "Cabo Verde Standard Time", "Cabo Verde Daylight Time",
                "Atlantic/Cape_Verde"
        },
-       {
-               /* (UTC+12:45) Chatham Islands */
-               "Chatham Islands Standard Time", "Chatham Islands Daylight Time",
-               "Pacific/Chatham"
-       },
        {
                /* (UTC-06:00) Saskatchewan */
                "Canada Central Standard Time", "Canada Central Daylight Time",
@@ -913,11 +908,21 @@ static const struct
                "Central Standard Time (Mexico)", "Central Daylight Time (Mexico)",
                "America/Mexico_City"
        },
+       {
+               /* (UTC+12:45) Chatham Islands */
+               "Chatham Islands Standard Time", "Chatham Islands Daylight Time",
+               "Pacific/Chatham"
+       },
        {
                /* (UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi */
                "China Standard Time", "China Daylight Time",
                "Asia/Hong_Kong"
        },
+       {
+               /* (UTC) Coordinated Universal Time */
+               "Coordinated Universal Time", "Coordinated Universal Time",
+               "UTC"
+       },
        {
                /* (UTC-05:00) Havana */
                "Cuba Standard Time", "Cuba Daylight Time",
@@ -948,6 +953,11 @@ static const struct
                "E. South America Standard Time", "E. South America Daylight Time",
                "America/Araguaina"
        },
+       {
+               /* (UTC-06:00) Easter Island */
+               "Easter Island Standard Time", "Easter Island Daylight Time",
+               "Pacific/Easter"
+       },
        {
                /* (UTC-05:00) Eastern Time (US & Canada) */
                "Eastern Standard Time", "Eastern Daylight Time",
@@ -958,11 +968,6 @@ static const struct
                "Eastern Standard Time (Mexico)", "Eastern Daylight Time (Mexico)",
                "America/Mexico_City"
        },
-       {
-               /* (UTC-06:00) Easter Island */
-               "Easter Island Standard Time", "Easter Island Daylight Time",
-               "Pacific/Easter"
-       },
        {
                /* (UTC+02:00) Cairo */
                "Egypt Standard Time", "Egypt Daylight Time",
@@ -1073,6 +1078,11 @@ static const struct
                "Magallanes Standard Time", "Magallanes Daylight Time",
                "America/Punta_Arenas"
        },
+       {
+               /* (UTC+08:00) Kuala Lumpur, Singapore */
+               "Malay Peninsula Standard Time", "Malay Peninsula Daylight Time",
+               "Asia/Kuala_Lumpur"
+       },
        {
                /* (UTC-09:30) Marquesas Islands */
                "Marquesas Standard Time", "Marquesas Daylight Time",
@@ -1298,6 +1308,11 @@ static const struct
                "Saint Pierre Standard Time", "Saint Pierre Daylight Time",
                "America/Miquelon"
        },
+       {
+               /* (UTC+11:00) Sakhalin */
+               "Sakhalin Standard Time", "Sakhalin Daylight Time",
+               "Asia/Sakhalin"
+       },
        {
                /* (UTC+13:00) Samoa */
                "Samoa Standard Time", "Samoa Daylight Time",
@@ -1318,16 +1333,6 @@ static const struct
                "SE Asia Standard Time", "SE Asia Daylight Time",
                "Asia/Bangkok"
        },
-       {
-               /* (UTC+08:00) Kuala Lumpur, Singapore */
-               "Malay Peninsula Standard Time", "Malay Peninsula Daylight Time",
-               "Asia/Kuala_Lumpur"
-       },
-       {
-               /* (UTC+11:00) Sakhalin */
-               "Sakhalin Standard Time", "Sakhalin Daylight Time",
-               "Asia/Sakhalin"
-       },
        {
                /* (UTC+02:00) Harare, Pretoria */
                "South Africa Standard Time", "South Africa Daylight Time",
@@ -1368,16 +1373,16 @@ static const struct
                "Tokyo Standard Time", "Tokyo Daylight Time",
                "Asia/Tokyo"
        },
-       {
-               /* (UTC+13:00) Nuku'alofa */
-               "Tonga Standard Time", "Tonga Daylight Time",
-               "Pacific/Tongatapu"
-       },
        {
                /* (UTC+07:00) Tomsk */
                "Tomsk Standard Time", "Tomsk Daylight Time",
                "Asia/Tomsk"
        },
+       {
+               /* (UTC+13:00) Nuku'alofa */
+               "Tonga Standard Time", "Tonga Daylight Time",
+               "Pacific/Tongatapu"
+       },
        {
                /* (UTC+09:00) Chita */
                "Transbaikal Standard Time", "Transbaikal Daylight Time",
@@ -1408,11 +1413,6 @@ static const struct
                "US Mountain Standard Time", "US Mountain Daylight Time",
                "US/Arizona"
        },
-       {
-               /* (UTC) Coordinated Universal Time */
-               "Coordinated Universal Time", "Coordinated Universal Time",
-               "UTC"
-       },
        {
                /* (UTC+12:00) Coordinated Universal Time+12 */
                "UTC+12", "UTC+12",