diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2005-11-19 17:39:45 +0000 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2005-11-19 17:39:45 +0000 |
| commit | daea4d8eaee010f41e46bb98cd1b2da2f9fb75d9 (patch) | |
| tree | a7232bf09a071a87a955337395b9cefd4a62a8e8 /src/backend/commands/conversioncmds.c | |
| parent | 8ef289dba12f16f3692c235863a887672499a5d9 (diff) | |
| download | postgresql-daea4d8eaee010f41e46bb98cd1b2da2f9fb75d9.tar.gz postgresql-daea4d8eaee010f41e46bb98cd1b2da2f9fb75d9.zip | |
DROP objecttype IF EXISTS for the following objects:
table view index sequence schema type domain conversion
Diffstat (limited to 'src/backend/commands/conversioncmds.c')
| -rw-r--r-- | src/backend/commands/conversioncmds.c | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/src/backend/commands/conversioncmds.c b/src/backend/commands/conversioncmds.c index 53b3f854ce6..97abc9fc774 100644 --- a/src/backend/commands/conversioncmds.c +++ b/src/backend/commands/conversioncmds.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/conversioncmds.c,v 1.23 2005/10/15 02:49:15 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/conversioncmds.c,v 1.24 2005/11/19 17:39:44 adunstan Exp $ * *------------------------------------------------------------------------- */ @@ -98,16 +98,29 @@ CreateConversionCommand(CreateConversionStmt *stmt) * DROP CONVERSION */ void -DropConversionCommand(List *name, DropBehavior behavior) +DropConversionCommand(List *name, DropBehavior behavior, bool missing_ok) { Oid conversionOid; conversionOid = FindConversionByName(name); if (!OidIsValid(conversionOid)) - ereport(ERROR, - (errcode(ERRCODE_UNDEFINED_OBJECT), - errmsg("conversion \"%s\" does not exist", - NameListToString(name)))); + { + if (! missing_ok) + { + ereport(ERROR, + (errcode(ERRCODE_UNDEFINED_OBJECT), + errmsg("conversion \"%s\" does not exist", + NameListToString(name)))); + } + else + { + ereport(NOTICE, + (errmsg("conversion \"%s\" does not exist, skipping", + NameListToString(name)))); + } + + return; + } ConversionDrop(conversionOid, behavior); } |