1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Message fixes for pg_createsubscriber

Browse Source 
Author: Kyotaro Horiguchi <horikyota.ntt@gmail.com>
Discussion: https://www.postgresql.org/message-id/20240326.140116.1116279856046587865.horikyota.ntt@gmail.com
This commit is contained in:
Peter Eisentraut 2024-03-26 08:22:46 +01:00
parent a0e22ef911
commit 8c4f2d5475
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/bin/pg_basebackup/pg_createsubscriber.c
View File

@ -372,8 +372,7 @@ check_data_directory(const char *datadir)
if (errno == ENOENT) if (errno == ENOENT)
pg_fatal("data directory \"%s\" does not exist", datadir); pg_fatal("data directory \"%s\" does not exist", datadir);
else else
pg_fatal("could not access directory \"%s\": %s", datadir, pg_fatal("could not access directory \"%s\": %m", datadir);
strerror(errno));
} }
snprintf(versionfile, MAXPGPATH, "%s/PG_VERSION", datadir); snprintf(versionfile, MAXPGPATH, "%s/PG_VERSION", datadir);
@ -684,7 +683,7 @@ generate_object_name(PGconn *conn)
if (PQntuples(res) != 1) 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); PQntuples(res), 1);
disconnect_database(conn, true); disconnect_database(conn, true);
} }
@ -920,7 +919,7 @@ check_publisher(const struct LogicalRepInfo *dbinfo)
if (strcmp(wal_level, "logical") != 0) if (strcmp(wal_level, "logical") != 0)
{ {
pg_log_error("publisher requires wal_level >= logical"); pg_log_error("publisher requires wal_level >= \"logical\"");
failed = true; failed = true;
} }
@ -1649,7 +1648,7 @@ set_replication_progress(PGconn *conn, const struct LogicalRepInfo *dbinfo, cons
if (PQntuples(res) != 1 && !dry_run) 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); PQntuples(res), 1);
disconnect_database(conn, true); disconnect_database(conn, true);
} }