Fix notice message from DROP FUNCTION IF EXISTS, and improve message

for DROP AGGREGATE IF EXISTS.  Per report from Teodor.

1 files changed, 49 insertions, 14 deletions

diff --git a/src/backend/parser/parse_type.c b/src/backend/parser/parse_type.c
index a12aea6c38a..45666d88809 100644
--- a/src/backend/parser/parse_type.c
+++ b/src/backend/parser/parse_type.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/parser/parse_type.c,v 1.83 2006/08/02 01:59:47 joe Exp $
+ *	  $PostgreSQL: pgsql/src/backend/parser/parse_type.c,v 1.84 2006/09/25 15:17:34 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -141,19 +141,16 @@ LookupTypeName(ParseState *pstate, const TypeName *typename)
 }
 
 /*
- * TypeNameToString
- *		Produce a string representing the name of a TypeName.
+ * appendTypeNameToBuffer
+ *		Append a string representing the name of a TypeName to a StringInfo.
+ *		This is the shared guts of TypeNameToString and TypeNameListToString.
  *
  * NB: this must work on TypeNames that do not describe any actual type;
  * it is mostly used for reporting lookup errors.
  */
-char *
-TypeNameToString(const TypeName *typename)
+static void
+appendTypeNameToBuffer(const TypeName *typename, StringInfo string)
 {
-	StringInfoData string;
-
-	initStringInfo(&string);
-
 	if (typename->names != NIL)
 	{
 		/* Emit possibly-qualified name as-is */
@@ -162,14 +159,14 @@ TypeNameToString(const TypeName *typename)
 		foreach(l, typename->names)
 		{
 			if (l != list_head(typename->names))
-				appendStringInfoChar(&string, '.');
-			appendStringInfoString(&string, strVal(lfirst(l)));
+				appendStringInfoChar(string, '.');
+			appendStringInfoString(string, strVal(lfirst(l)));
 		}
 	}
 	else
 	{
 		/* Look up internally-specified type */
-		appendStringInfoString(&string, format_type_be(typename->typeid));
+		appendStringInfoString(string, format_type_be(typename->typeid));
 	}
 
 	/*
@@ -177,11 +174,49 @@ TypeNameToString(const TypeName *typename)
 	 * LookupTypeName
 	 */
 	if (typename->pct_type)
-		appendStringInfoString(&string, "%TYPE");
+		appendStringInfoString(string, "%TYPE");
 
 	if (typename->arrayBounds != NIL)
-		appendStringInfoString(&string, "[]");
+		appendStringInfoString(string, "[]");
+}
+
+/*
+ * TypeNameToString
+ *		Produce a string representing the name of a TypeName.
+ *
+ * NB: this must work on TypeNames that do not describe any actual type;
+ * it is mostly used for reporting lookup errors.
+ */
+char *
+TypeNameToString(const TypeName *typename)
+{
+	StringInfoData string;
+
+	initStringInfo(&string);
+	appendTypeNameToBuffer(typename, &string);
+	return string.data;
+}
+
+/*
+ * TypeNameListToString
+ *		Produce a string representing the name(s) of a List of TypeNames
+ */
+char *
+TypeNameListToString(List *typenames)
+{
+	StringInfoData string;
+	ListCell   *l;
 
+	initStringInfo(&string);
+	foreach(l, typenames)
+	{
+		TypeName *typename = (TypeName *) lfirst(l);
+
+		Assert(IsA(typename, TypeName));
+		if (l != list_head(typenames))
+			appendStringInfoChar(&string, ',');
+		appendTypeNameToBuffer(typename, &string);
+	}
 	return string.data;
 }