diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2006-06-16 23:50:48 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2006-06-16 23:50:48 +0000 |
| commit | 44cb3ae7efb9a2fe197a2a0287e919343f31f6d5 (patch) | |
| tree | 026df64a59fc1eb8bee92cb47904bf06be51a6ea /src/backend | |
| parent | c892643a3c4645450e3f84d2e2266a4e46340d28 (diff) | |
| download | postgresql-44cb3ae7efb9a2fe197a2a0287e919343f31f6d5.tar.gz | |
Fix a couple of obvious problems in DROP IF EXISTS patch.
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/commands/aggregatecmds.c | 9 | ||||
| -rw-r--r-- | src/backend/parser/gram.y | 11 |
2 files changed, 7 insertions, 13 deletions
diff --git a/src/backend/commands/aggregatecmds.c b/src/backend/commands/aggregatecmds.c index 7fb323a8b8..6b38447172 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.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 f95a6b74cd..14f8b43348 100644 --- 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; } + ; /***************************************************************************** |