From 12e321e909f7ca6a20e2a94ccf47fcdaef77a99a Mon Sep 17 00:00:00 2001 From: Kyotaro Horiguchi Date: Wed, 18 May 2022 09:50:16 +0900 Subject: [PATCH 2/2] Fix wording convention in error messages Some error messages wrongly used capitalized "Boolean" in the middle a sentence. Also fix a use of quoted lower-cased word for a keyword "MATCH" to be bare, upper-cased word. --- src/backend/commands/copy.c | 2 +- src/backend/commands/define.c | 2 +- src/backend/commands/extension.c | 6 +++--- src/backend/utils/misc/guc.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c index f448d39c7e..b76c5700ed 100644 --- a/src/backend/commands/copy.c +++ b/src/backend/commands/copy.c @@ -366,7 +366,7 @@ defGetCopyHeaderChoice(DefElem *def) } ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("%s requires a Boolean value or \"match\"", + errmsg("%s requires a boolean value or MATCH", def->defname))); return COPY_HEADER_FALSE; /* keep compiler quiet */ } diff --git a/src/backend/commands/define.c b/src/backend/commands/define.c index 0755ab1eae..19abb07614 100644 --- a/src/backend/commands/define.c +++ b/src/backend/commands/define.c @@ -151,7 +151,7 @@ defGetBoolean(DefElem *def) } ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("%s requires a Boolean value", + errmsg("%s requires a boolean value", def->defname))); return false; /* keep compiler quiet */ } diff --git a/src/backend/commands/extension.c b/src/backend/commands/extension.c index 767d9b9619..f95ae4964d 100644 --- a/src/backend/commands/extension.c +++ b/src/backend/commands/extension.c @@ -560,7 +560,7 @@ parse_extension_control_file(ExtensionControlFile *control, if (!parse_bool(item->value, &control->relocatable)) ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("parameter \"%s\" requires a Boolean value", + errmsg("parameter \"%s\" requires a boolean value", item->name))); } else if (strcmp(item->name, "superuser") == 0) @@ -568,7 +568,7 @@ parse_extension_control_file(ExtensionControlFile *control, if (!parse_bool(item->value, &control->superuser)) ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("parameter \"%s\" requires a Boolean value", + errmsg("parameter \"%s\" requires a boolean value", item->name))); } else if (strcmp(item->name, "trusted") == 0) @@ -576,7 +576,7 @@ parse_extension_control_file(ExtensionControlFile *control, if (!parse_bool(item->value, &control->trusted)) ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("parameter \"%s\" requires a Boolean value", + errmsg("parameter \"%s\" requires a boolean value", item->name))); } else if (strcmp(item->name, "encoding") == 0) diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 8e9b71375c..0408754e68 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -7369,7 +7369,7 @@ parse_and_validate_value(struct config_generic *record, { ereport(elevel, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("parameter \"%s\" requires a Boolean value", + errmsg("parameter \"%s\" requires a boolean value", name))); return false; } -- 2.27.0