Skip to content

Commit 516a4c1

Browse files
peterepetere
committed
Message style fixes
1 parent 84eb871 commit 516a4c1

File tree

11 files changed

+23
-21
lines changed

11 files changed

+23
-21
lines changed

‎contrib/test_decoding/expected/slot.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ SELECT slot_name FROM pg_create_physical_replication_slot('regression_slot3');
141141
(1 row)
142142

143143
SELECT pg_replication_slot_advance('regression_slot3', '0/0'); -- invalid LSN
144-
ERROR: invalid target wal lsn
144+
ERROR: invalid target WAL LSN
145145
SELECT pg_replication_slot_advance('regression_slot3', '0/1'); -- error
146146
ERROR: cannot advance replication slot that has not previously reserved WAL
147147
SELECT pg_drop_replication_slot('regression_slot3');

‎src/backend/access/transam/xlog.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11294,7 +11294,7 @@ read_backup_label(XLogRecPtr *checkPointLoc, bool *backupEndRequired,
1129411294
ereport(FATAL,
1129511295
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
1129611296
errmsg("invalid data in file \"%s\"", BACKUP_LABEL_FILE),
11297-
errdetail("Timeline ID parsed is %u, but expected %u",
11297+
errdetail("Timeline ID parsed is %u, but expected %u.",
1129811298
tli_from_file, tli_from_walseg)));
1129911299

1130011300
ereport(DEBUG1,

‎src/backend/access/transam/xlogfuncs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@ pg_promote(PG_FUNCTION_ARGS)
726726
if (wait_seconds <= 0)
727727
ereport(ERROR,
728728
(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
729-
errmsg("\"wait_seconds\" cannot be negative or equal zero")));
729+
errmsg("\"wait_seconds\" must not be negative or zero")));
730730

731731
/* create the promote signal file */
732732
promote_file = AllocateFile(PROMOTE_SIGNAL_FILE, "w");

‎src/backend/catalog/pg_aggregate.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ AggregateCreate(const char *aggName,
116116
elog(ERROR, "aggregate must have a transition function");
117117

118118
if (numDirectArgs < 0 || numDirectArgs > numArgs)
119-
elog(ERROR, "incorrect number of direct args for aggregate");
119+
elog(ERROR, "incorrect number of direct arguments for aggregate");
120120

121121
/*
122122
* Aggregates can have at most FUNC_MAX_ARGS-1 args, else the transfn
@@ -711,7 +711,7 @@ AggregateCreate(const char *aggName,
711711
if (numDirectArgs != oldagg->aggnumdirectargs)
712712
ereport(ERROR,
713713
(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
714-
errmsg("cannot change number of direct args of an aggregate function")));
714+
errmsg("cannot change number of direct arguments of an aggregate function")));
715715

716716
replaces[Anum_pg_aggregate_aggfnoid - 1] = false;
717717
replaces[Anum_pg_aggregate_aggkind - 1] = false;

‎src/backend/libpq/auth.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2864,7 +2864,7 @@ CheckCertAuth(Port *port)
28642864
if (port->hba->clientcert == clientCertFull && port->hba->auth_method != uaCert)
28652865
{
28662866
ereport(LOG,
2867-
(errmsg("certificate validation (clientcert=verify-full) failed for user \"%s\": cn mismatch",
2867+
(errmsg("certificate validation (clientcert=verify-full) failed for user \"%s\": CN mismatch",
28682868
port->user_name)));
28692869
}
28702870
}

‎src/backend/replication/basebackup.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1454,7 +1454,7 @@ sendFile(const char *readfilename, const char *tarfilename, struct stat *statbuf
14541454
if (verify_checksum && (cnt % BLCKSZ != 0))
14551455
{
14561456
ereport(WARNING,
1457-
(errmsg("cannot verify checksum in file \"%s\", block "
1457+
(errmsg("could not verify checksum in file \"%s\", block "
14581458
"%d: read buffer size %d and page size %d "
14591459
"differ",
14601460
readfilename, blkno, (int) cnt, BLCKSZ)));
@@ -1611,8 +1611,10 @@ sendFile(const char *readfilename, const char *tarfilename, struct stat *statbuf
16111611
if (checksum_failures > 1)
16121612
{
16131613
ereport(WARNING,
1614-
(errmsg("file \"%s\" has a total of %d checksum verification "
1615-
"failures", readfilename, checksum_failures)));
1614+
(errmsg_plural("file \"%s\" has a total of %d checksum verification failure",
1615+
"file \"%s\" has a total of %d checksum verification failures",
1616+
checksum_failures,
1617+
readfilename, checksum_failures)));
16161618

16171619
pgstat_report_checksum_failures_in_db(dboid, checksum_failures);
16181620
}

‎src/backend/replication/slotfuncs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ pg_replication_slot_advance(PG_FUNCTION_ARGS)
523523

524524
if (XLogRecPtrIsInvalid(moveto))
525525
ereport(ERROR,
526-
(errmsg("invalid target wal lsn")));
526+
(errmsg("invalid target WAL LSN")));
527527

528528
/* Build a tuple descriptor for our result type */
529529
if (get_call_result_type(fcinfo, NULL, &tupdesc) != TYPEFUNC_COMPOSITE)

‎src/backend/storage/file/fd.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1688,7 +1688,7 @@ PathNameDeleteTemporaryFile(const char *path, bool error_on_failure)
16881688
if (errno != ENOENT)
16891689
ereport(error_on_failure ? ERROR : LOG,
16901690
(errcode_for_file_access(),
1691-
errmsg("cannot unlink temporary file \"%s\": %m",
1691+
errmsg("could not unlink temporary file \"%s\": %m",
16921692
path)));
16931693
return false;
16941694
}
@@ -3328,7 +3328,7 @@ unlink_if_exists_fname(const char *fname, bool isdir, int elevel)
33283328
if (rmdir(fname) != 0 && errno != ENOENT)
33293329
ereport(elevel,
33303330
(errcode_for_file_access(),
3331-
errmsg("could not rmdir directory \"%s\": %m", fname)));
3331+
errmsg("could not remove directory \"%s\": %m", fname)));
33323332
}
33333333
else
33343334
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2456,7 +2456,7 @@ ri_ReportViolation(const RI_ConstraintInfo *riinfo,
24562456
errmsg("removing partition \"%s\" violates foreign key constraint \"%s\"",
24572457
RelationGetRelationName(pk_rel),
24582458
NameStr(riinfo->conname)),
2459-
errdetail("Key (%s)=(%s) still referenced from table \"%s\".",
2459+
errdetail("Key (%s)=(%s) is still referenced from table \"%s\".",
24602460
key_names.data, key_values.data,
24612461
RelationGetRelationName(fk_rel))));
24622462
else if (onfk)

‎src/backend/utils/misc/guc.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1042,7 +1042,7 @@ static struct config_bool ConfigureNamesBool[] =
10421042
},
10431043
{
10441044
{"enable_partition_pruning", PGC_USERSET, QUERY_TUNING_METHOD,
1045-
gettext_noop("Enable plan-time and run-time partition pruning."),
1045+
gettext_noop("Enables plan-time and run-time partition pruning."),
10461046
gettext_noop("Allows the query planner and executor to compare partition "
10471047
"bounds to conditions in the query to determine which "
10481048
"partitions must be scanned."),
@@ -3493,7 +3493,7 @@ static struct config_string ConfigureNamesString[] =
34933493

34943494
{
34953495
{"recovery_target_timeline", PGC_POSTMASTER, WAL_RECOVERY_TARGET,
3496-
gettext_noop("Specifies the timeline to recovery into."),
3496+
gettext_noop("Specifies the timeline to recover into."),
34973497
NULL
34983498
},
34993499
&recovery_target_timeline_string,
@@ -3503,7 +3503,7 @@ static struct config_string ConfigureNamesString[] =
35033503

35043504
{
35053505
{"recovery_target", PGC_POSTMASTER, WAL_RECOVERY_TARGET,
3506-
gettext_noop("Set to 'immediate' to end recovery as soon as a consistent state is reached."),
3506+
gettext_noop("Set to \"immediate\" to end recovery as soon as a consistent state is reached."),
35073507
NULL
35083508
},
35093509
&recovery_target_string,

‎src/test/regress/expected/foreign_key.out

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2167,19 +2167,19 @@ INSERT into dropfk VALUES (1), (1000), (1500), (2000);
21672167
-- these should all fail
21682168
ALTER TABLE droppk DETACH PARTITION droppk_d;
21692169
ERROR: removing partition "droppk_d" violates foreign key constraint "dropfk_a_fkey5"
2170-
DETAIL: Key (a)=(2000) still referenced from table "dropfk".
2170+
DETAIL: Key (a)=(2000) is still referenced from table "dropfk".
21712171
ALTER TABLE droppk2 DETACH PARTITION droppk2_d;
21722172
ERROR: removing partition "droppk2_d" violates foreign key constraint "dropfk_a_fkey4"
2173-
DETAIL: Key (a)=(1500) still referenced from table "dropfk".
2173+
DETAIL: Key (a)=(1500) is still referenced from table "dropfk".
21742174
ALTER TABLE droppk DETACH PARTITION droppk1;
21752175
ERROR: removing partition "droppk1" violates foreign key constraint "dropfk_a_fkey1"
2176-
DETAIL: Key (a)=(1) still referenced from table "dropfk".
2176+
DETAIL: Key (a)=(1) is still referenced from table "dropfk".
21772177
ALTER TABLE droppk DETACH PARTITION droppk2;
21782178
ERROR: removing partition "droppk2" violates foreign key constraint "dropfk_a_fkey2"
2179-
DETAIL: Key (a)=(1000) still referenced from table "dropfk".
2179+
DETAIL: Key (a)=(1000) is still referenced from table "dropfk".
21802180
ALTER TABLE droppk2 DETACH PARTITION droppk21;
21812181
ERROR: removing partition "droppk21" violates foreign key constraint "dropfk_a_fkey3"
2182-
DETAIL: Key (a)=(1000) still referenced from table "dropfk".
2182+
DETAIL: Key (a)=(1000) is still referenced from table "dropfk".
21832183
-- dropping partitions is disallowed
21842184
DROP TABLE droppk_d;
21852185
ERROR: cannot drop table droppk_d because other objects depend on it

0 commit comments

Comments
 (0)