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 8b2d26065939fbd7b5fdbf58b6f2995a21fc2a40..71c44e51b930ed60240a8bb79e107bb202f35d22 100644 (file)
--- a/src/backend/catalog/pg_conversion.c
+++ b/src/backend/catalog/pg_conversion.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $PostgreSQL: pgsql/src/backend/catalog/pg_conversion.c,v 1.32 2006/07/14 14:52:17 momjian Exp $
+ *   $PostgreSQL: pgsql/src/backend/catalog/pg_conversion.c,v 1.33 2006/08/31 17:31:33 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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);