Message fixes for pg_createsubscriber

Author: Kyotaro Horiguchi <[email protected]>
Discussion: https://www.postgresql.org/message-id/20240326.140116.1116279856046587865[email protected]

diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c
index b8f826934056fc3deebf2dac569d6696f09f104b..a6e09866705a27be8acf091ad3e8841829df91b1 100644 (file)
--- a/src/bin/pg_basebackup/pg_createsubscriber.c
+++ b/src/bin/pg_basebackup/pg_createsubscriber.c
@@ -372,8 +372,7 @@ check_data_directory(const char *datadir)
        if (errno == ENOENT)
            pg_fatal("data directory \"%s\" does not exist", datadir);
        else
-           pg_fatal("could not access directory \"%s\": %s", datadir,
-                    strerror(errno));
+           pg_fatal("could not access directory \"%s\": %m", datadir);
    }
 
    snprintf(versionfile, MAXPGPATH, "%s/PG_VERSION", datadir);
@@ -684,7 +683,7 @@ generate_object_name(PGconn *conn)
 
    if (PQntuples(res) != 1)
    {
-       pg_log_error("could not obtain database OID: got %d rows, expected %d rows",
+       pg_log_error("could not obtain database OID: got %d rows, expected %d row",
                     PQntuples(res), 1);
        disconnect_database(conn, true);
    }
@@ -920,7 +919,7 @@ check_publisher(const struct LogicalRepInfo *dbinfo)
 
    if (strcmp(wal_level, "logical") != 0)
    {
-       pg_log_error("publisher requires wal_level >= logical");
+       pg_log_error("publisher requires wal_level >= \"logical\"");
        failed = true;
    }
 
@@ -1649,7 +1648,7 @@ set_replication_progress(PGconn *conn, const struct LogicalRepInfo *dbinfo, cons
 
    if (PQntuples(res) != 1 && !dry_run)
    {
-       pg_log_error("could not obtain subscription OID: got %d rows, expected %d rows",
+       pg_log_error("could not obtain subscription OID: got %d rows, expected %d row",
                     PQntuples(res), 1);
        disconnect_database(conn, true);
    }