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 a497db94a8228e2f63ce1d06cd13c8f2bea79218..4045bcafb5e0c00c55c3f818e56d3bf7529f9ed6 100644 (file)
--- 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 daecf0ec64ca9c21686c32e2c6095a2b1ebb1c2a..92c000cf009ad8d9f6a14bb0867f79147dd40404 100644 (file)
--- 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;