diff options
Diffstat (limited to 'src/backend/commands/conversioncmds.c')
| -rw-r--r-- | src/backend/commands/conversioncmds.c | 34 |
1 files changed, 7 insertions, 27 deletions
diff --git a/src/backend/commands/conversioncmds.c b/src/backend/commands/conversioncmds.c index 2e5a7dfe9ec..8673302584d 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.41 2010/02/14 18:42:14 rhaas Exp $ + * $PostgreSQL: pgsql/src/backend/commands/conversioncmds.c,v 1.42 2010/08/05 15:25:35 rhaas Exp $ * *------------------------------------------------------------------------- */ @@ -142,23 +142,13 @@ DropConversionsCommand(DropStmt *drop) Form_pg_conversion con; ObjectAddress object; - conversionOid = FindConversionByName(name); + conversionOid = get_conversion_oid(name, drop->missing_ok); if (!OidIsValid(conversionOid)) { - if (!drop->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)))); - } + ereport(NOTICE, + (errmsg("conversion \"%s\" does not exist, skipping", + NameListToString(name)))); continue; } @@ -202,12 +192,7 @@ RenameConversion(List *name, const char *newname) rel = heap_open(ConversionRelationId, RowExclusiveLock); - conversionOid = FindConversionByName(name); - if (!OidIsValid(conversionOid)) - ereport(ERROR, - (errcode(ERRCODE_UNDEFINED_OBJECT), - errmsg("conversion \"%s\" does not exist", - NameListToString(name)))); + conversionOid = get_conversion_oid(name, false); tup = SearchSysCacheCopy1(CONVOID, ObjectIdGetDatum(conversionOid)); if (!HeapTupleIsValid(tup)) /* should not happen */ @@ -255,12 +240,7 @@ AlterConversionOwner(List *name, Oid newOwnerId) rel = heap_open(ConversionRelationId, RowExclusiveLock); - conversionOid = FindConversionByName(name); - if (!OidIsValid(conversionOid)) - ereport(ERROR, - (errcode(ERRCODE_UNDEFINED_OBJECT), - errmsg("conversion \"%s\" does not exist", - NameListToString(name)))); + conversionOid = get_conversion_oid(name, false); AlterConversionOwner_internal(rel, conversionOid, newOwnerId); |