aboutsummaryrefslogtreecommitdiff
path: root/src/backend/parser/parse_func.c
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2003-07-20 21:56:35 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2003-07-20 21:56:35 +0000
commitda4ed8bfdd79759f5a1fccc4bb0940929bdc4ff2 (patch)
treeed72b114797c44d92818e166fefeedb779f9f5f8 /src/backend/parser/parse_func.c
parent46bc5870079e829db82d352d05444c95ce62050a (diff)
downloadpostgresql-da4ed8bfdd79759f5a1fccc4bb0940929bdc4ff2.tar.gz
postgresql-da4ed8bfdd79759f5a1fccc4bb0940929bdc4ff2.zip
Another round of error message editing, covering backend/commands/.
Diffstat (limited to 'src/backend/parser/parse_func.c')
-rw-r--r--src/backend/parser/parse_func.c24
1 files changed, 18 insertions, 6 deletions
diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c
index 4f90cecf2c6..b2ae0cc9271 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.155 2003/07/19 20:20:52 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.156 2003/07/20 21:56:34 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1263,8 +1263,8 @@ setup_field_select(Node *input, char *attname, Oid relid)
if (attno == InvalidAttrNumber)
ereport(ERROR,
(errcode(ERRCODE_UNDEFINED_COLUMN),
- errmsg("relation \"%s\" has no column \"%s\"",
- get_rel_name(relid), attname)));
+ errmsg("attribute \"%s\" of relation \"%s\" does not exist",
+ attname, get_rel_name(relid))));
fselect->arg = (Expr *) input;
fselect->fieldnum = attno;
@@ -1356,7 +1356,7 @@ unknown_attribute(const char *schemaname, const char *relname,
}
/*
- * func_signature_string
+ * funcname_signature_string
* Build a string representing a function name, including arg types.
* The result is something like "foo(integer)".
*
@@ -1364,14 +1364,15 @@ unknown_attribute(const char *schemaname, const char *relname,
* messages.
*/
const char *
-func_signature_string(List *funcname, int nargs, const Oid *argtypes)
+funcname_signature_string(const char *funcname,
+ int nargs, const Oid *argtypes)
{
StringInfoData argbuf;
int i;
initStringInfo(&argbuf);
- appendStringInfo(&argbuf, "%s(", NameListToString(funcname));
+ appendStringInfo(&argbuf, "%s(", funcname);
for (i = 0; i < nargs; i++)
{
@@ -1386,6 +1387,17 @@ func_signature_string(List *funcname, int nargs, const Oid *argtypes)
}
/*
+ * func_signature_string
+ * As above, but function name is passed as a qualified name list.
+ */
+const char *
+func_signature_string(List *funcname, int nargs, const Oid *argtypes)
+{
+ return funcname_signature_string(NameListToString(funcname),
+ nargs, argtypes);
+}
+
+/*
* find_aggregate_func
* Convenience routine to check that a function exists and is an
* aggregate.