From c232c8afa8dc398ee8ca3729630aba97c5622065 Mon Sep 17 00:00:00 2001
From: Tom Lane
Date: Mon, 25 Sep 2006 15:17:34 +0000
Subject: Fix notice message from DROP FUNCTION IF EXISTS, and improve message
 for DROP AGGREGATE IF EXISTS.  Per report from Teodor.

---
 src/backend/commands/aggregatecmds.c |  7 ++++---
 src/backend/commands/functioncmds.c  | 10 ++++------
 2 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'src/backend/commands')

diff --git a/src/backend/commands/aggregatecmds.c b/src/backend/commands/aggregatecmds.c
index cb4dfee77e2..79a021cabc9 100644
--- a/src/backend/commands/aggregatecmds.c
+++ b/src/backend/commands/aggregatecmds.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/aggregatecmds.c,v 1.38 2006/07/27 19:52:04 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/aggregatecmds.c,v 1.39 2006/09/25 15:17:34 tgl Exp $
  *
  * DESCRIPTION
  *	  The "DefineFoo" routines take the parse tree and pick out the
@@ -219,8 +219,9 @@ RemoveAggregate(RemoveFuncStmt *stmt)
 	{
 		/* we only get here if stmt->missing_ok is true */
 		ereport(NOTICE,
-				(errmsg("aggregate %s does not exist ... skipping",
-						NameListToString(stmt->name))));
+				(errmsg("aggregate %s(%s) does not exist ... skipping",
+						NameListToString(aggName),
+						TypeNameListToString(aggArgs))));
 		return;
 	}
 
diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c
index 7dd46dcff5c..fd081d5b1ad 100644
--- a/src/backend/commands/functioncmds.c
+++ b/src/backend/commands/functioncmds.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/functioncmds.c,v 1.76 2006/07/14 14:52:18 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/functioncmds.c,v 1.77 2006/09/25 15:17:34 tgl Exp $
  *
  * DESCRIPTION
  *	  These routines take the parse tree and pick out the
@@ -686,16 +686,16 @@ RemoveFunction(RemoveFuncStmt *stmt)
 	 * Find the function, do permissions and validity checks
 	 */
 	funcOid = LookupFuncNameTypeNames(functionName, argTypes, stmt->missing_ok);
-	if (stmt->missing_ok &&!OidIsValid(funcOid)) 
+	if (!OidIsValid(funcOid)) 
 	{
+		/* can only get here if stmt->missing_ok */
 		ereport(NOTICE,
 				(errmsg("function %s(%s) does not exist ... skipping",
 						NameListToString(functionName),
-						NameListToString(argTypes))));
+						TypeNameListToString(argTypes))));
 		return;
 	}
 
-
 	tup = SearchSysCache(PROCOID,
 						 ObjectIdGetDatum(funcOid),
 						 0, 0, 0);
@@ -1409,8 +1409,6 @@ DropCast(DropCastStmt *stmt)
 		return;
 	}
 
-			
-
 	/* Permission check */
 	if (!pg_type_ownercheck(sourcetypeid, GetUserId())
 		&& !pg_type_ownercheck(targettypeid, GetUserId()))
-- 
cgit v1.2.3