Message style improvements

diff --git a/src/backend/access/transam/xlogprefetcher.c b/src/backend/access/transam/xlogprefetcher.c
index aa17240e1dd209bef3507e1cf80fc7c0c8d329dd..995c5e83bc881f5f05561e441f1f7d662f55c67a 100644 (file)
--- a/src/backend/access/transam/xlogprefetcher.c
+++ b/src/backend/access/transam/xlogprefetcher.c
@@ -1087,7 +1087,7 @@ check_recovery_prefetch(int *new_value, void **extra, GucSource source)
 #ifndef USE_PREFETCH
    if (*new_value == RECOVERY_PREFETCH_ON)
    {
-       GUC_check_errdetail("recovery_prefetch not supported on platforms that lack posix_fadvise().");
+       GUC_check_errdetail("recovery_prefetch is not supported on platforms that lack posix_fadvise().");
        return false;
    }
 #endif

diff --git a/src/backend/access/transam/xlogreader.c b/src/backend/access/transam/xlogreader.c
index b07f6439466547ecaa03e864ea4fff6778cf3850..dc6a8093b3aa6d4b12b7ba7eb40d61bc2223ed47 100644 (file)
--- a/src/backend/access/transam/xlogreader.c
+++ b/src/backend/access/transam/xlogreader.c
@@ -1961,10 +1961,10 @@ XLogRecGetBlockTag(XLogReaderState *record, uint8 block_id,
                                    NULL))
    {
 #ifndef FRONTEND
-       elog(ERROR, "failed to locate backup block with ID %d in WAL record",
+       elog(ERROR, "could not locate backup block with ID %d in WAL record",
             block_id);
 #else
-       pg_fatal("failed to locate backup block with ID %d in WAL record",
+       pg_fatal("could not locate backup block with ID %d in WAL record",
                 block_id);
 #endif
    }

diff --git a/src/backend/backup/basebackup.c b/src/backend/backup/basebackup.c
index 587f6849b8aeb60c78192d68ccb3cb279aec6384..759823f1bed7f2e1c8d5b691c7f2c36d10b7313e 100644 (file)
--- a/src/backend/backup/basebackup.c
+++ b/src/backend/backup/basebackup.c
@@ -862,7 +862,7 @@ parse_basebackup_options(List *options, basebackup_options *opt)
            if (!parse_compress_algorithm(optval, &opt->compression))
                ereport(ERROR,
                        (errcode(ERRCODE_SYNTAX_ERROR),
-                        errmsg("unrecognized compression algorithm \"%s\"",
+                        errmsg("unrecognized compression algorithm: \"%s\"",
                                optval)));
            o_compression = true;
        }
@@ -918,7 +918,7 @@ parse_basebackup_options(List *options, basebackup_options *opt)
    if (o_compression_detail && !o_compression)
        ereport(ERROR,
                (errcode(ERRCODE_SYNTAX_ERROR),
-                errmsg("compression detail requires compression")));
+                errmsg("compression detail cannot be specified unless compression is enabled")));
 
    if (o_compression)
    {

diff --git a/src/backend/backup/basebackup_server.c b/src/backend/backup/basebackup_server.c
index d020a92bfab58eb371c61bdd9dbb264a98748a50..0258d7a03b3ee8542bf8bce73b66468ad4b690d5 100644 (file)
--- a/src/backend/backup/basebackup_server.c
+++ b/src/backend/backup/basebackup_server.c
@@ -72,7 +72,7 @@ bbsink_server_new(bbsink *next, char *pathname)
    if (!has_privs_of_role(GetUserId(), ROLE_PG_WRITE_SERVER_FILES))
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                errmsg("must be superuser or a role with privileges of the pg_write_server_files role to create server backup")));
+                errmsg("must be superuser or a role with privileges of the pg_write_server_files role to create backup stored on server")));
    CommitTransactionCommand();
 
    /*
@@ -86,7 +86,7 @@ bbsink_server_new(bbsink *next, char *pathname)
    if (!is_absolute_path(pathname))
        ereport(ERROR,
                (errcode(ERRCODE_INVALID_NAME),
-                errmsg("relative path not allowed for server backup")));
+                errmsg("relative path not allowed for backup stored on server")));
 
    switch (pg_check_dir(pathname))
    {

diff --git a/src/backend/catalog/pg_publication.c b/src/backend/catalog/pg_publication.c
index 9b28d05a1b39f8f433b3cb466a7d59deadb10284..939b1349f893ad89400d466fc26be759a81c27dc 100644 (file)
--- a/src/backend/catalog/pg_publication.c
+++ b/src/backend/catalog/pg_publication.c
@@ -513,13 +513,13 @@ publication_translate_columns(Relation targetrel, List *columns,
        if (!AttrNumberIsForUserDefinedAttr(attnum))
            ereport(ERROR,
                    errcode(ERRCODE_INVALID_COLUMN_REFERENCE),
-                   errmsg("cannot reference system column \"%s\" in publication column list",
+                   errmsg("cannot use system column \"%s\" in publication column list",
                           colname));
 
        if (TupleDescAttr(tupdesc, attnum - 1)->attgenerated)
            ereport(ERROR,
                    errcode(ERRCODE_INVALID_COLUMN_REFERENCE),
-                   errmsg("cannot reference generated column \"%s\" in publication column list",
+                   errmsg("cannot use generated column \"%s\" in publication column list",
                           colname));
 
        if (bms_is_member(attnum, set))

diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
index 5dfec5c6b05663f722bf1cfc46809e5149e54251..034d14f39daa2752b3316bc4c95b4c2b88fc849a 100644 (file)
--- a/src/backend/commands/dbcommands.c
+++ b/src/backend/commands/dbcommands.c
@@ -991,7 +991,7 @@ createdb(ParseState *pstate, const CreatedbStmt *stmt)
        else
            ereport(ERROR,
                    (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-                    errmsg("invalid create database strategy %s", strategy),
+                    errmsg("invalid create database strategy \"%s\"", strategy),
                     errhint("Valid strategies are \"wal_log\", and \"file_copy\".")));
    }
 

diff --git a/src/backend/commands/publicationcmds.c b/src/backend/commands/publicationcmds.c
index aafb14c9a3537bc4406ee03eb892b629fe3cf7cd..cfa7196f2033fedb3209dde4070e03da0bebc49b 100644 (file)
--- a/src/backend/commands/publicationcmds.c
+++ b/src/backend/commands/publicationcmds.c
@@ -575,7 +575,7 @@ check_simple_rowfilter_expr_walker(Node *node, ParseState *pstate)
            /* OK, supported */
            break;
        default:
-           errdetail_msg = _("Expressions only allow columns, constants, built-in operators, built-in data types, built-in collations, and immutable built-in functions.");
+           errdetail_msg = _("Only columns, constants, built-in operators, built-in data types, built-in collations, and immutable built-in functions are allowed.");
            break;
    }
 
@@ -1359,7 +1359,7 @@ CheckAlterPublication(AlterPublicationStmt *stmt, HeapTuple tup,
                (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
                 errmsg("publication \"%s\" is defined as FOR ALL TABLES",
                        NameStr(pubform->pubname)),
-                errdetail("Tables from schema cannot be added to, dropped from, or set on FOR ALL TABLES publications.")));
+                errdetail("Schemas cannot be added to or dropped from FOR ALL TABLES publications.")));
 
    /* Check that user is allowed to manipulate the publication tables. */
    if (tables && pubform->puballtables)

diff --git a/src/backend/commands/subscriptioncmds.c b/src/backend/commands/subscriptioncmds.c
index ea42491ad999ece923b6e7de3ae7e884eb44d4b0..ef4f9c175c267d9810bbcb58213b57da4aa782c1 100644 (file)
--- a/src/backend/commands/subscriptioncmds.c
+++ b/src/backend/commands/subscriptioncmds.c
@@ -430,10 +430,8 @@ check_publications(WalReceiverConn *wrconn, List *publications)
 
    if (res->status != WALRCV_OK_TUPLES)
        ereport(ERROR,
-               errmsg_plural("could not receive publication from the publisher: %s",
-                             "could not receive list of publications from the publisher: %s",
-                             list_length(publications),
-                             res->err));
+               errmsg("could not receive list of publications from the publisher: %s",
+                      res->err));
 
    publicationsCopy = list_copy(publications);
 

diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
index 464e22517f018b5acf9e0111527da3912f76fcf8..ed0ab9ca8ee4ae824c96a436a86dc325ed83a4bf 100644 (file)
--- a/src/backend/commands/trigger.c
+++ b/src/backend/commands/trigger.c
@@ -1571,7 +1571,7 @@ renametrig(RenameStmt *stmt)
            ereport(ERROR,
                    errmsg("cannot rename trigger \"%s\" on table \"%s\"",
                           stmt->subname, RelationGetRelationName(targetrel)),
-                   errhint("Rename trigger on partitioned table \"%s\" instead.",
+                   errhint("Rename the trigger on the partitioned table \"%s\" instead.",
                            get_rel_name(get_partition_parent(relid, false))));
 
 

diff --git a/src/backend/executor/nodeModifyTable.c b/src/backend/executor/nodeModifyTable.c
index deda32150288c961e42e2dce1517d83dade7dcfa..775960827d01379a9f2cb8921a242b670e597e39 100644 (file)
--- a/src/backend/executor/nodeModifyTable.c
+++ b/src/backend/executor/nodeModifyTable.c
@@ -2082,10 +2082,10 @@ ExecCrossPartitionUpdateForeignKey(ModifyTableContext *context,
            ereport(ERROR,
                    (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
                     errmsg("cannot move tuple across partitions when a non-root ancestor of the source partition is directly referenced in a foreign key"),
-                    errdetail("A foreign key points to ancestor \"%s\", but not the root ancestor \"%s\".",
+                    errdetail("A foreign key points to ancestor \"%s\" but not the root ancestor \"%s\".",
                               RelationGetRelationName(rInfo->ri_RelationDesc),
                               RelationGetRelationName(rootRelInfo->ri_RelationDesc)),
-                    errhint("Consider defining the foreign key on \"%s\".",
+                    errhint("Consider defining the foreign key on table \"%s\".",
                             RelationGetRelationName(rootRelInfo->ri_RelationDesc))));
    }
 

diff --git a/src/backend/postmaster/pgarch.c b/src/backend/postmaster/pgarch.c
index 25e31c42e1662482c016c40ba155ad742e89a4e7..1240f9142370944cd80785898f87a4e32c1201a7 100644 (file)
--- a/src/backend/postmaster/pgarch.c
+++ b/src/backend/postmaster/pgarch.c
@@ -839,7 +839,7 @@ LoadArchiveLibrary(void)
 
    if (archive_init == NULL)
        ereport(ERROR,
-               (errmsg("archive modules have to declare the _PG_archive_module_init symbol")));
+               (errmsg("archive modules have to define the symbol %s", "_PG_archive_module_init")));
 
    (*archive_init) (&ArchiveContext);
 

diff --git a/src/backend/replication/logical/tablesync.c b/src/backend/replication/logical/tablesync.c
index 7a68a9a1fc0bf78b7ea90128b8d32fee3cd5cb0d..15fe698271317ba36245dcd4b76931fb9c78652d 100644 (file)
--- a/src/backend/replication/logical/tablesync.c
+++ b/src/backend/replication/logical/tablesync.c
@@ -1320,7 +1320,7 @@ LogicalRepSyncTableStart(XLogRecPtr *origin_startpos)
    if (check_enable_rls(RelationGetRelid(rel), InvalidOid, false) == RLS_ENABLED)
        ereport(ERROR,
                (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                errmsg("\"%s\" cannot replicate into relation with row-level security enabled: \"%s\"",
+                errmsg("user \"%s\" cannot replicate into relation with row-level security enabled: \"%s\"",
                        GetUserNameFromId(GetUserId(), true),
                        RelationGetRelationName(rel))));
 

diff --git a/src/backend/replication/logical/worker.c b/src/backend/replication/logical/worker.c
index 482ecb4d24618b4beabfc899dfc878735d8de507..6c97ef02809090b080f108ea0691bb3eb4b2079e 100644 (file)
--- a/src/backend/replication/logical/worker.c
+++ b/src/backend/replication/logical/worker.c
@@ -1631,7 +1631,7 @@ TargetPrivilegesCheck(Relation rel, AclMode mode)
    if (check_enable_rls(relid, InvalidOid, false) == RLS_ENABLED)
        ereport(ERROR,
                (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                errmsg("\"%s\" cannot replicate into relation with row-level security enabled: \"%s\"",
+                errmsg("user \"%s\" cannot replicate into relation with row-level security enabled: \"%s\"",
                        GetUserNameFromId(GetUserId(), true),
                        RelationGetRelationName(rel))));
 }
@@ -3788,7 +3788,7 @@ ApplyWorkerMain(Datum main_arg)
        }
 
        ereport(DEBUG1,
-               (errmsg("logical replication apply worker for subscription \"%s\" two_phase is %s",
+               (errmsg_internal("logical replication apply worker for subscription \"%s\" two_phase is %s",
                        MySubscription->name,
                        MySubscription->twophasestate == LOGICALREP_TWOPHASE_STATE_DISABLED ? "DISABLED" :
                        MySubscription->twophasestate == LOGICALREP_TWOPHASE_STATE_PENDING ? "PENDING" :
@@ -3837,7 +3837,7 @@ DisableSubscriptionAndExit(void)
 
    /* Notify the subscription has been disabled and exit */
    ereport(LOG,
-           errmsg("logical replication subscription \"%s\" has been disabled due to an error",
+           errmsg("subscription \"%s\" has been disabled because of an error",
                   MySubscription->name));
 
    proc_exit(0);
@@ -3972,7 +3972,7 @@ clear_subscription_skip_lsn(XLogRecPtr finish_lsn)
 
        if (myskiplsn != finish_lsn)
            ereport(WARNING,
-                   errmsg("skip-LSN of logical replication subscription \"%s\" cleared", MySubscription->name),
+                   errmsg("skip-LSN of subscription \"%s\" cleared", MySubscription->name),
                    errdetail("Remote transaction's finish WAL location (LSN) %X/%X did not match skip-LSN %X/%X.",
                              LSN_FORMAT_ARGS(finish_lsn),
                              LSN_FORMAT_ARGS(myskiplsn)));
@@ -3999,23 +3999,23 @@ apply_error_callback(void *arg)
    if (errarg->rel == NULL)
    {
        if (!TransactionIdIsValid(errarg->remote_xid))
-           errcontext("processing remote data for replication origin \"%s\" during \"%s\"",
+           errcontext("processing remote data for replication origin \"%s\" during message type \"%s\"",
                       errarg->origin_name,
                       logicalrep_message_type(errarg->command));
        else if (XLogRecPtrIsInvalid(errarg->finish_lsn))
-           errcontext("processing remote data for replication origin \"%s\" during \"%s\" in transaction %u",
+           errcontext("processing remote data for replication origin \"%s\" during message type \"%s\" in transaction %u",
                       errarg->origin_name,
                       logicalrep_message_type(errarg->command),
                       errarg->remote_xid);
        else
-           errcontext("processing remote data for replication origin \"%s\" during \"%s\" in transaction %u finished at %X/%X",
+           errcontext("processing remote data for replication origin \"%s\" during message type \"%s\" in transaction %u, finished at %X/%X",
                       errarg->origin_name,
                       logicalrep_message_type(errarg->command),
                       errarg->remote_xid,
                       LSN_FORMAT_ARGS(errarg->finish_lsn));
    }
    else if (errarg->remote_attnum < 0)
-       errcontext("processing remote data for replication origin \"%s\" during \"%s\" for replication target relation \"%s.%s\" in transaction %u finished at %X/%X",
+       errcontext("processing remote data for replication origin \"%s\" during message type \"%s\" for replication target relation \"%s.%s\" in transaction %u, finished at %X/%X",
                   errarg->origin_name,
                   logicalrep_message_type(errarg->command),
                   errarg->rel->remoterel.nspname,
@@ -4023,7 +4023,7 @@ apply_error_callback(void *arg)
                   errarg->remote_xid,
                   LSN_FORMAT_ARGS(errarg->finish_lsn));
    else
-       errcontext("processing remote data for replication origin \"%s\" during \"%s\" for replication target relation \"%s.%s\" column \"%s\" in transaction %u finished at %X/%X",
+       errcontext("processing remote data for replication origin \"%s\" during message type \"%s\" for replication target relation \"%s.%s\" column \"%s\" in transaction %u, finished at %X/%X",
                   errarg->origin_name,
                   logicalrep_message_type(errarg->command),
                   errarg->rel->remoterel.nspname,

diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c
index fb8dfd319937da9ac95ecddffccd8d0078b77c5a..66f44d25dcb3fa9b9d6982b212ddadcc5363026f 100644 (file)
--- a/src/backend/replication/walsender.c
+++ b/src/backend/replication/walsender.c
@@ -518,9 +518,8 @@ ReadReplicationSlot(ReadReplicationSlotCmd *cmd)
        if (OidIsValid(slot_contents.data.database))
            ereport(ERROR,
                    errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                   errmsg("cannot use \"%s\" with logical replication slot \"%s\"",
-                          "READ_REPLICATION_SLOT",
-                          NameStr(slot_contents.data.name)));
+                   errmsg("cannot use %s with a logical replication slot",
+                          "READ_REPLICATION_SLOT"));
 
        /* slot type */
        values[i] = CStringGetTextDatum("physical");

diff --git a/src/backend/utils/activity/pgstat.c b/src/backend/utils/activity/pgstat.c
index b0ff21b6908a27c01974e4b8eb28007974e907c2..168231e71d6ebc3fb65c9ded835a4b3b8a0cd3bf 100644 (file)
--- a/src/backend/utils/activity/pgstat.c
+++ b/src/backend/utils/activity/pgstat.c
@@ -425,7 +425,7 @@ pgstat_discard_stats(void)
    {
        ereport(DEBUG2,
                (errcode_for_file_access(),
-                errmsg("unlinked permanent statistics file \"%s\"",
+                errmsg_internal("unlinked permanent statistics file \"%s\"",
                        PGSTAT_STAT_PERMANENT_FILENAME)));
    }
 

diff --git a/src/backend/utils/activity/pgstat_xact.c b/src/backend/utils/activity/pgstat_xact.c
index 82eb59af834dee267defd36f5c467634fe32428e..d6f660edf7b1729fe22f0672ed3d5607acc45b5f 100644 (file)
--- a/src/backend/utils/activity/pgstat_xact.c
+++ b/src/backend/utils/activity/pgstat_xact.c
@@ -368,7 +368,7 @@ pgstat_create_transactional(PgStat_Kind kind, Oid dboid, Oid objoid)
    if (pgstat_get_entry_ref(kind, dboid, objoid, false, NULL))
    {
        ereport(WARNING,
-               errmsg("resetting existing stats for type %s, db=%u, oid=%u",
+               errmsg("resetting existing statistics for kind %s, db=%u, oid=%u",
                       (pgstat_get_kind_info(kind))->name, dboid, objoid));
 
        pgstat_reset(kind, dboid, objoid);

diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
index 8c3eba0a61f29da4e4993275f6cdca07b6e362cd..80a6bf31051c4f3f39d69e12ea18e106487707b9 100644 (file)
--- a/src/bin/pg_basebackup/pg_basebackup.c
+++ b/src/bin/pg_basebackup/pg_basebackup.c
@@ -1119,8 +1119,9 @@ CreateBackupStreamer(char *archive_name, char *spclocation,
     */
    if (inject_manifest && is_compressed_tar)
    {
-       pg_log_error("cannot inject manifest into a compressed tarfile");
-       pg_log_info("use client-side compression, send the output to a directory rather than standard output, or use --no-manifest");
+       pg_log_error("cannot inject manifest into a compressed tar file");
+       pg_log_error_hint("Use client-side compression, send the output to a directory rather than standard output, or use %s.",
+                         "--no-manifest");
        exit(1);
    }
 
@@ -1135,7 +1136,7 @@ CreateBackupStreamer(char *archive_name, char *spclocation,
    /* At present, we only know how to parse tar archives. */
    if (must_parse_archive && !is_tar && !is_compressed_tar)
    {
-       pg_log_error("unable to parse archive: %s", archive_name);
+       pg_log_error("cannot parse archive \"%s\"", archive_name);
        pg_log_error_detail("Only tar archives can be parsed.");
        if (format == 'p')
            pg_log_error_detail("Plain format requires pg_basebackup to parse the archive.");
@@ -1353,7 +1354,7 @@ ReceiveArchiveStreamChunk(size_t r, char *copybuf, void *callback_data)
                /* Sanity check. */
                if (state->manifest_buffer != NULL ||
                    state->manifest_file !=NULL)
-                   pg_fatal("archives should precede manifest");
+                   pg_fatal("archives must precede manifest");
 
                /* Parse the rest of the CopyData message. */
                archive_name = GetCopyDataString(r, copybuf, &cursor);
@@ -1799,7 +1800,7 @@ BaseBackup(char *compression_algorithm, char *compression_detail,
         * Error message already written in CheckServerVersionForStreaming(),
         * but add a hint about using -X none.
         */
-       pg_log_info("HINT: use -X none or -X fetch to disable log streaming");
+       pg_log_error_hint("Use -X none or -X fetch to disable log streaming.");
        exit(1);
    }
 
@@ -1911,7 +1912,7 @@ BaseBackup(char *compression_algorithm, char *compression_detail,
 
    if (showprogress && !verbose)
    {
-       fprintf(stderr, "waiting for checkpoint");
+       fprintf(stderr, _("waiting for checkpoint"));
        if (isatty(fileno(stderr)))
            fprintf(stderr, "\r");
        else
@@ -2553,7 +2554,7 @@ main(int argc, char **argv)
        char       *error_detail;
 
        if (!parse_compress_algorithm(compression_algorithm, &alg))
-           pg_fatal("unrecognized compression algorithm \"%s\"",
+           pg_fatal("unrecognized compression algorithm: \"%s\"",
                     compression_algorithm);
 
        parse_compress_specification(alg, compression_detail, &client_compress);

diff --git a/src/bin/pg_basebackup/pg_receivewal.c b/src/bin/pg_basebackup/pg_receivewal.c
index e6c975d4f4447173d75d859035d0dd80a30c98a6..26dcf339f72c1276455abe2d60edb5e8d2000888 100644 (file)
--- a/src/bin/pg_basebackup/pg_receivewal.c
+++ b/src/bin/pg_basebackup/pg_receivewal.c
@@ -511,10 +511,8 @@ FindStreamingStart(uint32 *tli)
                continue;
            }
 #else
-           pg_log_error("could not check file \"%s\"",
-                        dirent->d_name);
-           pg_log_error_detail("This build does not support compression with %s.",
-                               "LZ4");
+           pg_log_error("cannot check file \"%s\": compression with %s not supported by this build",
+                        dirent->d_name, "LZ4");
            exit(1);
 #endif
        }
@@ -867,7 +865,7 @@ main(int argc, char **argv)
     */
    if (!parse_compress_algorithm(compression_algorithm_str,
                                  &compression_algorithm))
-       pg_fatal("unrecognized compression algorithm \"%s\"",
+       pg_fatal("unrecognized compression algorithm: \"%s\"",
                 compression_algorithm_str);
 
    parse_compress_specification(compression_algorithm, compression_detail,

diff --git a/src/bin/pg_basebackup/streamutil.c b/src/bin/pg_basebackup/streamutil.c
index 299b9b76213a4ba778b86acc218014a1b31328d7..1478aa9f25a8aa76a9895f7578b43ee133c2050a 100644 (file)
--- a/src/bin/pg_basebackup/streamutil.c
+++ b/src/bin/pg_basebackup/streamutil.c
@@ -522,7 +522,7 @@ GetSlotInformation(PGconn *conn, const char *slot_name,
     */
    if (PQgetisnull(res, 0, 0))
    {
-       pg_log_error("could not find replication slot \"%s\"", slot_name);
+       pg_log_error("replication slot \"%s\" does not exist", slot_name);
        PQclear(res);
        return false;
    }

diff --git a/src/bin/pg_basebackup/t/010_pg_basebackup.pl b/src/bin/pg_basebackup/t/010_pg_basebackup.pl
index f03f43d66837fd2aaa41f30278d0e420a6628901..bcc3dd5f0b247964ee1893decca34352b12966ba 100644 (file)
--- a/src/bin/pg_basebackup/t/010_pg_basebackup.pl
+++ b/src/bin/pg_basebackup/t/010_pg_basebackup.pl
@@ -44,7 +44,7 @@ $node->command_fails_like(
    'failure if method "none" specified with compression level');
 $node->command_fails_like(
    [ 'pg_basebackup', '-D', "$tempdir/backup", '--compress', 'none+' ],
-   qr/\Qunrecognized compression algorithm "none+"/,
+   qr/\Qunrecognized compression algorithm: "none+"/,
    'failure on incorrect separator to define compression level');
 
 # Some Windows ANSI code pages may reject this filename, in which case we
@@ -97,7 +97,7 @@ SKIP:
    my @compression_failure_tests = (
        [
            'extrasquishy',
-           'unrecognized compression algorithm "extrasquishy"',
+           'unrecognized compression algorithm: "extrasquishy"',
            'failure on invalid compression algorithm'
        ],
        [
@@ -107,7 +107,7 @@ SKIP:
        ],
        [
            'gzip:thunk',
-           'invalid compression specification: unknown compression option "thunk"',
+           'invalid compression specification: unrecognized compression option: "thunk"',
            'failure on unknown compression option'
        ],
        [

diff --git a/src/bin/pg_basebackup/t/020_pg_receivewal.pl b/src/bin/pg_basebackup/t/020_pg_receivewal.pl
index 4f07bb890780a60b3dee026e2e23dde95a10c460..985e68eff1b4375b3e3ce147bbc7563854d25bd3 100644 (file)
--- a/src/bin/pg_basebackup/t/020_pg_receivewal.pl
+++ b/src/bin/pg_basebackup/t/020_pg_receivewal.pl
@@ -251,7 +251,7 @@ $primary->command_fails_like(
        'nonexistentslot', '-n', '--no-sync', '--verbose',
        '--endpos',        $nextlsn
    ],
-   qr/pg_receivewal: error: could not find replication slot "nonexistentslot"/,
+   qr/pg_receivewal: error: replication slot "nonexistentslot" does not exist/,
    'pg_receivewal fails with non-existing slot');
 $primary->command_ok(
    [

diff --git a/src/bin/scripts/t/020_createdb.pl b/src/bin/scripts/t/020_createdb.pl
index 8ed8628db11c1410db4987f11250535bfb1aa008..2e712f4fe921a9463b5f92ddf73ed0a244568ff9 100644 (file)
--- a/src/bin/scripts/t/020_createdb.pl
+++ b/src/bin/scripts/t/020_createdb.pl
@@ -143,7 +143,7 @@ $node->command_checks_all(
    1,
    [qr/^$/],
    [
-       qr/^createdb: error: database creation failed: ERROR:  invalid create database strategy foo/s
+       qr/^createdb: error: database creation failed: ERROR:  invalid create database strategy "foo"/s
    ],
    'createdb with incorrect --strategy');
 

diff --git a/src/common/compression.c b/src/common/compression.c
index 0c6bb9177b9e1ab3c1427cd32d0322198ac37fd8..df5b627834d5d8294dcd83ab39541fdaa5ff32ad 100644 (file)
--- a/src/common/compression.c
+++ b/src/common/compression.c
@@ -234,7 +234,7 @@ parse_compress_specification(pg_compress_algorithm algorithm, char *specificatio
        }
        else
            result->parse_error =
-               psprintf(_("unknown compression option \"%s\""), keyword);
+               psprintf(_("unrecognized compression option: \"%s\""), keyword);
 
        /* Release memory, just to be tidy. */
        pfree(keyword);

diff --git a/src/test/recovery/t/006_logical_decoding.pl b/src/test/recovery/t/006_logical_decoding.pl
index 0cd0467fbb83872ce086db3838b66e1cf1b25390..a9edd8ccfca6319633b45fce44a41158e74feedd 100644 (file)
--- a/src/test/recovery/t/006_logical_decoding.pl
+++ b/src/test/recovery/t/006_logical_decoding.pl
@@ -45,7 +45,7 @@ ok( $stderr =~
    replication => 'database');
 like(
    $stderr,
-   qr/cannot use "READ_REPLICATION_SLOT" with logical replication slot "test_slot"/,
+   qr/cannot use READ_REPLICATION_SLOT with a logical replication slot/,
    'READ_REPLICATION_SLOT not supported for logical slots');
 
 # Check case of walsender not using a database connection.  Logical

diff --git a/src/test/regress/expected/foreign_key.out b/src/test/regress/expected/foreign_key.out
index da26f083bc26c0481815d04a2a0768584066d309..e447b15ebbe5f343d5d23765f6bcd40e303e01c5 100644 (file)
--- a/src/test/regress/expected/foreign_key.out
+++ b/src/test/regress/expected/foreign_key.out
@@ -2761,8 +2761,8 @@ DELETE FROM fkpart11.fk WHERE a = 4;
 ALTER TABLE fkpart11.fk ADD CONSTRAINT fkey FOREIGN KEY (a) REFERENCES fkpart11.pk1 (a) ON UPDATE CASCADE ON DELETE CASCADE;
 UPDATE fkpart11.pk SET a = a - 1;
 ERROR:  cannot move tuple across partitions when a non-root ancestor of the source partition is directly referenced in a foreign key
-DETAIL:  A foreign key points to ancestor "pk1", but not the root ancestor "pk".
-HINT:  Consider defining the foreign key on "pk".
+DETAIL:  A foreign key points to ancestor "pk1" but not the root ancestor "pk".
+HINT:  Consider defining the foreign key on table "pk".
 -- it's okay though if the non-leaf partition is updated directly
 UPDATE fkpart11.pk1 SET a = a - 1;
 SELECT tableoid::pg_catalog.regclass, * FROM fkpart11.pk;

diff --git a/src/test/regress/expected/publication.out b/src/test/regress/expected/publication.out
index c0c0e7d92e01953c0ad45fc0d51bab7437fb82a6..bfce1e1bc099fc0f9ec5b631a73222cefac3aaf9 100644 (file)
--- a/src/test/regress/expected/publication.out
+++ b/src/test/regress/expected/publication.out
@@ -72,15 +72,15 @@ DETAIL:  Tables cannot be added to or dropped from FOR ALL TABLES publications.
 -- fail - can't add schema to 'FOR ALL TABLES' publication
 ALTER PUBLICATION testpub_foralltables ADD TABLES IN SCHEMA pub_test;
 ERROR:  publication "testpub_foralltables" is defined as FOR ALL TABLES
-DETAIL:  Tables from schema cannot be added to, dropped from, or set on FOR ALL TABLES publications.
+DETAIL:  Schemas cannot be added to or dropped from FOR ALL TABLES publications.
 -- fail - can't drop schema from 'FOR ALL TABLES' publication
 ALTER PUBLICATION testpub_foralltables DROP TABLES IN SCHEMA pub_test;
 ERROR:  publication "testpub_foralltables" is defined as FOR ALL TABLES
-DETAIL:  Tables from schema cannot be added to, dropped from, or set on FOR ALL TABLES publications.
+DETAIL:  Schemas cannot be added to or dropped from FOR ALL TABLES publications.
 -- fail - can't set schema to 'FOR ALL TABLES' publication
 ALTER PUBLICATION testpub_foralltables SET TABLES IN SCHEMA pub_test;
 ERROR:  publication "testpub_foralltables" is defined as FOR ALL TABLES
-DETAIL:  Tables from schema cannot be added to, dropped from, or set on FOR ALL TABLES publications.
+DETAIL:  Schemas cannot be added to or dropped from FOR ALL TABLES publications.
 SET client_min_messages = 'ERROR';
 CREATE PUBLICATION testpub_fortable FOR TABLE testpub_tbl1;
 RESET client_min_messages;
@@ -470,7 +470,7 @@ CREATE PUBLICATION testpub6 FOR TABLE testpub_rf_tbl1 WHERE (a IN (SELECT genera
 ERROR:  invalid publication WHERE expression
 LINE 1: ...ICATION testpub6 FOR TABLE testpub_rf_tbl1 WHERE (a IN (SELE...
                                                              ^
-DETAIL:  Expressions only allow columns, constants, built-in operators, built-in data types, built-in collations, and immutable built-in functions.
+DETAIL:  Only columns, constants, built-in operators, built-in data types, built-in collations, and immutable built-in functions are allowed.
 -- fail - system columns are not allowed
 CREATE PUBLICATION testpub6 FOR TABLE testpub_rf_tbl1 WHERE ('(0,1)'::tid = ctid);
 ERROR:  invalid publication WHERE expression
@@ -680,10 +680,10 @@ DETAIL:  Column list used by the publication does not cover the replica identity
 ALTER PUBLICATION testpub_fortable DROP TABLE testpub_tbl5;
 -- error: generated column "d" can't be in list
 ALTER PUBLICATION testpub_fortable ADD TABLE testpub_tbl5 (a, d);
-ERROR:  cannot reference generated column "d" in publication column list
+ERROR:  cannot use generated column "d" in publication column list
 -- error: system attributes "ctid" not allowed in column list
 ALTER PUBLICATION testpub_fortable ADD TABLE testpub_tbl5 (a, ctid);
-ERROR:  cannot reference system column "ctid" in publication column list
+ERROR:  cannot use system column "ctid" in publication column list
 -- ok
 ALTER PUBLICATION testpub_fortable ADD TABLE testpub_tbl5 (a, c);
 ALTER TABLE testpub_tbl5 DROP COLUMN c;        -- no dice

diff --git a/src/test/regress/expected/triggers.out b/src/test/regress/expected/triggers.out
index 8fe42ec5604da42b324f7fd7316391b3b3dc70b2..641f5e67c47541c3b007c4d6582f2162d9533b62 100644 (file)
--- a/src/test/regress/expected/triggers.out
+++ b/src/test/regress/expected/triggers.out
@@ -3546,7 +3546,7 @@ LINE 1: alter trigger a on only grandparent rename to b;
                            ^
 alter trigger b on middle rename to c; -- can't rename trigger on partition
 ERROR:  cannot rename trigger "b" on table "middle"
-HINT:  Rename trigger on partitioned table "grandparent" instead.
+HINT:  Rename the trigger on the partitioned table "grandparent" instead.
 create trigger c after insert on middle
 for each row execute procedure f();
 alter trigger b on grandparent rename to c;

diff --git a/src/test/subscription/t/027_nosuperuser.pl b/src/test/subscription/t/027_nosuperuser.pl
index f9f6117dfb49a5e7f6c8b7c11f2000d5ec6acf2c..8614bf0458c1888be7f31c402e60a4d223fc0593 100644 (file)
--- a/src/test/subscription/t/027_nosuperuser.pl
+++ b/src/test/subscription/t/027_nosuperuser.pl
@@ -260,7 +260,7 @@ expect_failure(
    2,
    11,
    13,
-   qr/ERROR: ( [A-Z0-9]+:)? "regress_admin" cannot replicate into relation with row-level security enabled: "unpartitioned\w*"/msi,
+   qr/ERROR: ( [A-Z0-9]+:)? user "regress_admin" cannot replicate into relation with row-level security enabled: "unpartitioned\w*"/msi,
    "non-superuser admin fails to replicate insert into rls enabled table");
 grant_superuser("regress_admin");
 expect_replication("alice.unpartitioned", 3, 11, 15,
@@ -274,7 +274,7 @@ expect_failure(
    3,
    11,
    15,
-   qr/ERROR: ( [A-Z0-9]+:)? "regress_admin" cannot replicate into relation with row-level security enabled: "unpartitioned\w*"/msi,
+   qr/ERROR: ( [A-Z0-9]+:)? user "regress_admin" cannot replicate into relation with row-level security enabled: "unpartitioned\w*"/msi,
    "non-superuser admin fails to replicate update into rls enabled unpartitioned"
 );
 
@@ -289,7 +289,7 @@ expect_failure(
    3,
    13,
    17,
-   qr/ERROR: ( [A-Z0-9]+:)? "regress_admin" cannot replicate into relation with row-level security enabled: "unpartitioned\w*"/msi,
+   qr/ERROR: ( [A-Z0-9]+:)? user "regress_admin" cannot replicate into relation with row-level security enabled: "unpartitioned\w*"/msi,
    "non-superuser admin without bypassrls fails to replicate delete into rls enabled unpartitioned"
 );
 grant_bypassrls("regress_admin");

diff --git a/src/test/subscription/t/029_on_error.pl b/src/test/subscription/t/029_on_error.pl
index add8788370c603226f2b976588dc1f18d3d3e2f8..1bd18a62cd80d62aeed07b6bc9a8012a3875e688 100644 (file)
--- a/src/test/subscription/t/029_on_error.pl
+++ b/src/test/subscription/t/029_on_error.pl
@@ -29,7 +29,7 @@ sub test_skip_lsn
    # Get the finish LSN of the error transaction.
    my $contents = slurp_file($node_subscriber->logfile, $offset);
    $contents =~
-     qr/processing remote data for replication origin \"pg_\d+\" during "INSERT" for replication target relation "public.tbl" in transaction \d+ finished at ([[:xdigit:]]+\/[[:xdigit:]]+)/
+     qr/processing remote data for replication origin \"pg_\d+\" during message type "INSERT" for replication target relation "public.tbl" in transaction \d+, finished at ([[:xdigit:]]+\/[[:xdigit:]]+)/
      or die "could not get error-LSN";
    my $lsn = $1;