Fix a couple of obvious problems in DROP IF EXISTS patch.

diff --git a/src/backend/commands/aggregatecmds.c b/src/backend/commands/aggregatecmds.c
index 7fb323a8b87d832b8ffbb0830afa3724a177c0a4..6b384471727b4de1a692ec1baefbd0282cf1b066 100644 (file)
--- 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.35 2006/06/16 20:23:44 adunstan Exp $
+ *       $PostgreSQL: pgsql/src/backend/commands/aggregatecmds.c,v 1.36 2006/06/16 23:50:48 tgl Exp $
  *
  * DESCRIPTION
  *       The "DefineFoo" routines take the parse tree and pick out the
@@ -216,14 +216,9 @@ RemoveAggregate(RemoveFuncStmt *stmt)
        if (!OidIsValid(procOid))
        {
                /* we only get here if stmt->missing_ok is true */
-
-               /* XXX might need better message here */
-
                ereport(NOTICE,
                                (errmsg("aggregate %s does not exist ... skipping",
-                                          stmt->name)));
-               
-
+                                               NameListToString(stmt->name))));
                return;
        }
 

diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index f95a6b74cdf5d09f36b9bda4988cbd90eb9b9b39..14f8b4334814a79be9835a02ebec8b3305e89808 100644 (file)
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.546 2006/06/16 20:23:44 adunstan Exp $
+ *       $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.547 2006/06/16 23:50:48 tgl Exp $
  *
  * HISTORY
  *       AUTHOR                        DATE                    MAJOR EVENT
@@ -4075,15 +4075,14 @@ DropCastStmt: DROP CAST opt_if_exists '(' Typename AS Typename ')' opt_drop_beha
                                        n->sourcetype = $5;
                                        n->targettype = $7;
                                        n->behavior = $9;
-                                       n->missing_ok =
+                                       n->missing_ok = $3;
                                        $$ = (Node *)n;
                                }
                ;
 
-opt_if_exists: IF_P EXISTS { $$ = true; }
-               | /* empty */ { $$ = false; }
-        ;
-
+opt_if_exists: IF_P EXISTS                                             { $$ = true; }
+               | /*EMPTY*/                                                             { $$ = false; }
+               ;
 
 
 /*****************************************************************************