REASSIGN OWNED: consider grants on tablespaces, too

Apparently this was considered in the original code (see commit
cec3b0a9) but I failed to notice that such entries would always be
skipped by the database check at the start of the loop.

Per bugs #7578 by Nikolay, #6116 by tushar.qa@gmail.com.

diff --git a/src/backend/catalog/pg_shdepend.c b/src/backend/catalog/pg_shdepend.c
index 8aa9a6f6fa60f0b521cafbd45b0e1ab04ba2caf7..02e8d7c62e55c48470e9443bff6d4d60716f178b 100644 (file)
--- a/src/backend/catalog/pg_shdepend.c
+++ b/src/backend/catalog/pg_shdepend.c
@@ -1185,8 +1185,12 @@ shdepDropOwned(List *roleids, DropBehavior behavior)
                        InternalGrant istmt;
                        ObjectAddress obj;
 
-                       /* We only operate on objects in the current database */
-                       if (sdepForm->dbid != MyDatabaseId)
+                       /*
+                        * We only operate on shared objects and objects in the current
+                        * database
+                        */
+                       if (sdepForm->dbid != MyDatabaseId &&
+                               sdepForm->dbid != InvalidOid)
                                continue;
 
                        switch (sdepForm->deptype)