mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pg_dump: Message style improvements

Browse Source
This commit is contained in:
Peter Eisentraut 2016-04-25 17:16:59 -04:00
parent e65953be4f
commit b6dacc173b
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/bin/pg_dump/pg_backup_archiver.c
View File

@ -2658,35 +2658,35 @@ StrictNamesCheck(RestoreOptions *ropt)
{ {
missing_name = simple_string_list_not_touched(&ropt->schemaNames); missing_name = simple_string_list_not_touched(&ropt->schemaNames);
if (missing_name != NULL) 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) if (ropt->tableNames.head != NULL)
{ {
missing_name = simple_string_list_not_touched(&ropt->tableNames); missing_name = simple_string_list_not_touched(&ropt->tableNames);
if (missing_name != NULL) 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) if (ropt->indexNames.head != NULL)
{ {
missing_name = simple_string_list_not_touched(&ropt->indexNames); missing_name = simple_string_list_not_touched(&ropt->indexNames);
if (missing_name != NULL) 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) if (ropt->functionNames.head != NULL)
{ {
missing_name = simple_string_list_not_touched(&ropt->functionNames); missing_name = simple_string_list_not_touched(&ropt->functionNames);
if (missing_name != NULL) 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) if (ropt->triggerNames.head != NULL)
{ {
missing_name = simple_string_list_not_touched(&ropt->triggerNames); missing_name = simple_string_list_not_touched(&ropt->triggerNames);
if (missing_name != NULL) if (missing_name != NULL)
exit_horribly(modulename, "Trigger \"%s\" not found.\n", missing_name); exit_horribly(modulename, "trigger \"%s\" not found\n", missing_name);
} }
} }

8
src/bin/pg_dump/pg_dump.c
View File

@ -706,7 +706,7 @@ main(int argc, char **argv)
&schema_include_oids, &schema_include_oids,
strict_names); strict_names);
if (schema_include_oids.head == NULL) 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, expand_schema_name_patterns(fout, &schema_exclude_patterns,
&schema_exclude_oids, &schema_exclude_oids,
@ -720,7 +720,7 @@ main(int argc, char **argv)
&table_include_oids, &table_include_oids,
strict_names); strict_names);
if (table_include_oids.head == NULL) 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, expand_table_name_patterns(fout, &table_exclude_patterns,
&table_exclude_oids, &table_exclude_oids,
@ -1190,7 +1190,7 @@ expand_schema_name_patterns(Archive *fout,
res = ExecuteSqlQuery(fout, query->data, PGRES_TUPLES_OK); res = ExecuteSqlQuery(fout, query->data, PGRES_TUPLES_OK);
if (strict_names && PQntuples(res) == 0) 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++) for (i = 0; i < PQntuples(res); i++)
{ {
@ -12315,7 +12315,7 @@ dumpAccessMethod(Archive *fout, AccessMethodInfo *aminfo)
appendPQExpBuffer(q, "TYPE INDEX "); appendPQExpBuffer(q, "TYPE INDEX ");
break; break;
default: 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); aminfo->amtype, qamname);
pg_free(qamname); pg_free(qamname);
destroyPQExpBuffer(q); destroyPQExpBuffer(q);

2
src/bin/pg_dump/pg_dumpall.c
View File

@ -774,7 +774,7 @@ dumpRoles(PGconn *conn)
if (strncmp(rolename,"pg_",3) == 0) 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); progname, rolename);
continue; continue;
} }

2
src/bin/pg_dump/pg_restore.c
View File

@ -460,7 +460,7 @@ usage(const char *progname)
printf(_(" -P, --function=NAME(args) restore named function\n")); printf(_(" -P, --function=NAME(args) restore named function\n"));
printf(_(" -s, --schema-only restore only the schema, no data\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(_(" -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(_(" -T, --trigger=NAME restore named trigger\n"));
printf(_(" -x, --no-privileges skip restoration of access privileges (grant/revoke)\n")); printf(_(" -x, --no-privileges skip restoration of access privileges (grant/revoke)\n"));
printf(_(" -1, --single-transaction restore as a single transaction\n")); printf(_(" -1, --single-transaction restore as a single transaction\n"));