On Wed, Nov 4, 2020 at 10:56 AM Thomas Munro <thomas.mu...@gmail.com> wrote: > On Wed, Nov 4, 2020 at 10:52 AM Tom Lane <t...@sss.pgh.pa.us> wrote: > > Thomas Munro <thomas.mu...@gmail.com> writes: > > > We want the same algorithm that Windows uses internally to resolve the > > > old style name to a collation; in other words we probably want > > > something more like the code path that they took away in VS2015 :-(. > > > > Yeah. In the short run, though, it'd be nice to un-break the buildfarm. > > Maybe we could push David's code or something similar, and then > > contemplate better ways at leisure? > > Ok, yeah, I'll do that in the next few hours.
I can't bring myself to commit that, it's not really in the spirit of this data integrity feature, and it's not our business to second guess the relationship between different locale naming schemes through fuzzy logic. Instead, I propose to just neuter the feature if Windows decides it can't understand a locale names that it gave us. It should still work fine with something like initdb --lc-collate=en-US. Here's an untested patch. Thoughts?
From 0e99688adb3c1b18c01fbfd8e2488e5769309fc7 Mon Sep 17 00:00:00 2001 From: Thomas Munro <thomas.mu...@gmail.com> Date: Wed, 4 Nov 2020 13:49:05 +1300 Subject: [PATCH] Tolerate version lookup failure for old-style Windows locale names. Accept that we can't get versions for such locale names for now, leaving it up to the user to provide the modern language tag format to benefit from the collation versioning feature. It's not clear that we can do the conversion from the old style to the new style reliably enough for this purpose. Unfortunately, this includes the values that are typically installed as database default by initdb, so it'd be nice to find a better solution than this. Discussion: https://postgr.es/m/CAEepm%3D0uEQCpfq_%2BLYFBdArCe4Ot98t1aR4eYiYTe%3DyavQygiQ%40mail.gmail.com --- src/backend/utils/adt/pg_locale.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c index 3b0324ce18..d5a0169420 100644 --- a/src/backend/utils/adt/pg_locale.c +++ b/src/backend/utils/adt/pg_locale.c @@ -1702,10 +1702,22 @@ get_collation_actual_version(char collprovider, const char *collcollate) MultiByteToWideChar(CP_ACP, 0, collcollate, -1, wide_collcollate, LOCALE_NAME_MAX_LENGTH); if (!GetNLSVersionEx(COMPARE_STRING, wide_collcollate, &version)) + { + /* + * GetNLSVersionEx() wants a language tag such as "en-US", not a + * locale name like "English_United States.1252". Until those + * values can be prevented from entering the system, or 100% + * reliably converted to the more useful tag format, tolerate the + * resulting error and report that we have no version data. + */ + if (GetLastError() == ERROR_INVALID_PARAMETER) + return NULL; + ereport(ERROR, (errmsg("could not get collation version for locale \"%s\": error code %lu", collcollate, GetLastError()))); + } collversion = psprintf("%d.%d,%d.%d", (version.dwNLSVersion >> 8) & 0xFFFF, version.dwNLSVersion & 0xFF, -- 2.20.1
