From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sun, 20 Nov 2022 16:30:50 +0000 (-0500)
Subject: Fix sloppy cleanup of roles in privileges.sql.
X-Git-Tag: REL_16_BETA1~1274
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b62303794efd97f2afb55f1e1b82fffae2cf8a2d;p=thirdparty%2Fpostgresql.git

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.
---

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;