Clean up rather sloppy fix in HEAD for the ancient bug that CREATE CONVERSION

didn't create a dependency from the new conversion to its schema.  Back-patch
to all supported releases.

diff --git a/src/backend/catalog/pg_conversion.c b/src/backend/catalog/pg_conversion.c
index 2f448036f46c0e9b8a233b7a86f1414ec594cd84..86514f62295ce87e1cb535ebb3bf2a2cc47eef10 100644 (file)
--- a/src/backend/catalog/pg_conversion.c
+++ b/src/backend/catalog/pg_conversion.c
@@ -119,16 +119,16 @@ ConversionCreate(const char *conname, Oid connamespace,
        referenced.objectSubId = 0;
        recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
 
-       /* create dependency on owner */
-       recordDependencyOnOwner(ConversionRelationId, HeapTupleGetOid(tup),
-                                                       conowner);
-
        /* create dependency on namespace */
-       myself.classId = ConversionRelationId;
        referenced.classId = NamespaceRelationId;
        referenced.objectId = connamespace;
+       referenced.objectSubId = 0;
        recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
 
+       /* create dependency on owner */
+       recordDependencyOnOwner(ConversionRelationId, HeapTupleGetOid(tup),
+                                                       conowner);
+
        heap_freetuple(tup);
        heap_close(rel, RowExclusiveLock);