Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 871696b

Browse files
committed
Improve use of prepositions in messages
*in* database, *in* cluster, *on* server; and some related fixes
1 parent 7666ef3 commit 871696b

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

src/bin/pg_dump/pg_dump.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1032,8 +1032,8 @@ help(const char *progname)
10321032
printf(_(" --extra-float-digits=NUM override default setting for extra_float_digits\n"));
10331033
printf(_(" --if-exists use IF EXISTS when dropping objects\n"));
10341034
printf(_(" --include-foreign-data=PATTERN\n"
1035-
" include data of foreign tables in\n"
1036-
" foreign servers matching PATTERN\n"));
1035+
" include data of foreign tables on foreign\n"
1036+
" servers matching PATTERN\n"));
10371037
printf(_(" --inserts dump data as INSERT commands, rather than COPY\n"));
10381038
printf(_(" --load-via-partition-root load partitions via the root table\n"));
10391039
printf(_(" --no-comments do not dump comments\n"));

src/bin/pg_rewind/libpq_fetch.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ run_simple_query(const char *sql)
108108
res = PQexec(conn, sql);
109109

110110
if (PQresultStatus(res) != PGRES_TUPLES_OK)
111-
pg_fatal("error running query (%s) in source server: %s",
111+
pg_fatal("error running query (%s) on source server: %s",
112112
sql, PQresultErrorMessage(res));
113113

114114
/* sanity check the result set */

src/bin/pg_rewind/pg_rewind.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -873,7 +873,7 @@ getRestoreCommand(const char *argv0)
873873
(void) pg_strip_crlf(cmd_output);
874874

875875
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");
877877

878878
restore_command = pg_strdup(cmd_output);
879879

@@ -936,7 +936,7 @@ ensureCleanShutdown(const char *argv0)
936936

937937
if (system(cmd) != 0)
938938
{
939-
pg_log_error("postgres single-user mode of target instance failed");
939+
pg_log_error("postgres single-user mode in target cluster failed");
940940
pg_fatal("Command was: %s", cmd);
941941
}
942942
}

src/bin/scripts/reindexdb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ run_reindex_command(PGconn *conn, ReindexType type, const char *name,
567567
name, PQdb(conn), PQerrorMessage(conn));
568568
break;
569569
case REINDEX_SYSTEM:
570-
pg_log_error("reindexing of system catalogs on database \"%s\" failed: %s",
570+
pg_log_error("reindexing of system catalogs in database \"%s\" failed: %s",
571571
PQdb(conn), PQerrorMessage(conn));
572572
break;
573573
case REINDEX_TABLE:

0 commit comments

Comments
 (0)