summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2022-11-20 16:30:50 +0000
committerTom Lane2022-11-20 16:30:50 +0000
commitb62303794efd97f2afb55f1e1b82fffae2cf8a2d (patch)
treef040a62bb9084cf690778782b05f22a9446d4f54
parent75b8d3de989eb88a5960c93cddd88caf5d245024 (diff)
Fix sloppy cleanup of roles in privileges.sql.
Commit 3d14e171e dropped regress_roleoption_donor twice and regress_roleoption_protagonist not at all. Leaving roles behind after "make installcheck" is unfriendly in its own right, plus it causes repeated runs of "make installcheck" to fail.
-rw-r--r--src/test/regress/expected/privileges.out5
-rw-r--r--src/test/regress/sql/privileges.sql4
2 files changed, 4 insertions, 5 deletions
diff --git a/src/test/regress/expected/privileges.out b/src/test/regress/expected/privileges.out
index a497db94a82..4045bcafb5e 100644
--- a/src/test/regress/expected/privileges.out
+++ b/src/test/regress/expected/privileges.out
@@ -2846,7 +2846,6 @@ DROP TABLE regress_roleoption.t2;
DROP TABLE regress_roleoption.t3;
DROP TABLE regress_roleoption.t4;
DROP SCHEMA regress_roleoption;
-DROP ROLE regress_roleoption_recipient;
-DROP ROLE regress_roleoption_donor;
+DROP ROLE regress_roleoption_protagonist;
DROP ROLE regress_roleoption_donor;
-ERROR: role "regress_roleoption_donor" does not exist
+DROP ROLE regress_roleoption_recipient;
diff --git a/src/test/regress/sql/privileges.sql b/src/test/regress/sql/privileges.sql
index daecf0ec64c..92c000cf009 100644
--- a/src/test/regress/sql/privileges.sql
+++ b/src/test/regress/sql/privileges.sql
@@ -1849,6 +1849,6 @@ DROP TABLE regress_roleoption.t2;
DROP TABLE regress_roleoption.t3;
DROP TABLE regress_roleoption.t4;
DROP SCHEMA regress_roleoption;
-DROP ROLE regress_roleoption_recipient;
-DROP ROLE regress_roleoption_donor;
+DROP ROLE regress_roleoption_protagonist;
DROP ROLE regress_roleoption_donor;
+DROP ROLE regress_roleoption_recipient;