From: Alvaro Herrera <alvherre@alvh.no-ip.org>
Date: Wed, 3 Oct 2012 15:22:41 +0000 (-0300)
Subject: REASSIGN OWNED: consider grants on tablespaces, too
X-Git-Tag: REL9_1_7~59
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=412a4295b5390cfe4fd5b9fc84a25c6e2d1aa0ad;p=postgresql

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 77e0d08f9b..8d2d37c730 100644
--- a/src/backend/catalog/pg_shdepend.c
+++ b/src/backend/catalog/pg_shdepend.c
@@ -1214,8 +1214,12 @@ shdepDropOwned(List *roleids, DropBehavior behavior)
 			Form_pg_shdepend sdepForm = (Form_pg_shdepend) GETSTRUCT(tuple);
 			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)