8000 DROP OWNED: don't try to drop tablespaces/databases · danielcode/postgres@2d4e338 · GitHub
[go: up one dir, main page]
Skip to content

Commit 2d4e338

Browse files
alvherrealvherre
committed
DROP OWNED: don't try to drop tablespaces/databases
My "fix" for bugs #7578 and #6116 on DROP OWNED at fe3b5eb not only misstated that it applied to REASSIGN OWNED (which it did not affect), but it also failed to fix the problems fully, because I didn't test the case of owned shared objects. Thus I created a new bug, reported by Thomas Kellerer as #7748, which would cause DROP OWNED to fail with a not-for-user-consumption error message. The code would attempt to drop the database, which not only fails to work because the underlying code does not support that, but is a pretty dangerous and undesirable thing to be doing as well. This patch fixes that bug by having DROP OWNED only attempt to process shared objects when grants on them are found, ignoring ownership. Backpatch to 8.3, which is as far as the previous bug was backpatched.
1 parent 5ca31a7 commit 2d4e338

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

‎doc/src/sgml/ref/drop_owned.sgml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,11 @@ DROP OWNED BY <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCAD
2929
<title>Description</title>
3030

3131
<para>
32-
<command>DROP OWNED</command> drops all the objects in the current
32+
<command>DROP OWNED</command> drops all the objects within the current
3333
database that are owned by one of the specified roles. Any
3434
privileges granted to the given roles on objects in the current
35-
database will also be revoked.
35+
database and on shared objects (databases, tablespaces) will also be
36+
revoked.
3637
</para>
3738
</refsect1>
3839

@@ -93,7 +94,7 @@ DROP OWNED BY <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCAD
9394
</para>
9495

9596
<para>
96-
Databases owned by the role(s) will not be removed.
97+
Databases and tablespaces owned by the role(s) will not be removed.
9798
</para>
9899
</refsect1>
99100

‎src/backend/catalog/pg_shdepend.c

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1235,11 +1235,14 @@ shdepDropOwned(List *roleids, DropBehavior behavior)
12351235
sdepForm->objid);
12361236
break;
12371237
case SHARED_DEPENDENCY_OWNER:
1238-
/* Save it for deletion below */
1239-
obj.classId = sdepForm->classid;
1240-
obj.objectId = sdepForm->objid;
1241-
obj.objectSubId = sdepForm->objsubid;
1242-
add_exact_object_address(&obj, deleteobjs);
1238+
/* If a local object, save it for deletion below */
1239+
if (sdepForm->dbid == MyDatabaseId)
1240+
{
1241+
obj.classId = sdepForm->classid;
1242+
obj.objectId = sdepForm->objid;
1243+
obj.objectSubId = sdepForm->objsubid;
1244+
add_exact_object_address(&obj, deleteobjs);
1245+
}
12431246
break;
12441247
}
12451248
}

0 commit comments

Comments
 (0)
0