From 0af0504da91e5e15f0b203309a1e49a4829dac64 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Fri, 20 Dec 2019 15:45:37 -0500 Subject: Adjust test case added by commit 6136e94dc. Per project policy, transient roles created by regression test cases should be named "regress_something", to reduce the risks of running such cases against installed servers. And no such role should ever be left behind after running a test. Discussion: https://postgr.es/m/11297.1576868677@sss.pgh.pa.us --- contrib/postgres_fdw/sql/postgres_fdw.sql | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'contrib/postgres_fdw/sql/postgres_fdw.sql') diff --git a/contrib/postgres_fdw/sql/postgres_fdw.sql b/contrib/postgres_fdw/sql/postgres_fdw.sql index c525897a78a..4f29e7cb44f 100644 --- a/contrib/postgres_fdw/sql/postgres_fdw.sql +++ b/contrib/postgres_fdw/sql/postgres_fdw.sql @@ -2498,11 +2498,11 @@ SELECT b, avg(a), max(a), count(*) FROM pagg_tab GROUP BY b HAVING sum(a) < 700 -- =================================================================== -- Non-superuser cannot create a FDW without a password in the connstr -CREATE ROLE nosuper NOSUPERUSER; +CREATE ROLE regress_nosuper NOSUPERUSER; -GRANT USAGE ON FOREIGN DATA WRAPPER postgres_fdw TO nosuper; +GRANT USAGE ON FOREIGN DATA WRAPPER postgres_fdw TO regress_nosuper; -SET ROLE nosuper; +SET ROLE regress_nosuper; SHOW is_superuser; @@ -2559,9 +2559,9 @@ SELECT * FROM ft1_nopw LIMIT 1; RESET ROLE; -- But the superuser can -ALTER USER MAPPING FOR nosuper SERVER loopback_nopw OPTIONS (ADD password_required 'false'); +ALTER USER MAPPING FOR regress_nosuper SERVER loopback_nopw OPTIONS (ADD password_required 'false'); -SET ROLE nosuper; +SET ROLE regress_nosuper; -- Should finally work now SELECT * FROM ft1_nopw LIMIT 1; @@ -2580,6 +2580,11 @@ RESET ROLE; -- mapping option, but will work because the current user is a superuser. SELECT * FROM ft1_nopw LIMIT 1; +-- cleanup +DROP USER MAPPING FOR public SERVER loopback_nopw; +DROP OWNED BY regress_nosuper; +DROP ROLE regress_nosuper; + -- Clean-up RESET enable_partitionwise_aggregate; -- cgit v1.2.3