Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit37d4fd2

Browse files
committed
Improve reporting of newlocale() failures in CREATE COLLATION.
The standardized errno code for "no such locale" failures is ENOENT, whichwe were just reporting at face value, viz "No such file or directory".Per gripe from Thom Brown, this might confuse users, so add an errdetailmessage to clarify what it means. Also, report newlocale() failures asERRCODE_INVALID_PARAMETER_VALUE rather than usingerrcode_for_file_access(), since newlocale()'s errno values aren'tnecessarily tied directly to file access failures.
1 parentfaf5cee commit37d4fd2

File tree

1 file changed

+25
-14
lines changed

1 file changed

+25
-14
lines changed

‎src/backend/utils/adt/pg_locale.c

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -707,8 +707,7 @@ cache_locale_time(void)
707707
*otherwise returns the pointer to a static area which
708708
*contains the iso formatted locale name.
709709
*/
710-
static
711-
char*
710+
staticchar*
712711
IsoLocaleName(constchar*winlocname)
713712
{
714713
#if (_MSC_VER >=1400)/* VC8.0 or later */
@@ -937,6 +936,27 @@ lc_ctype_is_c(Oid collation)
937936
}
938937

939938

939+
/* simple subroutine for reporting errors from newlocale() */
940+
staticvoid
941+
report_newlocale_failure(constchar*localename)
942+
{
943+
/* copy errno in case one of the ereport auxiliary functions changes it */
944+
intsave_errno=errno;
945+
946+
/*
947+
* ENOENT means "no such locale", not "no such file", so clarify that
948+
* errno with an errdetail message.
949+
*/
950+
ereport(ERROR,
951+
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
952+
errmsg("could not create locale \"%s\": %m",
953+
localename),
954+
(save_errno==ENOENT ?
955+
errdetail("The operating system could not find any locale data for the locale name \"%s\".",
956+
localename) :0)));
957+
}
958+
959+
940960
/*
941961
* Create a locale_t from a collation OID.Results are cached for the
942962
* lifetime of the backend. Thus, do not free the result with freelocale().
@@ -995,10 +1015,7 @@ pg_newlocale_from_collation(Oid collid)
9951015
result=_create_locale(LC_ALL,collcollate);
9961016
#endif
9971017
if (!result)
998-
ereport(ERROR,
999-
(errcode_for_file_access(),
1000-
errmsg("could not create locale \"%s\": %m",
1001-
collcollate)));
1018+
report_newlocale_failure(collcollate);
10021019
}
10031020
else
10041021
{
@@ -1008,16 +1025,10 @@ pg_newlocale_from_collation(Oid collid)
10081025

10091026
loc1=newlocale(LC_COLLATE_MASK,collcollate,NULL);
10101027
if (!loc1)
1011-
ereport(ERROR,
1012-
(errcode_for_file_access(),
1013-
errmsg("could not create locale \"%s\": %m",
1014-
collcollate)));
1028+
report_newlocale_failure(collcollate);
10151029
result=newlocale(LC_CTYPE_MASK,collctype,loc1);
10161030
if (!result)
1017-
ereport(ERROR,
1018-
(errcode_for_file_access(),
1019-
errmsg("could not create locale \"%s\": %m",
1020-
collctype)));
1031+
report_newlocale_failure(collctype);
10211032
#else
10221033

10231034
/*

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp