From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Thu, 13 Dec 2018 20:11:09 +0000 (-0500)
Subject: Fix bogus logic for skipping unnecessary partcollation dependencies.
X-Git-Tag: REL_12_BETA1~1075
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=84d514887f9ca673ae688d00f8b544e70f1ab270;p=thirdparty%2Fpostgresql.git

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 11debaa780e..651e86b71e6 100644
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -3413,7 +3413,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 */
@@ -3432,9 +3432,9 @@ StorePartitionKey(Relation rel,
 			referenced.classId = CollationRelationId;
 			referenced.objectId = partcollation[i];
 			referenced.objectSubId = 0;
-		}
 
-		recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
+			recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
+		}
 	}
 
 	/*