Commit44cb3ae

committed

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

1 parentc892643 commit44cb3aeCopy full SHA for 44cb3ae

File tree

-13

lines changed

-13

lines changed

Lines changed: 2 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`*`
`11`	`11`	`* IDENTIFICATION`
`12`		`- * $PostgreSQL: pgsql/src/backend/commands/aggregatecmds.c,v 1.35 2006/06/1620:23:44 adunstan Exp $`
	`12`	`+ * $PostgreSQL: pgsql/src/backend/commands/aggregatecmds.c,v 1.36 2006/06/16 23:50:48 tgl Exp $`
`13`	`13`	`*`
`14`	`14`	`* DESCRIPTION`
`15`	`15`	`* The "DefineFoo" routines take the parse tree and pick out the`
`@@ -216,14 +216,9 @@ RemoveAggregate(RemoveFuncStmt *stmt)`
`216`	`216`	`if (!OidIsValid(procOid))`
`217`	`217`	`{`
`218`	`218`	`/* we only get here if stmt->missing_ok is true */`
`219`		`-`
`220`		`-/* XXX might need better message here */`
`221`		`-`
`222`	`219`	`ereport(NOTICE,`
`223`	`220`	`(errmsg("aggregate %s does not exist ... skipping",`
`224`		`-stmt->name)));`
`225`		`-`
`226`		`-`
	`221`	`+NameListToString(stmt->name))));`
`227`	`222`	`return;`
`228`	`223`	`}`
`229`	`224`

Lines changed: 5 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.546 2006/06/1620:23:44 adunstan Exp $`
	`14`	`+ * $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.547 2006/06/16 23:50:48 tgl Exp $`
`15`	`15`	`*`
`16`	`16`	`* HISTORY`
`17`	`17`	`* AUTHORDATEMAJOR EVENT`
`@@ -4075,15 +4075,14 @@ DropCastStmt: DROP CAST opt_if_exists '(' Typename AS Typename ')' opt_drop_beha`
`4075`	`4075`	`n->sourcetype =$5;`
`4076`	`4076`	`n->targettype =$7;`
`4077`	`4077`	`n->behavior =$9;`
`4078`		`-n->missing_ok =`
	`4078`	`+n->missing_ok =$3;`
`4079`	`4079`	`$$ = (Node *)n;`
`4080`	`4080`	`}`
`4081`	`4081`	`;`
`4082`	`4082`
`4083`		`-opt_if_exists: IF_P EXISTS {$$ =true; }`
`4084`		`- \|/* empty*/ {$$ =false; }`
`4085`		`- ;`
`4086`		`-`
	`4083`	`+opt_if_exists: IF_P EXISTS{$$ =true; }`
	`4084`	`+\|/EMPTY/{$$ =false; }`
	`4085`	`+;`
`4087`	`4086`
`4088`	`4087`
`4089`	`4088`	`/*****************************************************************************`

Comments

(0)