From d0d968328794a25c844dc57585d0289a08159bb5 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Wed, 11 Jan 2023 12:22:47 -0500 Subject: Don't leave roles behind after core regression tests. Commits cf5eb37c5 and e5b8a4c09 each created a new role that they forgot to remove again. This breaks the use-case of running "make installcheck" more than once, and it's also against project policy because it'd be quite unfriendly behavior if one were running "make installcheck" against a non-throwaway installation. --- src/test/regress/expected/create_role.out | 7 ++++++- src/test/regress/sql/create_role.sql | 6 +++++- 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/test/regress/expected/create_role.out b/src/test/regress/expected/create_role.out index bed37498889..cd49feabb3a 100644 --- a/src/test/regress/expected/create_role.out +++ b/src/test/regress/expected/create_role.out @@ -174,18 +174,23 @@ DROP ROLE regress_password_null; DROP ROLE regress_noiseword; DROP ROLE regress_inroles; DROP ROLE regress_adminroles; --- fail, cannot drop ourself nor superusers +-- fail, cannot drop ourself, nor superusers or roles we lack ADMIN for DROP ROLE regress_role_super; ERROR: must be superuser to drop superusers DROP ROLE regress_role_admin; ERROR: current user cannot be dropped +DROP ROLE regress_rolecreator; +ERROR: must have admin option on role "regress_rolecreator" -- ok RESET SESSION AUTHORIZATION; REVOKE CREATE ON DATABASE regression FROM regress_role_admin CASCADE; DROP INDEX tenant_idx; DROP TABLE tenant_table; DROP VIEW tenant_view; +DROP SCHEMA regress_tenant2_schema; DROP ROLE regress_tenant; +DROP ROLE regress_tenant2; +DROP ROLE regress_rolecreator; DROP ROLE regress_role_admin; DROP ROLE regress_role_super; DROP ROLE regress_role_normal; diff --git a/src/test/regress/sql/create_role.sql b/src/test/regress/sql/create_role.sql index edaed43588b..6b90336da2e 100644 --- a/src/test/regress/sql/create_role.sql +++ b/src/test/regress/sql/create_role.sql @@ -161,9 +161,10 @@ DROP ROLE regress_noiseword; DROP ROLE regress_inroles; DROP ROLE regress_adminroles; --- fail, cannot drop ourself nor superusers +-- fail, cannot drop ourself, nor superusers or roles we lack ADMIN for DROP ROLE regress_role_super; DROP ROLE regress_role_admin; +DROP ROLE regress_rolecreator; -- ok RESET SESSION AUTHORIZATION; @@ -171,7 +172,10 @@ REVOKE CREATE ON DATABASE regression FROM regress_role_admin CASCADE; DROP INDEX tenant_idx; DROP TABLE tenant_table; DROP VIEW tenant_view; +DROP SCHEMA regress_tenant2_schema; DROP ROLE regress_tenant; +DROP ROLE regress_tenant2; +DROP ROLE regress_rolecreator; DROP ROLE regress_role_admin; DROP ROLE regress_role_super; DROP ROLE regress_role_normal; -- cgit v1.2.3