Update our mapping of Windows time zone names some more.

tglsfdc · tglsfdc · commit cd2479142588 · 2021-10-04T14:52:17.000-04:00
Per discussion, let's just follow CLDR's default zone mappings faithfully. There are two changes here that are clear improvements: * Mapping "Greenwich Standard Time" to Atlantic/Reykjavik is actually a better fit than using London, because Iceland hasn't observed DST since 1968, so this is more nearly what people might expect. * Since the "Samoa" zone is specified to be UTC+13:00, we must map it to Pacific/Apia not Pacific/Samoa; the latter refers to American Samoa which is now on the other side of the date line. The rest of these changes look like they're choosing the most populous IANA zone as representative. Whatever the details, we're just going to say "if you don't like this mapping, complain to CLDR". 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
@@ -740,8 +740,8 @@ static const struct
 	 * additions have been made by comparing to the CLDR project's
 	 * windowsZones.xml file.
 	 *
-	 * The zones have been matched to IANA timezones based on CLDR's mapping,
-	 * with a few manual exceptions.
+	 * The zones have been matched to IANA timezones based on CLDR's mapping
+	 * for "territory 001".
 	 */
 	{
 		/* (UTC+04:30) Kabul */
@@ -868,11 +868,10 @@ static const struct
 		"Cen. Australia Standard Time", "Cen. Australia Daylight Time",
 		"Australia/Adelaide"
 	},
-	/* Central America (other than Mexico) generally does not observe DST */
 	{
 		/* (UTC-06:00) Central America */
 		"Central America Standard Time", "Central America Daylight Time",
-		"CST6"
+		"America/Guatemala"
 	},
 	{
 		/* (UTC+06:00) Astana */
@@ -887,7 +886,7 @@ static const struct
 	{
 		/* (UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague */
 		"Central Europe Standard Time", "Central Europe Daylight Time",
-		"Europe/Belgrade"
+		"Europe/Budapest"
 	},
 	{
 		/* (UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb */
@@ -897,7 +896,7 @@ static const struct
 	{
 		/* (UTC+11:00) Solomon Is., New Caledonia */
 		"Central Pacific Standard Time", "Central Pacific Daylight Time",
-		"Pacific/Noumea"
+		"Pacific/Guadalcanal"
 	},
 	{
 		/* (UTC-06:00) Central Time (US & Canada) */
@@ -987,7 +986,7 @@ static const struct
 	{
 		/* (UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius */
 		"FLE Standard Time", "FLE Daylight Time",
-		"Europe/Helsinki"
+		"Europe/Kiev"
 	},
 	{
 		/* (UTC+04:00) Tbilisi */
@@ -1009,16 +1008,17 @@ static const struct
 		 * Windows uses this zone name in various places that lie near the
 		 * prime meridian, but are not in the UK.  However, most people
 		 * probably think that "Greenwich" means UK civil time, or maybe even
-		 * straight-up UTC.  Hence, map to Europe/London.
+		 * straight-up UTC.  Atlantic/Reykjavik is a decent match for that
+		 * interpretation because Iceland hasn't observed DST since 1968.
 		 */
 		/* (UTC+00:00) Monrovia, Reykjavik */
 		"Greenwich Standard Time", "Greenwich Daylight Time",
-		"Europe/London"
+		"Atlantic/Reykjavik"
 	},
 	{
 		/* (UTC+02:00) Athens, Bucharest */
 		"GTB Standard Time", "GTB Daylight Time",
-		"Europe/Athens"
+		"Europe/Bucharest"
 	},
 	{
 		/* (UTC-05:00) Haiti */
@@ -1243,7 +1243,7 @@ static const struct
 	{
 		/* (UTC+01:00) Brussels, Copenhagen, Madrid, Paris */
 		"Romance Standard Time", "Romance Daylight Time",
-		"Europe/Brussels"
+		"Europe/Paris"
 	},
 	{
 		/* (UTC+04:00) Izhevsk, Samara */
@@ -1348,7 +1348,7 @@ static const struct
 	{
 		/* (UTC+13:00) Samoa */
 		"Samoa Standard Time", "Samoa Daylight Time",
-		"Pacific/Samoa"
+		"Pacific/Apia"
 	},
 	{
 		/* (UTC+00:00) Sao Tome */
@@ -1518,7 +1518,7 @@ static const struct
 	{
 		/* (UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna */
 		"W. Europe Standard Time", "W. Europe Daylight Time",
-		"CET"
+		"Europe/Berlin"
 	},
 	{
 		/* (UTC+07:00) Hovd */
@@ -1543,7 +1543,7 @@ static const struct
 	{
 		/* (UTC+10:00) Guam, Port Moresby */
 		"West Pacific Standard Time", "West Pacific Daylight Time",
-		"Pacific/Guam"
+		"Pacific/Port_Moresby"
 	},
 	{
 		/* (UTC+09:00) Yakutsk */

Original file line number	Diff line number	Diff line change
`@@ -740,8 +740,8 @@ static const struct`
`740`	`740`	`* additions have been made by comparing to the CLDR project's`
`741`	`741`	`* windowsZones.xml file.`
`742`	`742`	`*`
`743`		`- * The zones have been matched to IANA timezones based on CLDR's mapping,`
`744`		`- * with a few manual exceptions.`
	`743`	`+ * The zones have been matched to IANA timezones based on CLDR's mapping`
	`744`	`+ * for "territory 001".`
`745`	`745`	`*/`
`746`	`746`	`{`
`747`	`747`	`/* (UTC+04:30) Kabul */`
`@@ -868,11 +868,10 @@ static const struct`
`868`	`868`	`"Cen. Australia Standard Time", "Cen. Australia Daylight Time",`
`869`	`869`	`"Australia/Adelaide"`
`870`	`870`	`},`
`871`		`- /* Central America (other than Mexico) generally does not observe DST */`
`872`	`871`	`{`
`873`	`872`	`/* (UTC-06:00) Central America */`
`874`	`873`	`"Central America Standard Time", "Central America Daylight Time",`
`875`		`- "CST6"`
	`874`	`+ "America/Guatemala"`
`876`	`875`	`},`
`877`	`876`	`{`
`878`	`877`	`/* (UTC+06:00) Astana */`
`@@ -887,7 +886,7 @@ static const struct`
`887`	`886`	`{`
`888`	`887`	`/* (UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague */`
`889`	`888`	`"Central Europe Standard Time", "Central Europe Daylight Time",`
`890`		`- "Europe/Belgrade"`
	`889`	`+ "Europe/Budapest"`
`891`	`890`	`},`
`892`	`891`	`{`
`893`	`892`	`/* (UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb */`
`@@ -897,7 +896,7 @@ static const struct`
`897`	`896`	`{`
`898`	`897`	`/* (UTC+11:00) Solomon Is., New Caledonia */`
`899`	`898`	`"Central Pacific Standard Time", "Central Pacific Daylight Time",`
`900`		`- "Pacific/Noumea"`
	`899`	`+ "Pacific/Guadalcanal"`
`901`	`900`	`},`
`902`	`901`	`{`
`903`	`902`	`/* (UTC-06:00) Central Time (US & Canada) */`
`@@ -987,7 +986,7 @@ static const struct`
`987`	`986`	`{`
`988`	`987`	`/* (UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius */`
`989`	`988`	`"FLE Standard Time", "FLE Daylight Time",`
`990`		`- "Europe/Helsinki"`
	`989`	`+ "Europe/Kiev"`
`991`	`990`	`},`
`992`	`991`	`{`
`993`	`992`	`/* (UTC+04:00) Tbilisi */`
`@@ -1009,16 +1008,17 @@ static const struct`
`1009`	`1008`	`* Windows uses this zone name in various places that lie near the`
`1010`	`1009`	`* prime meridian, but are not in the UK. However, most people`
`1011`	`1010`	`* probably think that "Greenwich" means UK civil time, or maybe even`
`1012`		`- * straight-up UTC. Hence, map to Europe/London.`
	`1011`	`+ * straight-up UTC. Atlantic/Reykjavik is a decent match for that`
	`1012`	`+ * interpretation because Iceland hasn't observed DST since 1968.`
`1013`	`1013`	`*/`
`1014`	`1014`	`/* (UTC+00:00) Monrovia, Reykjavik */`
`1015`	`1015`	`"Greenwich Standard Time", "Greenwich Daylight Time",`
`1016`		`- "Europe/London"`
	`1016`	`+ "Atlantic/Reykjavik"`
`1017`	`1017`	`},`
`1018`	`1018`	`{`
`1019`	`1019`	`/* (UTC+02:00) Athens, Bucharest */`
`1020`	`1020`	`"GTB Standard Time", "GTB Daylight Time",`
`1021`		`- "Europe/Athens"`
	`1021`	`+ "Europe/Bucharest"`
`1022`	`1022`	`},`
`1023`	`1023`	`{`
`1024`	`1024`	`/* (UTC-05:00) Haiti */`
`@@ -1243,7 +1243,7 @@ static const struct`
`1243`	`1243`	`{`
`1244`	`1244`	`/* (UTC+01:00) Brussels, Copenhagen, Madrid, Paris */`
`1245`	`1245`	`"Romance Standard Time", "Romance Daylight Time",`
`1246`		`- "Europe/Brussels"`
	`1246`	`+ "Europe/Paris"`
`1247`	`1247`	`},`
`1248`	`1248`	`{`
`1249`	`1249`	`/* (UTC+04:00) Izhevsk, Samara */`
`@@ -1348,7 +1348,7 @@ static const struct`
`1348`	`1348`	`{`
`1349`	`1349`	`/* (UTC+13:00) Samoa */`
`1350`	`1350`	`"Samoa Standard Time", "Samoa Daylight Time",`
`1351`		`- "Pacific/Samoa"`
	`1351`	`+ "Pacific/Apia"`
`1352`	`1352`	`},`
`1353`	`1353`	`{`
`1354`	`1354`	`/* (UTC+00:00) Sao Tome */`
`@@ -1518,7 +1518,7 @@ static const struct`
`1518`	`1518`	`{`
`1519`	`1519`	`/* (UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna */`
`1520`	`1520`	`"W. Europe Standard Time", "W. Europe Daylight Time",`
`1521`		`- "CET"`
	`1521`	`+ "Europe/Berlin"`
`1522`	`1522`	`},`
`1523`	`1523`	`{`
`1524`	`1524`	`/* (UTC+07:00) Hovd */`
`@@ -1543,7 +1543,7 @@ static const struct`
`1543`	`1543`	`{`
`1544`	`1544`	`/* (UTC+10:00) Guam, Port Moresby */`
`1545`	`1545`	`"West Pacific Standard Time", "West Pacific Daylight Time",`
`1546`		`- "Pacific/Guam"`
	`1546`	`+ "Pacific/Port_Moresby"`
`1547`	`1547`	`},`
`1548`	`1548`	`{`
`1549`	`1549`	`/* (UTC+09:00) Yakutsk */`