Consolidate DROP handling for some object types.

[postgresql] / src / backend / commands / conversioncmds.c

diff --git a/src/backend/commands/conversioncmds.c b/src/backend/commands/conversioncmds.c
index cd7ae600ff69bcccb82651e0cf43b8915066f545..7d6063de1a764ba4a82aeb1c0c2ba14b99742f85 100644 (file)
--- a/src/backend/commands/conversioncmds.c
+++ b/src/backend/commands/conversioncmds.c
@@ -117,67 +117,6 @@ CreateConversionCommand(CreateConversionStmt *stmt)
                                         from_encoding, to_encoding, funcoid, stmt->def);
 }
 
-/*
- * DROP CONVERSION
- */
-void
-DropConversionsCommand(DropStmt *drop)
-{
-       ObjectAddresses *objects;
-       ListCell   *cell;
-
-       /*
-        * First we identify all the conversions, then we delete them in a single
-        * performMultipleDeletions() call.  This is to avoid unwanted DROP
-        * RESTRICT errors if one of the conversions depends on another. (Not that
-        * that is very likely, but we may as well do this consistently.)
-        */
-       objects = new_object_addresses();
-
-       foreach(cell, drop->objects)
-       {
-               List       *name = (List *) lfirst(cell);
-               Oid                     conversionOid;
-               HeapTuple       tuple;
-               Form_pg_conversion con;
-               ObjectAddress object;
-
-               conversionOid = get_conversion_oid(name, drop->missing_ok);
-
-               if (!OidIsValid(conversionOid))
-               {
-                       ereport(NOTICE,
-                                       (errmsg("conversion \"%s\" does not exist, skipping",
-                                                       NameListToString(name))));
-                       continue;
-               }
-
-               tuple = SearchSysCache1(CONVOID, ObjectIdGetDatum(conversionOid));
-               if (!HeapTupleIsValid(tuple))
-                       elog(ERROR, "cache lookup failed for conversion %u",
-                                conversionOid);
-               con = (Form_pg_conversion) GETSTRUCT(tuple);
-
-               /* Permission check: must own conversion or its namespace */
-               if (!pg_conversion_ownercheck(conversionOid, GetUserId()) &&
-                       !pg_namespace_ownercheck(con->connamespace, GetUserId()))
-                       aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CONVERSION,
-                                                  NameStr(con->conname));
-
-               object.classId = ConversionRelationId;
-               object.objectId = conversionOid;
-               object.objectSubId = 0;
-
-               add_exact_object_address(&object, objects);
-
-               ReleaseSysCache(tuple);
-       }
-
-       performMultipleDeletions(objects, drop->behavior);
-
-       free_object_addresses(objects);
-}
-
 /*
  * Rename conversion
  */