From 80931442c9c93b6c94d56808697648e44f0625ee Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Tue, 25 Jun 2019 23:19:31 -0400 Subject: [PATCH] Follow the rule that regression-test-created roles are named "regress_xxx". contrib/amcheck didn't get the memo either. --- contrib/amcheck/expected/check_btree.out | 14 +++++++------- contrib/amcheck/sql/check_btree.sql | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/contrib/amcheck/expected/check_btree.out b/contrib/amcheck/expected/check_btree.out index df3741e2c92..4cd2ddd5ace 100644 --- a/contrib/amcheck/expected/check_btree.out +++ b/contrib/amcheck/expected/check_btree.out @@ -5,9 +5,9 @@ INSERT INTO bttest_a SELECT * FROM generate_series(1, 100000); INSERT INTO bttest_b SELECT * FROM generate_series(100000, 1, -1); CREATE INDEX bttest_a_idx ON bttest_a USING btree (id); CREATE INDEX bttest_b_idx ON bttest_b USING btree (id); -CREATE ROLE bttest_role; +CREATE ROLE regress_bttest_role; -- verify permissions are checked (error due to function not callable) -SET ROLE bttest_role; +SET ROLE regress_bttest_role; SELECT bt_index_check('bttest_a_idx'::regclass); ERROR: permission denied for function bt_index_check SELECT bt_index_parent_check('bttest_a_idx'::regclass); @@ -16,9 +16,9 @@ RESET ROLE; -- we, intentionally, don't check relation permissions - it's useful -- to run this cluster-wide with a restricted account, and as tested -- above explicit permission has to be granted for that. -GRANT EXECUTE ON FUNCTION bt_index_check(regclass) TO bttest_role; -GRANT EXECUTE ON FUNCTION bt_index_parent_check(regclass) TO bttest_role; -SET ROLE bttest_role; +GRANT EXECUTE ON FUNCTION bt_index_check(regclass) TO regress_bttest_role; +GRANT EXECUTE ON FUNCTION bt_index_parent_check(regclass) TO regress_bttest_role; +SET ROLE regress_bttest_role; SELECT bt_index_check('bttest_a_idx'); bt_index_check ---------------- @@ -88,5 +88,5 @@ COMMIT; -- cleanup DROP TABLE bttest_a; DROP TABLE bttest_b; -DROP OWNED BY bttest_role; -- permissions -DROP ROLE bttest_role; +DROP OWNED BY regress_bttest_role; -- permissions +DROP ROLE regress_bttest_role; diff --git a/contrib/amcheck/sql/check_btree.sql b/contrib/amcheck/sql/check_btree.sql index fd905310271..019e0b74a4e 100644 --- a/contrib/amcheck/sql/check_btree.sql +++ b/contrib/amcheck/sql/check_btree.sql @@ -8,10 +8,10 @@ INSERT INTO bttest_b SELECT * FROM generate_series(100000, 1, -1); CREATE INDEX bttest_a_idx ON bttest_a USING btree (id); CREATE INDEX bttest_b_idx ON bttest_b USING btree (id); -CREATE ROLE bttest_role; +CREATE ROLE regress_bttest_role; -- verify permissions are checked (error due to function not callable) -SET ROLE bttest_role; +SET ROLE regress_bttest_role; SELECT bt_index_check('bttest_a_idx'::regclass); SELECT bt_index_parent_check('bttest_a_idx'::regclass); RESET ROLE; @@ -19,9 +19,9 @@ RESET ROLE; -- we, intentionally, don't check relation permissions - it's useful -- to run this cluster-wide with a restricted account, and as tested -- above explicit permission has to be granted for that. -GRANT EXECUTE ON FUNCTION bt_index_check(regclass) TO bttest_role; -GRANT EXECUTE ON FUNCTION bt_index_parent_check(regclass) TO bttest_role; -SET ROLE bttest_role; +GRANT EXECUTE ON FUNCTION bt_index_check(regclass) TO regress_bttest_role; +GRANT EXECUTE ON FUNCTION bt_index_parent_check(regclass) TO regress_bttest_role; +SET ROLE regress_bttest_role; SELECT bt_index_check('bttest_a_idx'); SELECT bt_index_parent_check('bttest_a_idx'); RESET ROLE; @@ -57,5 +57,5 @@ COMMIT; -- cleanup DROP TABLE bttest_a; DROP TABLE bttest_b; -DROP OWNED BY bttest_role; -- permissions -DROP ROLE bttest_role; +DROP OWNED BY regress_bttest_role; -- permissions +DROP ROLE regress_bttest_role; -- 2.39.5