From a50b605aa4487cbf677625a7a1bb5f2b05058d91 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Sat, 21 May 2016 22:17:00 -0400 Subject: [PATCH] psql: Message style improvements --- src/bin/psql/command.c | 6 +++--- src/bin/psql/common.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c index 87adfce9c1..693b5312af 100644 --- 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 index 2c0d781302..b8bdcc751a 100644 --- 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; }