rdelaage/postgresql
1
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-09-30 16:21:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow unrecognized encoding names in locales, as long as they're the same.

Browse Source 
The buildfarm says commit 58274728fb doesn't
work so well on Windows.  This is because the encoding part of Windows
locale names can be just a code page number, eg "1252", which we don't
consider to be a valid encoding name.  Add a check to accept encoding
parts that are case-insensitively string equal; this at least ensures
that the new code doesn't reject any cases that the old code allowed.
This commit is contained in:
Tom Lane 2014-01-31 02:03:30 -05:00
parent db98b31329
commit cd3e0071b8
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
contrib/pg_upgrade/check.c
View File

@ -437,8 +437,14 @@ equivalent_locale(const char *loca, const char *locb)
if (!chara || !charb)
return (pg_strcasecmp(loca, locb) == 0);
/* Compare the encoding parts. */
if (!equivalent_encoding(chara + 1, charb + 1))
/*
* Compare the encoding parts. Windows tends to use code page numbers for
* the encoding part, which equivalent_encoding() won't like, so accept if
* the strings are case-insensitive equal; otherwise use
* equivalent_encoding() to compare.
*/
if (pg_strcasecmp(chara + 1, charb + 1) != 0 &&
!equivalent_encoding(chara + 1, charb + 1))
return false;
/*