database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

Avoid conflicts with collation aliases generated by stripping.

Browse Source 
This resulted in failures depending on the order of "locale -a" output.
The original coding in initdb sorted the results, but that should be
unnecessary as long as "locale -a" doesn't print duplicate names.  The
original entries will then all be non-dups, and while we might generate
duplicate aliases by stripping, they should be for different encodings and
thus not conflict.  Even if the latter assumption fails somehow, it won't
be fatal because we're using if_not_exists mode for the aliases.

Discussion: https://postgr.es/m/26116.1484751196%40sss.pgh.pa.us
This commit is contained in:
Tom Lane
2017-01-18 13:44:19 -05:00
parent 215b43cdc8
commit 0333a73400
1 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/backend/commands/collationcmds.c
View File

@ -229,6 +229,12 @@ pg_import_system_collations(PG_FUNCTION_ARGS)
FILE *locale_a_handle; FILE *locale_a_handle;
char localebuf[NAMEDATALEN]; /* we assume ASCII so this is fine */ char localebuf[NAMEDATALEN]; /* we assume ASCII so this is fine */
int count = 0; int count = 0;
List *aliaslist = NIL;
List *localelist = NIL;
List *enclist = NIL;
ListCell *lca,
*lcl,
*lce;
#endif #endif
if (!superuser()) if (!superuser())
@ -306,22 +312,32 @@ pg_import_system_collations(PG_FUNCTION_ARGS)
* ease of use. Note that collation names are unique per encoding * ease of use. Note that collation names are unique per encoding
* only, so this doesn't clash with "en_US" for LATIN1, say. * only, so this doesn't clash with "en_US" for LATIN1, say.
* *
* This always runs in "if not exists" mode, to skip aliases that * However, it might conflict with a name we'll see later in the
* conflict with an existing locale name for the same encoding. For * "locale -a" output. So save up the aliases and try to add them
* example, "br_FR.iso88591" is normalized to "br_FR", both for * after we've read all the output.
* encoding LATIN1. But the unnormalized locale "br_FR" already
* exists for LATIN1.
*/ */
if (normalize_locale_name(alias, localebuf)) if (normalize_locale_name(alias, localebuf))
{ {
CollationCreate(alias, nspid, GetUserId(), enc, aliaslist = lappend(aliaslist, pstrdup(alias));
localebuf, localebuf, true); localelist = lappend(localelist, pstrdup(localebuf));
CommandCounterIncrement(); enclist = lappend_int(enclist, enc);
} }
} }
ClosePipeStream(locale_a_handle); ClosePipeStream(locale_a_handle);
/* Now try to add any aliases we created */
forthree(lca, aliaslist, lcl, localelist, lce, enclist)
{
char *alias = (char *) lfirst(lca);
char *locale = (char *) lfirst(lcl);
int enc = lfirst_int(lce);
CollationCreate(alias, nspid, GetUserId(), enc,
locale, locale, true);
CommandCounterIncrement();
}
if (count == 0) if (count == 0)
ereport(ERROR, ereport(ERROR,
(errmsg("no usable system locales were found"))); (errmsg("no usable system locales were found")));