diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2003-09-25 06:58:07 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2003-09-25 06:58:07 +0000 |
| commit | feb4f44d296b88b7f0723f4a4f3945a371276e0b (patch) | |
| tree | 6acfa253cd3896fa96124fdcefdbc8e5cb5bb0da /src/backend/parser/parse_func.c | |
| parent | 42013caf648ad4bd64b130efda760cdb1620e953 (diff) | |
| download | postgresql-feb4f44d296b88b7f0723f4a4f3945a371276e0b.tar.gz postgresql-feb4f44d296b88b7f0723f4a4f3945a371276e0b.zip | |
Message editing: remove gratuitous variations in message wording, standardize
terms, add some clarifications, fix some untranslatable attempts at dynamic
message building.
Diffstat (limited to 'src/backend/parser/parse_func.c')
| -rw-r--r-- | src/backend/parser/parse_func.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c index f836f19fb59..e3691716f16 100644 --- a/src/backend/parser/parse_func.c +++ b/src/backend/parser/parse_func.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.159 2003/08/04 02:40:02 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.160 2003/09/25 06:58:01 petere Exp $ * *------------------------------------------------------------------------- */ @@ -221,7 +221,7 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs, else ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("cannot pass result of sub-select or join %s to a function", + errmsg("cannot pass result of subquery or join %s to a function", relname))); toid = InvalidOid; /* keep compiler quiet */ break; @@ -298,7 +298,7 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs, else ereport(ERROR, (errcode(ERRCODE_UNDEFINED_COLUMN), - errmsg("attribute \"%s\" not found in datatype %s", + errmsg("attribute \"%s\" not found in data type %s", colname, format_type_be(relTypeId)))); } @@ -312,7 +312,7 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs, func_signature_string(funcname, nargs, actual_arg_types)), errhint("Could not choose a best candidate function. " - "You may need to add explicit typecasts."))); + "You may need to add explicit type casts."))); else ereport(ERROR, (errcode(ERRCODE_UNDEFINED_FUNCTION), @@ -320,7 +320,7 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs, func_signature_string(funcname, nargs, actual_arg_types)), errhint("No function matches the given name and argument types. " - "You may need to add explicit typecasts."))); + "You may need to add explicit type casts."))); } /* @@ -1267,7 +1267,7 @@ setup_field_select(Node *input, char *attname, Oid relid) if (attno == InvalidAttrNumber) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_COLUMN), - errmsg("attribute \"%s\" of relation \"%s\" does not exist", + errmsg("column \"%s\" of relation \"%s\" does not exist", attname, get_rel_name(relid)))); fselect->arg = (Expr *) input; @@ -1341,7 +1341,7 @@ ParseComplexProjection(char *funcname, Node *first_arg) } /* - * Simple helper routine for delivering "no such attribute" error message + * Simple helper routine for delivering "column does not exist" error message */ static void unknown_attribute(const char *schemaname, const char *relname, @@ -1350,12 +1350,12 @@ unknown_attribute(const char *schemaname, const char *relname, if (schemaname) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_COLUMN), - errmsg("no such attribute %s.%s.%s", + errmsg("column %s.%s.%s does not exist", schemaname, relname, attname))); else ereport(ERROR, (errcode(ERRCODE_UNDEFINED_COLUMN), - errmsg("no such attribute %s.%s", + errmsg("column %s.%s does not exist", relname, attname))); } |