From b62303794efd97f2afb55f1e1b82fffae2cf8a2d Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sun, 20 Nov 2022 11:30:50 -0500 Subject: [PATCH] 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. --- src/test/regress/expected/privileges.out | 5 ++--- src/test/regress/sql/privileges.sql | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/test/regress/expected/privileges.out b/src/test/regress/expected/privileges.out index a497db94a8..4045bcafb5 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_protagonist; +DROP ROLE regress_roleoption_donor; DROP ROLE regress_roleoption_recipient; -DROP ROLE regress_roleoption_donor; -DROP ROLE regress_roleoption_donor; -ERROR: role "regress_roleoption_donor" does not exist diff --git a/src/test/regress/sql/privileges.sql b/src/test/regress/sql/privileges.sql index daecf0ec64..92c000cf00 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_protagonist; +DROP ROLE regress_roleoption_donor; DROP ROLE regress_roleoption_recipient; -DROP ROLE regress_roleoption_donor; -DROP ROLE regress_roleoption_donor;