diff options
author | Tom Lane <tgl@sss.pgh.pa.us> | 2006-09-25 15:17:34 +0000 |
---|---|---|
committer | Tom Lane <tgl@sss.pgh.pa.us> | 2006-09-25 15:17:34 +0000 |
commit | c232c8afa8dc398ee8ca3729630aba97c5622065 (patch) | |
tree | ce40acee452340166e7cc8959d60642d5c6f70b6 /src/backend/commands/functioncmds.c | |
parent | 0c858bd69ea574f4a6eb08276533130f00fc8aaa (diff) | |
download | postgresql-c232c8afa8dc398ee8ca3729630aba97c5622065.tar.gz postgresql-c232c8afa8dc398ee8ca3729630aba97c5622065.zip |
Fix notice message from DROP FUNCTION IF EXISTS, and improve message
for DROP AGGREGATE IF EXISTS. Per report from Teodor.
Diffstat (limited to 'src/backend/commands/functioncmds.c')
-rw-r--r-- | src/backend/commands/functioncmds.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c index 7dd46dcff5c..fd081d5b1ad 100644 --- a/src/backend/commands/functioncmds.c +++ b/src/backend/commands/functioncmds.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/functioncmds.c,v 1.76 2006/07/14 14:52:18 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/functioncmds.c,v 1.77 2006/09/25 15:17:34 tgl Exp $ * * DESCRIPTION * These routines take the parse tree and pick out the @@ -686,16 +686,16 @@ RemoveFunction(RemoveFuncStmt *stmt) * Find the function, do permissions and validity checks */ funcOid = LookupFuncNameTypeNames(functionName, argTypes, stmt->missing_ok); - if (stmt->missing_ok &&!OidIsValid(funcOid)) + if (!OidIsValid(funcOid)) { + /* can only get here if stmt->missing_ok */ ereport(NOTICE, (errmsg("function %s(%s) does not exist ... skipping", NameListToString(functionName), - NameListToString(argTypes)))); + TypeNameListToString(argTypes)))); return; } - tup = SearchSysCache(PROCOID, ObjectIdGetDatum(funcOid), 0, 0, 0); @@ -1409,8 +1409,6 @@ DropCast(DropCastStmt *stmt) return; } - - /* Permission check */ if (!pg_type_ownercheck(sourcetypeid, GetUserId()) && !pg_type_ownercheck(targettypeid, GetUserId())) |