Fix handling of extension membership when filling in a shell operator.

The previous coding would result in deleting and not re-creating the
extension membership pg_depend rows, since there was no
CommandCounterIncrement that would allow recordDependencyOnCurrentExtension
to see that the deletion had happened.  Make it work like the shell type
case, ie, keep the existing entries (and then throw an error if they're for
the wrong extension).

Per bug #6172 from Hitoshi Harada.  Investigation and fix by Dimitri
Fontaine.

diff --git a/src/backend/catalog/pg_operator.c b/src/backend/catalog/pg_operator.c
index 013707495d11c91460490ad6b40c9d54fc392667..88410e5090bdcfa8b591d3db272cecd40dada3d5 100644 (file)
--- a/src/backend/catalog/pg_operator.c
+++ b/src/backend/catalog/pg_operator.c
@@ -776,8 +776,11 @@ makeOperatorDependencies(HeapTuple tuple)
    myself.objectId = HeapTupleGetOid(tuple);
    myself.objectSubId = 0;
 
-   /* In case we are updating a shell, delete any existing entries */
-   deleteDependencyRecordsFor(myself.classId, myself.objectId, false);
+   /*
+    * In case we are updating a shell, delete any existing entries, except
+    * for extension membership which should remain the same.
+    */
+   deleteDependencyRecordsFor(myself.classId, myself.objectId, true);
    deleteSharedDependencyRecordsFor(myself.classId, myself.objectId, 0);
 
    /* Dependency on namespace */