pg_dump: Message style improvements

diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index fdca64f07ef78dcf586885cbbf2ff60a82e188e5..9390a6b837e518ddf4fd35dcd3cc48f9d1af1787 100644 (file)
--- 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 396c03d69ff1a0e09fbd2f41dc633006d0f16cad..593df572459b59a8bad2f803ddaaafca5d41f428 100644 (file)
--- 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 a7dc41c46d04ce946224524e08c6120cd41d6865..02fa699056270b76cf479e0de72eb41991831b6f 100644 (file)
--- 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 c426189f9277e4c846a92238099dae3f8bcb4fd5..fb08e6bb8ef1eb53906ab7e3b9866f833ee2e9bb 100644 (file)
--- 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"));