diff options
| author | Peter Eisentraut | 2024-05-17 09:23:08 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2024-05-17 09:44:26 +0000 |
| commit | 17974ec259463869bb6bb4885d46847422fbc9ec (patch) | |
| tree | 11cd393058415b42093277f2e15de7bf1e186579 /src/test/modules | |
| parent | be5942aee7a012ce7f30bc7a6617903127f29e89 (diff) | |
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 a243569bf65 and
8d9978a7176, 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
Diffstat (limited to 'src/test/modules')
6 files changed, 12 insertions, 12 deletions
diff --git a/src/test/modules/commit_ts/expected/commit_timestamp_1.out b/src/test/modules/commit_ts/expected/commit_timestamp_1.out index 4c62bc95f9f..f37e701f37a 100644 --- a/src/test/modules/commit_ts/expected/commit_timestamp_1.out +++ b/src/test/modules/commit_ts/expected/commit_timestamp_1.out @@ -18,7 +18,7 @@ SELECT id, FROM committs_test ORDER BY id; ERROR: could not get commit timestamp data -HINT: Make sure the configuration parameter track_commit_timestamp is set. +HINT: Make sure the configuration parameter "track_commit_timestamp" is set. DROP TABLE committs_test; SELECT pg_xact_commit_timestamp('0'::xid); ERROR: cannot retrieve commit timestamp for transaction 0 @@ -40,7 +40,7 @@ SELECT x.xid::text::bigint > 0 as xid_valid, roident != 0 AS valid_roident FROM pg_last_committed_xact() x; ERROR: could not get commit timestamp data -HINT: Make sure the configuration parameter track_commit_timestamp is set. +HINT: Make sure the configuration parameter "track_commit_timestamp" is set. -- Test non-normal transaction ids. SELECT * FROM pg_xact_commit_timestamp_origin(NULL); -- ok, NULL timestamp | roident @@ -69,13 +69,13 @@ SELECT x.timestamp > '-infinity'::timestamptz AS ts_low, roident != 0 AS valid_roident FROM pg_last_committed_xact() x; ERROR: could not get commit timestamp data -HINT: Make sure the configuration parameter track_commit_timestamp is set. +HINT: Make sure the configuration parameter "track_commit_timestamp" is set. SELECT x.timestamp > '-infinity'::timestamptz AS ts_low, x.timestamp <= now() AS ts_high, roident != 0 AS valid_roident FROM pg_xact_commit_timestamp_origin(:'txid_no_origin') x; ERROR: could not get commit timestamp data -HINT: Make sure the configuration parameter track_commit_timestamp is set. +HINT: Make sure the configuration parameter "track_commit_timestamp" is set. -- Test transaction with replication origin SELECT pg_replication_origin_create('regress_commit_ts: get_origin') != 0 AS valid_roident; @@ -97,14 +97,14 @@ SELECT x.timestamp > '-infinity'::timestamptz AS ts_low, FROM pg_last_committed_xact() x, pg_replication_origin r WHERE r.roident = x.roident; ERROR: could not get commit timestamp data -HINT: Make sure the configuration parameter track_commit_timestamp is set. +HINT: Make sure the configuration parameter "track_commit_timestamp" is set. SELECT x.timestamp > '-infinity'::timestamptz AS ts_low, x.timestamp <= now() AS ts_high, r.roname FROM pg_xact_commit_timestamp_origin(:'txid_with_origin') x, pg_replication_origin r WHERE r.roident = x.roident; ERROR: could not get commit timestamp data -HINT: Make sure the configuration parameter track_commit_timestamp is set. +HINT: Make sure the configuration parameter "track_commit_timestamp" is set. SELECT pg_replication_origin_session_reset(); pg_replication_origin_session_reset ------------------------------------- diff --git a/src/test/modules/libpq_pipeline/libpq_pipeline.c b/src/test/modules/libpq_pipeline/libpq_pipeline.c index 928ef6b1700..ac4d26302cc 100644 --- a/src/test/modules/libpq_pipeline/libpq_pipeline.c +++ b/src/test/modules/libpq_pipeline/libpq_pipeline.c @@ -2227,10 +2227,10 @@ main(int argc, char **argv) res = PQexec(conn, "SET lc_messages TO \"C\""); if (PQresultStatus(res) != PGRES_COMMAND_OK) - pg_fatal("failed to set lc_messages: %s", PQerrorMessage(conn)); + pg_fatal("failed to set \"lc_messages\": %s", PQerrorMessage(conn)); res = PQexec(conn, "SET debug_parallel_query = off"); if (PQresultStatus(res) != PGRES_COMMAND_OK) - pg_fatal("failed to set debug_parallel_query: %s", PQerrorMessage(conn)); + pg_fatal("failed to set \"debug_parallel_query\": %s", PQerrorMessage(conn)); /* Set the trace file, if requested */ if (tracefile != NULL) diff --git a/src/test/modules/ssl_passphrase_callback/ssl_passphrase_func.c b/src/test/modules/ssl_passphrase_callback/ssl_passphrase_func.c index 948706af852..d5992149821 100644 --- a/src/test/modules/ssl_passphrase_callback/ssl_passphrase_func.c +++ b/src/test/modules/ssl_passphrase_callback/ssl_passphrase_func.c @@ -58,7 +58,7 @@ set_rot13(SSL_CTX *context, bool isServerStart) /* warn if the user has set ssl_passphrase_command */ if (ssl_passphrase_command[0]) ereport(WARNING, - (errmsg("ssl_passphrase_command setting ignored by ssl_passphrase_func module"))); + (errmsg("\"ssl_passphrase_command\" setting ignored by ssl_passphrase_func module"))); SSL_CTX_set_default_passwd_cb(context, rot13_passphrase); } diff --git a/src/test/modules/ssl_passphrase_callback/t/001_testfunc.pl b/src/test/modules/ssl_passphrase_callback/t/001_testfunc.pl index a2bfb645760..7a63539f39c 100644 --- a/src/test/modules/ssl_passphrase_callback/t/001_testfunc.pl +++ b/src/test/modules/ssl_passphrase_callback/t/001_testfunc.pl @@ -56,7 +56,7 @@ my $log_contents = slurp_file($log); like( $log_contents, - qr/WARNING.*ssl_passphrase_command setting ignored by ssl_passphrase_func module/, + qr/WARNING.*"ssl_passphrase_command" setting ignored by ssl_passphrase_func module/, "ssl_passphrase_command set warning"); # set the wrong passphrase diff --git a/src/test/modules/test_shm_mq/setup.c b/src/test/modules/test_shm_mq/setup.c index 3de5d01e305..b3dac44d97a 100644 --- a/src/test/modules/test_shm_mq/setup.c +++ b/src/test/modules/test_shm_mq/setup.c @@ -233,7 +233,7 @@ setup_background_workers(int nworkers, dsm_segment *seg) ereport(ERROR, (errcode(ERRCODE_INSUFFICIENT_RESOURCES), errmsg("could not register background process"), - errhint("You may need to increase max_worker_processes."))); + errhint("You may need to increase \"max_worker_processes\"."))); ++wstate->nworkers; } diff --git a/src/test/modules/test_slru/test_slru.c b/src/test/modules/test_slru/test_slru.c index 068a21f125f..d227b067034 100644 --- a/src/test/modules/test_slru/test_slru.c +++ b/src/test/modules/test_slru/test_slru.c @@ -251,7 +251,7 @@ _PG_init(void) if (!process_shared_preload_libraries_in_progress) ereport(ERROR, (errmsg("cannot load \"%s\" after startup", "test_slru"), - errdetail("\"%s\" must be loaded with shared_preload_libraries.", + errdetail("\"%s\" must be loaded with \"shared_preload_libraries\".", "test_slru"))); prev_shmem_request_hook = shmem_request_hook; |
