pg_dump: Message style improvements

petere · petere · commit b6dacc173b68 · 2016-04-25T17:16:59.000-04:00
diff --git 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
@@ -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
@@ -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
@@ -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"));

Original file line number	Diff line number	Diff line change
`@@ -2658,35 +2658,35 @@ StrictNamesCheck(RestoreOptions *ropt)`
`2658`	`2658`	`{`
`2659`	`2659`	`missing_name = simple_string_list_not_touched(&ropt->schemaNames);`
`2660`	`2660`	`if (missing_name != NULL)`
`2661`		`- exit_horribly(modulename, "Schema \"%s\" not found.\n", missing_name);`
	`2661`	`+ exit_horribly(modulename, "schema \"%s\" not found\n", missing_name);`
`2662`	`2662`	`}`
`2663`	`2663`
`2664`	`2664`	`if (ropt->tableNames.head != NULL)`
`2665`	`2665`	`{`
`2666`	`2666`	`missing_name = simple_string_list_not_touched(&ropt->tableNames);`
`2667`	`2667`	`if (missing_name != NULL)`
`2668`		`- exit_horribly(modulename, "Table \"%s\" not found.\n", missing_name);`
	`2668`	`+ exit_horribly(modulename, "table \"%s\" not found\n", missing_name);`
`2669`	`2669`	`}`
`2670`	`2670`
`2671`	`2671`	`if (ropt->indexNames.head != NULL)`
`2672`	`2672`	`{`
`2673`	`2673`	`missing_name = simple_string_list_not_touched(&ropt->indexNames);`
`2674`	`2674`	`if (missing_name != NULL)`
`2675`		`- exit_horribly(modulename, "Index \"%s\" not found.\n", missing_name);`
	`2675`	`+ exit_horribly(modulename, "index \"%s\" not found\n", missing_name);`
`2676`	`2676`	`}`
`2677`	`2677`
`2678`	`2678`	`if (ropt->functionNames.head != NULL)`
`2679`	`2679`	`{`
`2680`	`2680`	`missing_name = simple_string_list_not_touched(&ropt->functionNames);`
`2681`	`2681`	`if (missing_name != NULL)`
`2682`		`- exit_horribly(modulename, "Function \"%s\" not found.\n", missing_name);`
	`2682`	`+ exit_horribly(modulename, "function \"%s\" not found\n", missing_name);`
`2683`	`2683`	`}`
`2684`	`2684`
`2685`	`2685`	`if (ropt->triggerNames.head != NULL)`
`2686`	`2686`	`{`
`2687`	`2687`	`missing_name = simple_string_list_not_touched(&ropt->triggerNames);`
`2688`	`2688`	`if (missing_name != NULL)`
`2689`		`- exit_horribly(modulename, "Trigger \"%s\" not found.\n", missing_name);`
	`2689`	`+ exit_horribly(modulename, "trigger \"%s\" not found\n", missing_name);`
`2690`	`2690`	`}`
`2691`	`2691`	`}`
`2692`	`2692`
Original file line number	Diff line number	Diff line change
`@@ -774,7 +774,7 @@ dumpRoles(PGconn *conn)`
`774`	`774`
`775`	`775`	`if (strncmp(rolename,"pg_",3) == 0)`
`776`	`776`	`{`
`777`		`- fprintf(stderr, _("%s: role name starting with 'pg_' skipped (%s)\n"),`
	`777`	`+ fprintf(stderr, _("%s: role name starting with \"pg_\" skipped (%s)\n"),`
`778`	`778`	`progname, rolename);`
`779`	`779`	`continue;`
`780`	`780`	`}`