Improve use of prepositions in messages

petere · petere · commit 871696ba20e0 · 2020-05-08T20:36:25.000+02:00
*in* database, *in* cluster, *on* server; and some related fixes
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
@@ -1032,8 +1032,8 @@ help(const char *progname)
 	printf(_("  --extra-float-digits=NUM     override default setting for extra_float_digits\n"));
 	printf(_("  --if-exists                  use IF EXISTS when dropping objects\n"));
 	printf(_("  --include-foreign-data=PATTERN\n"
-			 "                               include data of foreign tables in\n"
-			 "                               foreign servers matching PATTERN\n"));
+			 "                               include data of foreign tables on foreign\n"
+			 "                               servers matching PATTERN\n"));
 	printf(_("  --inserts                    dump data as INSERT commands, rather than COPY\n"));
 	printf(_("  --load-via-partition-root    load partitions via the root table\n"));
 	printf(_("  --no-comments                do not dump comments\n"));
diff --git a/src/bin/pg_rewind/libpq_fetch.c b/src/bin/pg_rewind/libpq_fetch.c
@@ -108,7 +108,7 @@ run_simple_query(const char *sql)
 	res = PQexec(conn, sql);
 
 	if (PQresultStatus(res) != PGRES_TUPLES_OK)
-		pg_fatal("error running query (%s) in source server: %s",
+		pg_fatal("error running query (%s) on source server: %s",
 				 sql, PQresultErrorMessage(res));
 
 	/* sanity check the result set */
diff --git a/src/bin/pg_rewind/pg_rewind.c b/src/bin/pg_rewind/pg_rewind.c
@@ -873,7 +873,7 @@ getRestoreCommand(const char *argv0)
 	(void) pg_strip_crlf(cmd_output);
 
 	if (strcmp(cmd_output, "") == 0)
-		pg_fatal("restore_command is not set on the target cluster");
+		pg_fatal("restore_command is not set in the target cluster");
 
 	restore_command = pg_strdup(cmd_output);
 
@@ -936,7 +936,7 @@ ensureCleanShutdown(const char *argv0)
 
 	if (system(cmd) != 0)
 	{
-		pg_log_error("postgres single-user mode of target instance failed");
+		pg_log_error("postgres single-user mode in target cluster failed");
 		pg_fatal("Command was: %s", cmd);
 	}
 }
diff --git a/src/bin/scripts/reindexdb.c b/src/bin/scripts/reindexdb.c
@@ -567,7 +567,7 @@ run_reindex_command(PGconn *conn, ReindexType type, const char *name,
 							 name, PQdb(conn), PQerrorMessage(conn));
 				break;
 			case REINDEX_SYSTEM:
-				pg_log_error("reindexing of system catalogs on database \"%s\" failed: %s",
+				pg_log_error("reindexing of system catalogs in database \"%s\" failed: %s",
 							 PQdb(conn), PQerrorMessage(conn));
 				break;
 			case REINDEX_TABLE:

Original file line number	Diff line number	Diff line change
`@@ -873,7 +873,7 @@ getRestoreCommand(const char *argv0)`
`873`	`873`	`(void) pg_strip_crlf(cmd_output);`
`874`	`874`
`875`	`875`	`if (strcmp(cmd_output, "") == 0)`
`876`		`- pg_fatal("restore_command is not set on the target cluster");`
	`876`	`+ pg_fatal("restore_command is not set in the target cluster");`
`877`	`877`
`878`	`878`	`restore_command = pg_strdup(cmd_output);`
`879`	`879`
`@@ -936,7 +936,7 @@ ensureCleanShutdown(const char *argv0)`
`936`	`936`
`937`	`937`	`if (system(cmd) != 0)`
`938`	`938`	`{`
`939`		`- pg_log_error("postgres single-user mode of target instance failed");`
	`939`	`+ pg_log_error("postgres single-user mode in target cluster failed");`
`940`	`940`	`pg_fatal("Command was: %s", cmd);`
`941`	`941`	`}`
`942`	`942`	`}`