Fix bogus logic for skipping unnecessary partcollation dependencies.

The idea here is to not call recordDependencyOn for the default collation,
since we know that's pinned.  But what the code actually did was to record
the partition key's dependency on the opclass twice, instead.

Evidently introduced by sloppy coding in commit 2186b608b.  Back-patch
to v10 where that came in.

diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index a65f608c754bc526ac4521b27b7289f35d082c7e..415194e0193f5068a3375d54f283920c2e08b878 100644 (file)
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -3419,7 +3419,7 @@ StorePartitionKey(Relation rel,
 
    /* Mark this relation as dependent on a few things as follows */
    myself.classId = RelationRelationId;
-   myself.objectId = RelationGetRelid(rel);;
+   myself.objectId = RelationGetRelid(rel);
    myself.objectSubId = 0;
 
    /* Operator class and collation per key column */
@@ -3438,9 +3438,9 @@ StorePartitionKey(Relation rel,
            referenced.classId = CollationRelationId;
            referenced.objectId = partcollation[i];
            referenced.objectSubId = 0;
-       }
 
-       recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
+           recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
+       }
    }
 
    /*