Message fixes for pg_createsubscriber

petere · petere · commit 8c4f2d5475b9 · 2024-03-26T08:22:46.000+01:00
Author: Kyotaro Horiguchi <horikyota.ntt@gmail.com> Discussion: https://www.postgresql.org/message-id/20240326.140116.1116279856046587865.horikyota.ntt@gmail.com
diff --git 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);
 	}

Original file line number	Diff line number	Diff line change
`@@ -372,8 +372,7 @@ check_data_directory(const char *datadir)`
`372`	`372`	`if (errno == ENOENT)`
`373`	`373`	`pg_fatal("data directory \"%s\" does not exist", datadir);`
`374`	`374`	`else`
`375`		`- pg_fatal("could not access directory \"%s\": %s", datadir,`
`376`		`- strerror(errno));`
	`375`	`+ pg_fatal("could not access directory \"%s\": %m", datadir);`
`377`	`376`	`}`
`378`	`377`
`379`	`378`	`snprintf(versionfile, MAXPGPATH, "%s/PG_VERSION", datadir);`
`@@ -684,7 +683,7 @@ generate_object_name(PGconn *conn)`
`684`	`683`
`685`	`684`	`if (PQntuples(res) != 1)`
`686`	`685`	`{`
`687`		`- pg_log_error("could not obtain database OID: got %d rows, expected %d rows",`
	`686`	`+ pg_log_error("could not obtain database OID: got %d rows, expected %d row",`
`688`	`687`	`PQntuples(res), 1);`
`689`	`688`	`disconnect_database(conn, true);`
`690`	`689`	`}`
`@@ -920,7 +919,7 @@ check_publisher(const struct LogicalRepInfo *dbinfo)`
`920`	`919`
`921`	`920`	`if (strcmp(wal_level, "logical") != 0)`
`922`	`921`	`{`
`923`		`- pg_log_error("publisher requires wal_level >= logical");`
	`922`	`+ pg_log_error("publisher requires wal_level >= \"logical\"");`
`924`	`923`	`failed = true;`
`925`	`924`	`}`
`926`	`925`
`@@ -1649,7 +1648,7 @@ set_replication_progress(PGconn conn, const struct LogicalRepInfo dbinfo, cons`
`1649`	`1648`
`1650`	`1649`	`if (PQntuples(res) != 1 && !dry_run)`
`1651`	`1650`	`{`
`1652`		`- pg_log_error("could not obtain subscription OID: got %d rows, expected %d rows",`
	`1651`	`+ pg_log_error("could not obtain subscription OID: got %d rows, expected %d row",`
`1653`	`1652`	`PQntuples(res), 1);`
`1654`	`1653`	`disconnect_database(conn, true);`
`1655`	`1654`	`}`