psql: Message style improvements

petere · petere · commit a50b605aa448 · 2016-05-21T22:17:00.000-04:00
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
@@ -854,7 +854,7 @@ exec_command(const char *cmd,
 				puts(_("out of memory"));
 		}
 		else
-			puts(_("There was no previous error."));
+			puts(_("There is no previous error."));
 	}
 
 	/* \f -- change field separator */
@@ -3363,7 +3363,7 @@ get_create_object_cmd(EditableObjectType obj_type, Oid oid,
 							appendPQExpBufferStr(buf, "CREATE OR REPLACE VIEW ");
 							break;
 						default:
-							psql_error("%s.%s is not a view\n",
+							psql_error("\"%s.%s\" is not a view\n",
 									   nspname, relname);
 							result = false;
 							break;
@@ -3379,7 +3379,7 @@ get_create_object_cmd(EditableObjectType obj_type, Oid oid,
 												   pset.encoding,
 												   standard_strings()))
 						{
-							psql_error("Could not parse reloptions array\n");
+							psql_error("could not parse reloptions array\n");
 							result = false;
 						}
 						appendPQExpBufferStr(buf, ")");
diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
@@ -134,7 +134,7 @@ psql_get_variable(const char *varname, bool escape, bool as_ident)
 
 		if (!pset.db)
 		{
-			psql_error("can't escape without active connection\n");
+			psql_error("cannot escape without active connection\n");
 			return NULL;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -854,7 +854,7 @@ exec_command(const char *cmd,`
`854`	`854`	`puts(_("out of memory"));`
`855`	`855`	`}`
`856`	`856`	`else`
`857`		`- puts(_("There was no previous error."));`
	`857`	`+ puts(_("There is no previous error."));`
`858`	`858`	`}`
`859`	`859`
`860`	`860`	`/* \f -- change field separator */`
`@@ -3363,7 +3363,7 @@ get_create_object_cmd(EditableObjectType obj_type, Oid oid,`
`3363`	`3363`	`appendPQExpBufferStr(buf, "CREATE OR REPLACE VIEW ");`
`3364`	`3364`	`break;`
`3365`	`3365`	`default:`
`3366`		`- psql_error("%s.%s is not a view\n",`
	`3366`	`+ psql_error("\"%s.%s\" is not a view\n",`
`3367`	`3367`	`nspname, relname);`
`3368`	`3368`	`result = false;`
`3369`	`3369`	`break;`
`@@ -3379,7 +3379,7 @@ get_create_object_cmd(EditableObjectType obj_type, Oid oid,`
`3379`	`3379`	`pset.encoding,`
`3380`	`3380`	`standard_strings()))`
`3381`	`3381`	`{`
`3382`		`- psql_error("Could not parse reloptions array\n");`
	`3382`	`+ psql_error("could not parse reloptions array\n");`
`3383`	`3383`	`result = false;`
`3384`	`3384`	`}`
`3385`	`3385`	`appendPQExpBufferStr(buf, ")");`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ psql_get_variable(const char *varname, bool escape, bool as_ident)`
`134`	`134`
`135`	`135`	`if (!pset.db)`
`136`	`136`	`{`
`137`		`- psql_error("can't escape without active connection\n");`
	`137`	`+ psql_error("cannot escape without active connection\n");`
`138`	`138`	`return NULL;`
`139`	`139`	`}`
`140`	`140`