mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-02-11 19:20:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tom Lane 2006-06-16 23:50:48 +00:00
parent c892643a3c
commit 44cb3ae7ef
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/backend/commands/aggregatecmds.c
View File

@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * 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 * DESCRIPTION
* The "DefineFoo" routines take the parse tree and pick out the * The "DefineFoo" routines take the parse tree and pick out the
@ -216,14 +216,9 @@ RemoveAggregate(RemoveFuncStmt *stmt)
if (!OidIsValid(procOid)) if (!OidIsValid(procOid))
{ {
/* we only get here if stmt->missing_ok is true */ /* we only get here if stmt->missing_ok is true */
/* XXX might need better message here */
ereport(NOTICE, ereport(NOTICE,
(errmsg("aggregate %s does not exist ... skipping", (errmsg("aggregate %s does not exist ... skipping",
stmt->name))); NameListToString(stmt->name))));
return; return;
} }

7
src/backend/parser/gram.y
View File

@ -11,7 +11,7 @@
* *
* *
* IDENTIFICATION * 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 * HISTORY
* AUTHOR DATE MAJOR EVENT * AUTHOR DATE MAJOR EVENT
@ -4075,17 +4075,16 @@ DropCastStmt: DROP CAST opt_if_exists '(' Typename AS Typename ')' opt_drop_beha
n->sourcetype = $5; n->sourcetype = $5;
n->targettype = $7; n->targettype = $7;
n->behavior = $9; n->behavior = $9;
n->missing_ok = n->missing_ok = $3;
$$ = (Node *)n; $$ = (Node *)n;
} }
; ;
opt_if_exists: IF_P EXISTS { $$ = true; } opt_if_exists: IF_P EXISTS { $$ = true; }
| /* empty */ { $$ = false; } | /*EMPTY*/ { $$ = false; }
; ;
/***************************************************************************** /*****************************************************************************
* *
* QUERY: * QUERY: