modify first-word capitalisation of some messages
Started by Peter Smithalmost 2 years ago2 messages
Hi.
PSA a small patch to adjust the first-word capitalisation of some
errmsg/ errdetail/ errhint so they comply with the guidelines.
======
Kind Regards,
Peter Smith.
Fujitsu Australia
Attachments:
v1-0001-Error-message-capitalisation.patchapplication/octet-stream; name=v1-0001-Error-message-capitalisation.patchDownload
From aa8b479f3ad4e6f78918afe946d957cd351cae57 Mon Sep 17 00:00:00 2001
From: Peter Smith <peter.b.smith@fujitsu.com>
Date: Wed, 17 Jan 2024 13:18:59 +1100
Subject: [PATCH v1] Error message capitalisation
---
contrib/pg_surgery/heap_surgery.c | 2 +-
src/backend/commands/event_trigger.c | 2 +-
src/backend/storage/file/fd.c | 4 ++--
src/backend/tcop/postgres.c | 4 ++--
src/backend/utils/error/elog.c | 2 +-
src/bin/pgbench/t/001_pgbench_with_server.pl | 6 +++---
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/contrib/pg_surgery/heap_surgery.c b/contrib/pg_surgery/heap_surgery.c
index 58641b8..37dffe3 100644
--- a/contrib/pg_surgery/heap_surgery.c
+++ b/contrib/pg_surgery/heap_surgery.c
@@ -95,7 +95,7 @@ heap_force_common(FunctionCallInfo fcinfo, HeapTupleForceOption heap_force_opt)
ereport(ERROR,
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
errmsg("recovery is in progress"),
- errhint("heap surgery functions cannot be executed during recovery.")));
+ errhint("Heap surgery functions cannot be executed during recovery.")));
/* Check inputs. */
sanity_check_tid_array(ta, &ntids);
diff --git a/src/backend/commands/event_trigger.c b/src/backend/commands/event_trigger.c
index b146d2a..f193c7d 100644
--- a/src/backend/commands/event_trigger.c
+++ b/src/backend/commands/event_trigger.c
@@ -174,7 +174,7 @@ CreateEventTrigger(CreateEventTrigStmt *stmt)
else if (strcmp(stmt->eventname, "login") == 0 && tags != NULL)
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
- errmsg("Tag filtering is not supported for login event trigger")));
+ errmsg("tag filtering is not supported for login event trigger")));
/*
* Give user a nice error message if an event trigger of the same name
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index 43d2b2a..d298e48 100644
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -3961,7 +3961,7 @@ check_debug_io_direct(char **newval, void **extra, GucSource source)
if (!SplitGUCList(rawstring, ',', &elemlist))
{
- GUC_check_errdetail("invalid list syntax in parameter %s",
+ GUC_check_errdetail("Invalid list syntax in parameter %s",
"debug_io_direct");
pfree(rawstring);
list_free(elemlist);
@@ -3981,7 +3981,7 @@ check_debug_io_direct(char **newval, void **extra, GucSource source)
flags |= IO_DIRECT_WAL_INIT;
else
{
- GUC_check_errdetail("invalid option \"%s\"", item);
+ GUC_check_errdetail("Invalid option \"%s\"", item);
result = false;
break;
}
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 1eaaf3c..1a34bd3 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -2479,7 +2479,7 @@ errdetail_params(ParamListInfo params)
str = BuildParamLogString(params, NULL, log_parameter_max_length);
if (str && str[0] != '\0')
- errdetail("parameters: %s", str);
+ errdetail("Parameters: %s", str);
}
return 0;
@@ -2494,7 +2494,7 @@ static int
errdetail_abort(void)
{
if (MyProc->recoveryConflictPending)
- errdetail("abort reason: recovery conflict");
+ errdetail("Abort reason: recovery conflict");
return 0;
}
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index 9ef7cfc..2c7a20e 100644
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -2140,7 +2140,7 @@ check_backtrace_functions(char **newval, void **extra, GucSource source)
", \n\t");
if (validlen != newvallen)
{
- GUC_check_errdetail("invalid character");
+ GUC_check_errdetail("Invalid character");
return false;
}
diff --git a/src/bin/pgbench/t/001_pgbench_with_server.pl b/src/bin/pgbench/t/001_pgbench_with_server.pl
index 977bc7c..fc57fac 100644
--- a/src/bin/pgbench/t/001_pgbench_with_server.pl
+++ b/src/bin/pgbench/t/001_pgbench_with_server.pl
@@ -290,7 +290,7 @@ select column1::jsonb from (values (:value), (:long)) as q;
my $log = PostgreSQL::Test::Utils::slurp_file($node->logfile);
unlike(
$log,
- qr[DETAIL: parameters: \$1 = '\{ invalid ',],
+ qr[DETAIL: Parameters: \$1 = '\{ invalid ',],
"no parameters logged");
$log = undef;
@@ -331,7 +331,7 @@ select column1::jsonb from (values (:value), (:long)) as q;
$log = PostgreSQL::Test::Utils::slurp_file($node->logfile);
like(
$log,
- qr[DETAIL: parameters: \$1 = '\{ invalid ', \$2 = '''Valame Dios!'' dijo Sancho; ''no le dije yo a vuestra merced que mirase bien lo que hacia\?'''],
+ qr[DETAIL: Parameters: \$1 = '\{ invalid ', \$2 = '''Valame Dios!'' dijo Sancho; ''no le dije yo a vuestra merced que mirase bien lo que hacia\?'''],
"parameter report does not truncate");
$log = undef;
@@ -376,7 +376,7 @@ select column1::jsonb from (values (:value), (:long)) as q;
$log = PostgreSQL::Test::Utils::slurp_file($node->logfile);
like(
$log,
- qr[DETAIL: parameters: \$1 = '\{ inval\.\.\.', \$2 = '''Valame\.\.\.'],
+ qr[DETAIL: Parameters: \$1 = '\{ inval\.\.\.', \$2 = '''Valame\.\.\.'],
"parameter report truncates");
$log = undef;
--
1.8.3.1