提交 44cb3ae7 编写于 作者: T Tom Lane

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

上级 c892643a
......@@ -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;
}
......
......@@ -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; }
;
/*****************************************************************************
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册