diff options
Diffstat (limited to 'src/backend/utils/adt')
| -rw-r--r-- | src/backend/utils/adt/jsonpath_scan.l | 10 | ||||
| -rw-r--r-- | src/backend/utils/adt/pg_locale.c | 6 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/backend/utils/adt/jsonpath_scan.l b/src/backend/utils/adt/jsonpath_scan.l index 0916fc10275..29c26af4445 100644 --- a/src/backend/utils/adt/jsonpath_scan.l +++ b/src/backend/utils/adt/jsonpath_scan.l @@ -171,13 +171,13 @@ hex_fail \\x{hexdigit}{0,1} <xnq,xq,xvq>{unicode}*{unicodefail} { jsonpath_yyerror(NULL, escontext, - "invalid unicode sequence"); + "invalid Unicode escape sequence"); yyterminate(); } <xnq,xq,xvq>{hex_fail} { jsonpath_yyerror(NULL, escontext, - "invalid hex character sequence"); + "invalid hexadecimal character sequence"); yyterminate(); } @@ -198,7 +198,7 @@ hex_fail \\x{hexdigit}{0,1} <xq,xvq><<EOF>> { jsonpath_yyerror(NULL, escontext, - "unexpected end of quoted string"); + "unterminated quoted string"); yyterminate(); } @@ -554,7 +554,7 @@ parsejsonpath(const char *str, int len, struct Node *escontext) jsonpath_scanner_init(str, len); if (jsonpath_yyparse((void *) &parseresult, escontext) != 0) - jsonpath_yyerror(NULL, escontext, "bogus input"); /* shouldn't happen */ + jsonpath_yyerror(NULL, escontext, "invalid input"); /* shouldn't happen */ jsonpath_scanner_finish(); @@ -611,7 +611,7 @@ addUnicodeChar(int ch, struct Node *escontext) else if (!pg_unicode_to_server_noerror(ch, (unsigned char *) cbuf)) ereturn(escontext, false, (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("could not convert unicode to server encoding"))); + errmsg("could not convert Unicode to server encoding"))); addstring(false, cbuf, strlen(cbuf)); } return true; diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c index c8b36f3af2f..c2342e6448b 100644 --- a/src/backend/utils/adt/pg_locale.c +++ b/src/backend/utils/adt/pg_locale.c @@ -2862,7 +2862,8 @@ icu_validate_locale(const char *loc_str) ereport(elevel, (errmsg("could not get language from ICU locale \"%s\": %s", loc_str, u_errorName(status)), - errhint("To disable ICU locale validation, set parameter icu_validation_level to DISABLED."))); + errhint("To disable ICU locale validation, set the parameter \"%s\" to \"%s\".", + "icu_validation_level", "disabled"))); return; } @@ -2890,7 +2891,8 @@ icu_validate_locale(const char *loc_str) ereport(elevel, (errmsg("ICU locale \"%s\" has unknown language \"%s\"", loc_str, lang), - errhint("To disable ICU locale validation, set parameter icu_validation_level to DISABLED."))); + errhint("To disable ICU locale validation, set the parameter \"%s\" to \"%s\".", + "icu_validation_level", "disabled"))); /* check that it can be opened */ collator = pg_ucol_open(loc_str); |