mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-12-03 08:00:21 +08:00
Improve use of prepositions in messages
*in* database, *in* cluster, *on* server; and some related fixes
This commit is contained in:
parent
7666ef313d
commit
871696ba20
@ -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"));
|
||||
|
@ -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 */
|
||||
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
@ -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:
|
||||
|
Loading…
Reference in New Issue
Block a user