database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-10 17:42:29 +03:00
Code Activity

Fix bug in DROP OWNED BY.

Browse Source 
Commit 6566133c5f broke the case where
the role passed to DROP OWNED BY owns a database.

Report by Rushabh Lathia, who also provided a patch, but this patch
takes a slightly different approach to fixing the problem.

Discussion: http://postgr.es/m/CAGPqQf2vO+nbo=3yAdZ8v26Rbug7bY4YjPaPLZx=L1NZ9-CC3w@mail.gmail.com
This commit is contained in:
Robert Haas
2022-09-28 10:42:07 -04:00
parent a448e49bcb
commit 7188b9b0fd
2 changed files with 37 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/backend/catalog/pg_shdepend.c
View File

@@ -1412,19 +1412,28 @@ shdepDropOwned(List *roleids, DropBehavior behavior)
break;
}
/* FALLTHROUGH */
case SHARED_DEPENDENCY_OWNER:
/* Save it for deletion below */
obj.classId = sdepForm->classid;
obj.objectId = sdepForm->objid;
obj.objectSubId = sdepForm->objsubid;
/* as above */
AcquireDeletionLock(&obj, 0);
if (!systable_recheck_tuple(scan, tuple))
/*
* Save it for deletion below, if it's a local object or a
* role grant. Other shared objects, such as databases,
* should not be removed here.
*/
if (sdepForm->dbid == MyDatabaseId ||
sdepForm->classid == AuthMemRelationId)
{
ReleaseDeletionLock(&obj);
break;
obj.classId = sdepForm->classid;
obj.objectId = sdepForm->objid;
obj.objectSubId = sdepForm->objsubid;
/* as above */
AcquireDeletionLock(&obj, 0);
if (!systable_recheck_tuple(scan, tuple))
{
ReleaseDeletionLock(&obj);
break;
}
add_exact_object_address(&obj, deleteobjs);
}
add_exact_object_address(&obj, deleteobjs);
break;
}
}