Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 17974ec

Browse files
peterepetere
committed
Revise GUC names quoting in messages again
After further review, we want to move in the direction of always quoting GUC names in error messages, rather than the previous (PG16) wildly mixed practice or the intermittent (mid-PG17) idea of doing this depending on how possibly confusing the GUC name is. This commit applies appropriate quotes to (almost?) all mentions of GUC names in error messages. It partially supersedes a243569 and 8d9978a, which had moved things a bit in the opposite direction but which then were abandoned in a partial state. Author: Peter Smith <smithpb2250@gmail.com> Discussion: https://www.postgresql.org/message-id/flat/CAHut%2BPv-kSN8SkxSdoHano_wPubqcg5789ejhCDZAcLFceBR-w%40mail.gmail.com
1 parent be5942a commit 17974ec

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+208
-215
lines changed

‎contrib/pg_prewarm/autoprewarm.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -831,7 +831,7 @@ apw_start_leader_worker(void)
831831
ereport(ERROR,
832832
(errcode(ERRCODE_INSUFFICIENT_RESOURCES),
833833
errmsg("could not register background process"),
834-
errhint("You may need to increase max_worker_processes.")));
834+
errhint("You may need to increase \"max_worker_processes\".")));
835835

836836
status = WaitForBackgroundWorkerStartup(handle, &pid);
837837
if (status != BGWH_STARTED)
@@ -867,7 +867,7 @@ apw_start_database_worker(void)
867867
ereport(ERROR,
868868
(errcode(ERRCODE_INSUFFICIENT_RESOURCES),
869869
errmsg("registering dynamic bgworker autoprewarm failed"),
870-
errhint("Consider increasing configuration parameter max_worker_processes.")));
870+
errhint("Consider increasing configuration parameter \"max_worker_processes\".")));
871871

872872
/*
873873
* Ignore return value; if it fails, postmaster has died, but we have

‎contrib/pg_stat_statements/pg_stat_statements.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1660,7 +1660,7 @@ pg_stat_statements_internal(FunctionCallInfo fcinfo,
16601660
if (!pgss || !pgss_hash)
16611661
ereport(ERROR,
16621662
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
1663-
errmsg("pg_stat_statements must be loaded via shared_preload_libraries")));
1663+
errmsg("pg_stat_statements must be loaded via \"shared_preload_libraries\"")));
16641664

16651665
InitMaterializedSRF(fcinfo, 0);
16661666

@@ -1989,7 +1989,7 @@ pg_stat_statements_info(PG_FUNCTION_ARGS)
19891989
if (!pgss || !pgss_hash)
19901990
ereport(ERROR,
19911991
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
1992-
errmsg("pg_stat_statements must be loaded via shared_preload_libraries")));
1992+
errmsg("pg_stat_statements must be loaded via \"shared_preload_libraries\"")));
19931993

19941994
/* Build a tuple descriptor for our result type */
19951995
if (get_call_result_type(fcinfo, NULL, &tupdesc) != TYPEFUNC_COMPOSITE)
@@ -2671,7 +2671,7 @@ entry_reset(Oid userid, Oid dbid, uint64 queryid, bool minmax_only)
26712671
if (!pgss || !pgss_hash)
26722672
ereport(ERROR,
26732673
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
2674-
errmsg("pg_stat_statements must be loaded via shared_preload_libraries")));
2674+
errmsg("pg_stat_statements must be loaded via \"shared_preload_libraries\"")));
26752675

26762676
LWLockAcquire(pgss->lock, LW_EXCLUSIVE);
26772677
num_entries = hash_get_num_entries(pgss_hash);

‎contrib/sepgsql/hooks.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ _PG_init(void)
406406
if (IsUnderPostmaster)
407407
ereport(ERROR,
408408
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
409-
errmsg("sepgsql must be loaded via shared_preload_libraries")));
409+
errmsg("sepgsql must be loaded via \"shared_preload_libraries\"")));
410410

411411
/*
412412
* Check availability of SELinux on the platform. If disabled, we cannot

‎contrib/test_decoding/expected/slot.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ ORDER BY o.slot_name, c.slot_name;
220220
-- released even when raise error during creating the target slot.
221221
SELECT 'copy' FROM pg_copy_logical_replication_slot('orig_slot1', 'failed'); -- error
222222
ERROR: all replication slots are in use
223-
HINT: Free one or increase max_replication_slots.
223+
HINT: Free one or increase "max_replication_slots".
224224
-- temporary slots were dropped automatically
225225
SELECT pg_drop_replication_slot('orig_slot1');
226226
pg_drop_replication_slot

‎doc/src/sgml/sources.sgml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -533,17 +533,10 @@ Hint: The addendum, written as a complete sentence.
533533
<title>Use of Quotes</title>
534534

535535
<para>
536-
Always use quotes to delimit file names, user-supplied identifiers, and
537-
other variables that might contain words. Do not use them to mark up
538-
variables that will not contain words (for example, operator names).
539-
</para>
540-
541-
<para>
542-
In messages containing configuration variable names, do not include quotes
543-
when the names are visibly not natural English words, such as when they
544-
have underscores, are all-uppercase or have mixed case. Otherwise, quotes
545-
must be added. Do include quotes in a message where an arbitrary variable
546-
name is to be expanded.
536+
Always use quotes to delimit file names, user-supplied identifiers,
537+
configuration variable names, and other variables that might contain
538+
words. Do not use them to mark up variables that will not contain words
539+
(for example, operator names).
547540
</para>
548541

549542
<para>

‎src/backend/access/gin/ginbulk.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ ginCombineData(RBTNode *existing, const RBTNode *newdata, void *arg)
4242
ereport(ERROR,
4343
(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
4444
errmsg("posting list is too long"),
45-
errhint("Reduce maintenance_work_mem.")));
45+
errhint("Reduce \"maintenance_work_mem\".")));
4646

4747
accum->allocatedMemory -= GetMemoryChunkSpace(eo->list);
4848
eo->maxcount *= 2;

‎src/backend/access/heap/vacuumlazy.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2327,7 +2327,7 @@ lazy_check_wraparound_failsafe(LVRelState *vacrel)
23272327
vacrel->dbname, vacrel->relnamespace, vacrel->relname,
23282328
vacrel->num_index_scans),
23292329
errdetail("The table's relfrozenxid or relminmxid is too far in the past."),
2330-
errhint("Consider increasing configuration parameter maintenance_work_mem or autovacuum_work_mem.\n"
2330+
errhint("Consider increasing configuration parameter \"maintenance_work_mem\" or \"autovacuum_work_mem\".\n"
23312331
"You might also need to consider other ways for VACUUM to keep up with the allocation of transaction IDs.")));
23322332

23332333
/* Stop applying cost limits from this point on */

‎src/backend/access/table/tableamapi.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,14 @@ check_default_table_access_method(char **newval, void **extra, GucSource source)
106106
{
107107
if (**newval == '\0')
108108
{
109-
GUC_check_errdetail("%s cannot be empty.",
109+
GUC_check_errdetail("\"%s\" cannot be empty.",
110110
"default_table_access_method");
111111
return false;
112112
}
113113

114114
if (strlen(*newval) >= NAMEDATALEN)
115115
{
116-
GUC_check_errdetail("%s is too long (maximum %d characters).",
116+
GUC_check_errdetail("\"%s\" is too long (maximum %d characters).",
117117
"default_table_access_method", NAMEDATALEN - 1);
118118
return false;
119119
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,9 +384,9 @@ error_commit_ts_disabled(void)
384384
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
385385
errmsg("could not get commit timestamp data"),
386386
RecoveryInProgress() ?
387-
errhint("Make sure the configuration parameter %s is set on the primary server.",
387+
errhint("Make sure the configuration parameter \"%s\" is set on the primary server.",
388388
"track_commit_timestamp") :
389-
errhint("Make sure the configuration parameter %s is set.",
389+
errhint("Make sure the configuration parameter \"%s\" is set.",
390390
"track_commit_timestamp")));
391391
}
392392

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1151,7 +1151,7 @@ GetNewMultiXactId(int nmembers, MultiXactOffset *offset)
11511151
MultiXactState->offsetStopLimit - nextOffset - 1,
11521152
nmembers,
11531153
MultiXactState->offsetStopLimit - nextOffset - 1),
1154-
errhint("Execute a database-wide VACUUM in database with OID %u with reduced vacuum_multixact_freeze_min_age and vacuum_multixact_freeze_table_age settings.",
1154+
errhint("Execute a database-wide VACUUM in database with OID %u with reduced \"vacuum_multixact_freeze_min_age\" and \"vacuum_multixact_freeze_table_age\" settings.",
11551155
MultiXactState->oldestMultiXactDB)));
11561156
}
11571157

@@ -1187,7 +1187,7 @@ GetNewMultiXactId(int nmembers, MultiXactOffset *offset)
11871187
MultiXactState->offsetStopLimit - nextOffset + nmembers,
11881188
MultiXactState->oldestMultiXactDB,
11891189
MultiXactState->offsetStopLimit - nextOffset + nmembers),
1190-
errhint("Execute a database-wide VACUUM in that database with reduced vacuum_multixact_freeze_min_age and vacuum_multixact_freeze_table_age settings.")));
1190+
errhint("Execute a database-wide VACUUM in that database with reduced \"vacuum_multixact_freeze_min_age\" and \"vacuum_multixact_freeze_table_age\" settings.")));
11911191

11921192
ExtendMultiXactMember(nextOffset, nmembers);
11931193

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ void
9191
RmgrNotFound(RmgrId rmid)
9292
{
9393
ereport(ERROR, (errmsg("resource manager with ID %d not registered", rmid),
94-
errhint("Include the extension module that implements this resource manager in shared_preload_libraries.")));
94+
errhint("Include the extension module that implements this resource manager in \"shared_preload_libraries\".")));
9595
}
9696

9797
/*
@@ -118,7 +118,7 @@ RegisterCustomRmgr(RmgrId rmid, const RmgrData *rmgr)
118118
if (!process_shared_preload_libraries_in_progress)
119119
ereport(ERROR,
120120
(errmsg("failed to register custom resource manager \"%s\" with ID %d", rmgr->rm_name, rmid),
121-
errdetail("Custom resource manager must be registered while initializing modules in shared_preload_libraries.")));
121+
errdetail("Custom resource manager must be registered while initializing modules in \"shared_preload_libraries\".")));
122122

123123
if (RmgrTable[rmid].rm_name != NULL)
124124
ereport(ERROR,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ MarkAsPreparing(TransactionId xid, const char *gid,
373373
ereport(ERROR,
374374
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
375375
errmsg("prepared transactions are disabled"),
376-
errhint("Set max_prepared_transactions to a nonzero value.")));
376+
errhint("Set \"max_prepared_transactions\" to a nonzero value.")));
377377

378378
/* on first call, register the exit hook */
379379
if (!twophaseExitRegistered)
@@ -402,7 +402,7 @@ MarkAsPreparing(TransactionId xid, const char *gid,
402402
ereport(ERROR,
403403
(errcode(ERRCODE_OUT_OF_MEMORY),
404404
errmsg("maximum number of prepared transactions reached"),
405-
errhint("Increase max_prepared_transactions (currently %d).",
405+
errhint("Increase \"max_prepared_transactions\" (currently %d).",
406406
max_prepared_xacts)));
407407
gxact = TwoPhaseState->freeGXacts;
408408
TwoPhaseState->freeGXacts = gxact->next;
@@ -2539,7 +2539,7 @@ PrepareRedoAdd(char *buf, XLogRecPtr start_lsn,
25392539
ereport(ERROR,
25402540
(errcode(ERRCODE_OUT_OF_MEMORY),
25412541
errmsg("maximum number of prepared transactions reached"),
2542-
errhint("Increase max_prepared_transactions (currently %d).",
2542+
errhint("Increase \"max_prepared_transactions\" (currently %d).",
25432543
max_prepared_xacts)));
25442544
gxact = TwoPhaseState->freeGXacts;
25452545
TwoPhaseState->freeGXacts = gxact->next;

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4501,11 +4501,11 @@ ReadControlFile(void)
45014501
/* check and update variables dependent on wal_segment_size */
45024502
if (ConvertToXSegs(min_wal_size_mb, wal_segment_size) < 2)
45034503
ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
4504-
errmsg("min_wal_size must be at least twice wal_segment_size")));
4504+
errmsg("\"min_wal_size\" must be at least twice \"wal_segment_size\"")));
45054505

45064506
if (ConvertToXSegs(max_wal_size_mb, wal_segment_size) < 2)
45074507
ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
4508-
errmsg("max_wal_size must be at least twice wal_segment_size")));
4508+
errmsg("\"max_wal_size\" must be at least twice \"wal_segment_size\"")));
45094509

45104510
UsableBytesInSegment =
45114511
(wal_segment_size / XLOG_BLCKSZ * UsableBytesInPage) -
@@ -5351,9 +5351,9 @@ CheckRequiredParameterValues(void)
53515351
{
53525352
ereport(FATAL,
53535353
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
5354-
errmsg("WAL was generated with wal_level=minimal, cannot continue recovering"),
5355-
errdetail("This happens if you temporarily set wal_level=minimal on the server."),
5356-
errhint("Use a backup taken after setting wal_level to higher than minimal.")));
5354+
errmsg("WAL was generated with \"wal_level=minimal\", cannot continue recovering"),
5355+
errdetail("This happens if you temporarily set \"wal_level=minimal\" on the server."),
5356+
errhint("Use a backup taken after setting \"wal_level\" to higher than \"minimal\".")));
53575357
}
53585358

53595359
/*
@@ -8549,7 +8549,7 @@ get_sync_bit(int method)
85498549
#endif
85508550
default:
85518551
/* can't happen (unless we are out of sync with option array) */
8552-
elog(ERROR, "unrecognized wal_sync_method: %d", method);
8552+
elog(ERROR, "unrecognized \"wal_sync_method\": %d", method);
85538553
return 0; /* silence warning */
85548554
}
85558555
}
@@ -8647,7 +8647,7 @@ issue_xlog_fsync(int fd, XLogSegNo segno, TimeLineID tli)
86478647
default:
86488648
ereport(PANIC,
86498649
errcode(ERRCODE_INVALID_PARAMETER_VALUE),
8650-
errmsg_internal("unrecognized wal_sync_method: %d", wal_sync_method));
8650+
errmsg_internal("unrecognized \"wal_sync_method\": %d", wal_sync_method));
86518651
break;
86528652
}
86538653

@@ -8725,7 +8725,7 @@ do_pg_backup_start(const char *backupidstr, bool fast, List **tablespaces,
87258725
ereport(ERROR,
87268726
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
87278727
errmsg("WAL level not sufficient for making an online backup"),
8728-
errhint("wal_level must be set to \"replica\" or \"logical\" at server start.")));
8728+
errhint("\"wal_level\" must be set to \"replica\" or \"logical\" at server start.")));
87298729

87308730
if (strlen(backupidstr) > MAXPGPATH)
87318731
ereport(ERROR,
@@ -8851,11 +8851,11 @@ do_pg_backup_start(const char *backupidstr, bool fast, List **tablespaces,
88518851
if (!checkpointfpw || state->startpoint <= recptr)
88528852
ereport(ERROR,
88538853
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
8854-
errmsg("WAL generated with full_page_writes=off was replayed "
8854+
errmsg("WAL generated with \"full_page_writes=off\" was replayed "
88558855
"since last restartpoint"),
88568856
errhint("This means that the backup being taken on the standby "
88578857
"is corrupt and should not be used. "
8858-
"Enable full_page_writes and run CHECKPOINT on the primary, "
8858+
"Enable \"full_page_writes\" and run CHECKPOINT on the primary, "
88598859
"and then try an online backup again.")));
88608860

88618861
/*
@@ -9147,11 +9147,11 @@ do_pg_backup_stop(BackupState *state, bool waitforarchive)
91479147
if (state->startpoint <= recptr)
91489148
ereport(ERROR,
91499149
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
9150-
errmsg("WAL generated with full_page_writes=off was replayed "
9150+
errmsg("WAL generated with \"full_page_writes=off\" was replayed "
91519151
"during online backup"),
91529152
errhint("This means that the backup being taken on the standby "
91539153
"is corrupt and should not be used. "
9154-
"Enable full_page_writes and run CHECKPOINT on the primary, "
9154+
"Enable \"full_page_writes\" and run CHECKPOINT on the primary, "
91559155
"and then try an online backup again.")));
91569156

91579157

@@ -9279,7 +9279,7 @@ do_pg_backup_stop(BackupState *state, bool waitforarchive)
92799279
ereport(WARNING,
92809280
(errmsg("still waiting for all required WAL segments to be archived (%d seconds elapsed)",
92819281
waits),
9282-
errhint("Check that your archive_command is executing properly. "
9282+
errhint("Check that your \"archive_command\" is executing properly. "
92839283
"You can safely cancel this backup, "
92849284
"but the database backup will not be usable without all the WAL segments.")));
92859285
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ RestoreArchivedFile(char *path, const char *xlogfname,
233233
ereport(elevel,
234234
(errcode_for_file_access(),
235235
errmsg("could not stat file \"%s\": %m", xlogpath),
236-
errdetail("restore_command returned a zero exit status, but stat() failed.")));
236+
errdetail("\"restore_command\" returned a zero exit status, but stat() failed.")));
237237
}
238238
}
239239

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ pg_log_standby_snapshot(PG_FUNCTION_ARGS)
212212
if (!XLogStandbyInfoActive())
213213
ereport(ERROR,
214214
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
215-
errmsg("pg_log_standby_snapshot() can only be used if wal_level >= replica")));
215+
errmsg("pg_log_standby_snapshot() can only be used if \"wal_level\" >= \"replica\"")));
216216

217217
recptr = LogStandbySnapshot();
218218

@@ -245,7 +245,7 @@ pg_create_restore_point(PG_FUNCTION_ARGS)
245245
ereport(ERROR,
246246
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
247247
errmsg("WAL level not sufficient for creating a restore point"),
248-
errhint("wal_level must be set to \"replica\" or \"logical\" at server start.")));
248+
errhint("\"wal_level\" must be set to \"replica\" or \"logical\" at server start.")));
249249

250250
restore_name_str = text_to_cstring(restore_name);
251251

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1085,7 +1085,7 @@ check_recovery_prefetch(int *new_value, void **extra, GucSource source)
10851085
#ifndef USE_PREFETCH
10861086
if (*new_value == RECOVERY_PREFETCH_ON)
10871087
{
1088-
GUC_check_errdetail("recovery_prefetch is not supported on platforms that lack posix_fadvise().");
1088+
GUC_check_errdetail("\"recovery_prefetch\" is not supported on platforms that lack posix_fadvise().");
10891089
return false;
10901090
}
10911091
#endif

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1119,7 +1119,7 @@ validateRecoveryParameters(void)
11191119
if ((PrimaryConnInfo == NULL || strcmp(PrimaryConnInfo, "") == 0) &&
11201120
(recoveryRestoreCommand == NULL || strcmp(recoveryRestoreCommand, "") == 0))
11211121
ereport(WARNING,
1122-
(errmsg("specified neither primary_conninfo nor restore_command"),
1122+
(errmsg("specified neither \"primary_conninfo\" nor \"restore_command\""),
11231123
errhint("The database server will regularly poll the pg_wal subdirectory to check for files placed there.")));
11241124
}
11251125
else
@@ -1128,7 +1128,7 @@ validateRecoveryParameters(void)
11281128
strcmp(recoveryRestoreCommand, "") == 0)
11291129
ereport(FATAL,
11301130
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
1131-
errmsg("must specify restore_command when standby mode is not enabled")));
1131+
errmsg("must specify \"restore_command\" when standby mode is not enabled")));
11321132
}
11331133

11341134
/*
@@ -2162,7 +2162,7 @@ CheckTablespaceDirectory(void)
21622162
errmsg("unexpected directory entry \"%s\" found in %s",
21632163
de->d_name, "pg_tblspc/"),
21642164
errdetail("All directory entries in pg_tblspc/ should be symbolic links."),
2165-
errhint("Remove those directories, or set allow_in_place_tablespaces to ON transiently to let recovery complete.")));
2165+
errhint("Remove those directories, or set \"allow_in_place_tablespaces\" to ON transiently to let recovery complete.")));
21662166
}
21672167
}
21682168

@@ -4771,7 +4771,7 @@ error_multiple_recovery_targets(void)
47714771
ereport(ERROR,
47724772
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
47734773
errmsg("multiple recovery targets specified"),
4774-
errdetail("At most one of recovery_target, recovery_target_lsn, recovery_target_name, recovery_target_time, recovery_target_xid may be set.")));
4774+
errdetail("At most one of \"recovery_target\", \"recovery_target_lsn\", \"recovery_target_name\", \"recovery_target_time\", \"recovery_target_xid\" may be set.")));
47754775
}
47764776

47774777
/*
@@ -4855,7 +4855,7 @@ check_recovery_target_name(char **newval, void **extra, GucSource source)
48554855
/* Use the value of newval directly */
48564856
if (strlen(*newval) >= MAXFNAMELEN)
48574857
{
4858-
GUC_check_errdetail("%s is too long (maximum %d characters).",
4858+
GUC_check_errdetail("\"%s\" is too long (maximum %d characters).",
48594859
"recovery_target_name", MAXFNAMELEN - 1);
48604860
return false;
48614861
}
@@ -4979,7 +4979,7 @@ check_recovery_target_timeline(char **newval, void **extra, GucSource source)
49794979
strtoul(*newval, NULL, 0);
49804980
if (errno == EINVAL || errno == ERANGE)
49814981
{
4982-
GUC_check_errdetail("recovery_target_timeline is not a valid number.");
4982+
GUC_check_errdetail("\"recovery_target_timeline\" is not a valid number.");
49834983
return false;
49844984
}
49854985
}

‎src/backend/commands/publicationcmds.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -858,8 +858,8 @@ CreatePublication(ParseState *pstate, CreatePublicationStmt *stmt)
858858
if (wal_level != WAL_LEVEL_LOGICAL)
859859
ereport(WARNING,
860860
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
861-
errmsg("wal_level is insufficient to publish logical changes"),
862-
errhint("Set wal_level to \"logical\" before creating subscriptions.")));
861+
errmsg("\"wal_level\" is insufficient to publish logical changes"),
862+
errhint("Set \"wal_level\" to \"logical\" before creating subscriptions.")));
863863

864864
return myself;
865865
}

‎src/backend/commands/vacuum.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ check_vacuum_buffer_usage_limit(int *newval, void **extra,
131131
return true;
132132

133133
/* Value does not fall within any allowable range */
134-
GUC_check_errdetail("vacuum_buffer_usage_limit must be 0 or between %d kB and %d kB",
134+
GUC_check_errdetail("\"vacuum_buffer_usage_limit\" must be 0 or between %d kB and %d kB",
135135
MIN_BAS_VAC_RING_SIZE_KB, MAX_BAS_VAC_RING_SIZE_KB);
136136

137137
return false;

0 commit comments

Comments
 (0)