From b6dacc173b6830c515d970698cead9a85663c553 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Mon, 25 Apr 2016 17:16:59 -0400 Subject: [PATCH] pg_dump: Message style improvements --- src/bin/pg_dump/pg_backup_archiver.c | 10 +++++----- src/bin/pg_dump/pg_dump.c | 8 ++++---- src/bin/pg_dump/pg_dumpall.c | 2 +- src/bin/pg_dump/pg_restore.c | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c index fdca64f07e..9390a6b837 100644 --- a/src/bin/pg_dump/pg_backup_archiver.c +++ b/src/bin/pg_dump/pg_backup_archiver.c @@ -2658,35 +2658,35 @@ StrictNamesCheck(RestoreOptions *ropt) { missing_name = simple_string_list_not_touched(&ropt->schemaNames); if (missing_name != NULL) - exit_horribly(modulename, "Schema \"%s\" not found.\n", missing_name); + exit_horribly(modulename, "schema \"%s\" not found\n", missing_name); } if (ropt->tableNames.head != NULL) { missing_name = simple_string_list_not_touched(&ropt->tableNames); if (missing_name != NULL) - exit_horribly(modulename, "Table \"%s\" not found.\n", missing_name); + exit_horribly(modulename, "table \"%s\" not found\n", missing_name); } if (ropt->indexNames.head != NULL) { missing_name = simple_string_list_not_touched(&ropt->indexNames); if (missing_name != NULL) - exit_horribly(modulename, "Index \"%s\" not found.\n", missing_name); + exit_horribly(modulename, "index \"%s\" not found\n", missing_name); } if (ropt->functionNames.head != NULL) { missing_name = simple_string_list_not_touched(&ropt->functionNames); if (missing_name != NULL) - exit_horribly(modulename, "Function \"%s\" not found.\n", missing_name); + exit_horribly(modulename, "function \"%s\" not found\n", missing_name); } if (ropt->triggerNames.head != NULL) { missing_name = simple_string_list_not_touched(&ropt->triggerNames); if (missing_name != NULL) - exit_horribly(modulename, "Trigger \"%s\" not found.\n", missing_name); + exit_horribly(modulename, "trigger \"%s\" not found\n", missing_name); } } diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index 396c03d69f..593df57245 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -706,7 +706,7 @@ main(int argc, char **argv) &schema_include_oids, strict_names); if (schema_include_oids.head == NULL) - exit_horribly(NULL, "No matching schemas were found\n"); + exit_horribly(NULL, "no matching schemas were found\n"); } expand_schema_name_patterns(fout, &schema_exclude_patterns, &schema_exclude_oids, @@ -720,7 +720,7 @@ main(int argc, char **argv) &table_include_oids, strict_names); if (table_include_oids.head == NULL) - exit_horribly(NULL, "No matching tables were found\n"); + exit_horribly(NULL, "no matching tables were found\n"); } expand_table_name_patterns(fout, &table_exclude_patterns, &table_exclude_oids, @@ -1190,7 +1190,7 @@ expand_schema_name_patterns(Archive *fout, res = ExecuteSqlQuery(fout, query->data, PGRES_TUPLES_OK); if (strict_names && PQntuples(res) == 0) - exit_horribly(NULL, "No matching table(s) were found for pattern \"%s\"\n", cell->val); + exit_horribly(NULL, "no matching tables were found for pattern \"%s\"\n", cell->val); for (i = 0; i < PQntuples(res); i++) { @@ -12315,7 +12315,7 @@ dumpAccessMethod(Archive *fout, AccessMethodInfo *aminfo) appendPQExpBuffer(q, "TYPE INDEX "); break; default: - write_msg(NULL, "WARNING: invalid type %c of access method %s\n", + write_msg(NULL, "WARNING: invalid type \"%c\" of access method \"%s\"\n", aminfo->amtype, qamname); pg_free(qamname); destroyPQExpBuffer(q); diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c index a7dc41c46d..02fa699056 100644 --- a/src/bin/pg_dump/pg_dumpall.c +++ b/src/bin/pg_dump/pg_dumpall.c @@ -774,7 +774,7 @@ dumpRoles(PGconn *conn) if (strncmp(rolename,"pg_",3) == 0) { - fprintf(stderr, _("%s: role name starting with 'pg_' skipped (%s)\n"), + fprintf(stderr, _("%s: role name starting with \"pg_\" skipped (%s)\n"), progname, rolename); continue; } diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c index c426189f92..fb08e6bb8e 100644 --- a/src/bin/pg_dump/pg_restore.c +++ b/src/bin/pg_dump/pg_restore.c @@ -460,7 +460,7 @@ usage(const char *progname) printf(_(" -P, --function=NAME(args) restore named function\n")); printf(_(" -s, --schema-only restore only the schema, no data\n")); printf(_(" -S, --superuser=NAME superuser user name to use for disabling triggers\n")); - printf(_(" -t, --table=NAME restore named relation (table, view, etc)\n")); + printf(_(" -t, --table=NAME restore named relation (table, view, etc.)\n")); printf(_(" -T, --trigger=NAME restore named trigger\n")); printf(_(" -x, --no-privileges skip restoration of access privileges (grant/revoke)\n")); printf(_(" -1, --single-transaction restore as a single transaction\n")); -- 2.40.0