From 07af327b0f646cf946dde6ea7f7fcaed31613426 Mon Sep 17 00:00:00 2001 From: Robert Haas Date: Mon, 26 Sep 2022 14:14:54 -0400 Subject: [PATCH] Fix bug in DROP OWNED BY. Commit 6566133c5f52771198aca07ed18f84519fac1be7 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 --- src/backend/catalog/pg_shdepend.c | 30 ++++++++++++++++++++---------- src/bin/scripts/t/020_createdb.pl | 18 ++++++++++++++++++ 2 files changed, 38 insertions(+), 10 deletions(-) diff --git a/src/backend/catalog/pg_shdepend.c b/src/backend/catalog/pg_shdepend.c index f2f227f887..e359b2bd14 100644 --- a/src/backend/catalog/pg_shdepend.c +++ b/src/backend/catalog/pg_shdepend.c @@ -1412,19 +1412,29 @@ 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 == SHARED_DEPENDENCY_OWNER || + sdepForm->classid == AuthMemRelationId) { - ReleaseDeletionLock(&obj); - break; + /* 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)) + { + ReleaseDeletionLock(&obj); + break; + } + add_exact_object_address(&obj, deleteobjs); } - add_exact_object_address(&obj, deleteobjs); break; } } diff --git a/src/bin/scripts/t/020_createdb.pl b/src/bin/scripts/t/020_createdb.pl index 2e712f4fe9..a74bf3b0d8 100644 --- a/src/bin/scripts/t/020_createdb.pl +++ b/src/bin/scripts/t/020_createdb.pl @@ -158,4 +158,22 @@ $node->issues_sql_like( qr/statement: CREATE DATABASE foobar7 STRATEGY file_copy TEMPLATE foobar2/, 'create database with FILE_COPY strategy'); +# Create database owned by role_foobar. +$node->issues_sql_like( + [ 'createdb', '-T', 'foobar2', '-O', 'role_foobar', 'foobar8' ], + qr/statement: CREATE DATABASE foobar8 OWNER role_foobar TEMPLATE foobar2/, + 'create database with owner role_foobar'); +($ret, $stdout, $stderr) = $node->psql( + 'foobar2', + 'DROP OWNED BY role_foobar;', + on_error_die => 1, +); +ok($ret == 0, "DROP OWNED BY role_foobar"); +($ret, $stdout, $stderr) = $node->psql( + 'foobar2', + 'DROP DATABASE foobar8;', + on_error_die => 1, +); +ok($ret == 0, "DROP DATABASE foobar8"); + done_testing(); -- 2.24.3 (Apple Git-128)