Another round of error message editing, covering backend/commands/.

3 files changed, 30 insertions, 18 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.
diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c
index 85f813f10a1..732699e3ad7 100644
--- a/src/backend/parser/parse_relation.c
+++ b/src/backend/parser/parse_relation.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.84 2003/07/19 20:20:52 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.85 2003/07/20 21:56:35 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1587,9 +1587,9 @@ get_rte_attribute_type(RangeTblEntry *rte, AttrNumber attnum,
 				if (att_tup->attisdropped)
 					ereport(ERROR,
 							(errcode(ERRCODE_UNDEFINED_COLUMN),
-							 errmsg("relation \"%s\" has no column \"%s\"",
-									get_rel_name(rte->relid),
-									NameStr(att_tup->attname))));
+							 errmsg("attribute \"%s\" of relation \"%s\" does not exist",
+									NameStr(att_tup->attname),
+									get_rel_name(rte->relid))));
 				*vartype = att_tup->atttypid;
 				*vartypmod = att_tup->atttypmod;
 				ReleaseSysCache(tp);
@@ -1652,9 +1652,9 @@ get_rte_attribute_type(RangeTblEntry *rte, AttrNumber attnum,
 					if (att_tup->attisdropped)
 						ereport(ERROR,
 								(errcode(ERRCODE_UNDEFINED_COLUMN),
-								 errmsg("relation \"%s\" has no column \"%s\"",
-										get_rel_name(funcrelid),
-										NameStr(att_tup->attname))));
+								 errmsg("attribute \"%s\" of relation \"%s\" does not exist",
+										NameStr(att_tup->attname),
+										get_rel_name(funcrelid))));
 					*vartype = att_tup->atttypid;
 					*vartypmod = att_tup->atttypmod;
 					ReleaseSysCache(tp);
@@ -1808,8 +1808,8 @@ attnameAttNum(Relation rd, const char *attname, bool sysColOK)
 	/* on failure */
 	ereport(ERROR,
 			(errcode(ERRCODE_UNDEFINED_COLUMN),
-			 errmsg("relation \"%s\" has no column \"%s\"",
-					RelationGetRelationName(rd), attname)));
+			 errmsg("attribute \"%s\" of relation \"%s\" does not exist",
+					attname, RelationGetRelationName(rd))));
 	return InvalidAttrNumber;	/* keep compiler quiet */
 }
 
diff --git a/src/backend/parser/parse_type.c b/src/backend/parser/parse_type.c
index 78fe52d00b1..5d68ef14a5b 100644
--- a/src/backend/parser/parse_type.c
+++ b/src/backend/parser/parse_type.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.58 2003/07/19 20:20:52 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.59 2003/07/20 21:56:35 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -91,8 +91,8 @@ LookupTypeName(const TypeName *typename)
 		if (attnum == InvalidAttrNumber)
 			ereport(ERROR,
 					(errcode(ERRCODE_UNDEFINED_COLUMN),
-					 errmsg("relation \"%s\" has no column \"%s\"",
-							rel->relname, field)));
+					 errmsg("attribute \"%s\" of relation \"%s\" does not exist",
+							field, rel->relname)));
 		restype = get_atttype(relid, attnum);
 
 		/* this construct should never have an array indicator */