diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2006-06-16 20:23:45 +0000 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2006-06-16 20:23:45 +0000 |
| commit | bbcd01692bff099117f5afb0fe2d1ad182621766 (patch) | |
| tree | 07aebd51aac35be3e0e4471cbff7595a35350d67 /src/backend/commands/trigger.c | |
| parent | e79cc2db00501fb29e3e0225182147192e830fa1 (diff) | |
| download | postgresql-bbcd01692bff099117f5afb0fe2d1ad182621766.tar.gz postgresql-bbcd01692bff099117f5afb0fe2d1ad182621766.zip | |
DROP ... IF EXISTS for the following cases:
language, tablespace, trigger, rule, opclass, function, aggregate. operator, and cast.
Diffstat (limited to 'src/backend/commands/trigger.c')
| -rw-r--r-- | src/backend/commands/trigger.c | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c index 04cd75e99fb..2de74568277 100644 --- a/src/backend/commands/trigger.c +++ b/src/backend/commands/trigger.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.202 2006/05/30 14:01:57 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.203 2006/06/16 20:23:44 adunstan Exp $ * *------------------------------------------------------------------------- */ @@ -452,7 +452,8 @@ CreateTrigger(CreateTrigStmt *stmt, bool forConstraint) * DropTrigger - drop an individual trigger by name */ void -DropTrigger(Oid relid, const char *trigname, DropBehavior behavior) +DropTrigger(Oid relid, const char *trigname, DropBehavior behavior, + bool missing_ok) { Relation tgrel; ScanKeyData skey[2]; @@ -481,10 +482,21 @@ DropTrigger(Oid relid, const char *trigname, DropBehavior behavior) tup = systable_getnext(tgscan); if (!HeapTupleIsValid(tup)) - ereport(ERROR, - (errcode(ERRCODE_UNDEFINED_OBJECT), - errmsg("trigger \"%s\" for table \"%s\" does not exist", - trigname, get_rel_name(relid)))); + { + if (! missing_ok) + ereport(ERROR, + (errcode(ERRCODE_UNDEFINED_OBJECT), + errmsg("trigger \"%s\" for table \"%s\" does not exist", + trigname, get_rel_name(relid)))); + else + ereport(NOTICE, + (errmsg("trigger \"%s\" for table \"%s\" does not exist ...skipping", + trigname, get_rel_name(relid)))); + /* cleanup */ + systable_endscan(tgscan); + heap_close(tgrel, AccessShareLock); + return; + } if (!pg_class_ownercheck(relid, GetUserId())) aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS, |