git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/contrib/amcheck/expected/check_btree.out b/contrib/amcheck/expected/check_btree.out

index 605eb191445a6cab750f77eab80494eb4fc04ace..d7480fc96dc603a7769c09ecf9bc4b84e60e279e 100644 (file)

--- a/contrib/amcheck/expected/check_btree.out

+++ b/contrib/amcheck/expected/check_btree.out

CREATE INDEX bttest_b_idx ON bttest_b USING btree (id);

CREATE UNIQUE INDEX bttest_multi_idx ON bttest_multi

USING btree (id) INCLUDE (data);

-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);

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

-GRANT EXECUTE ON FUNCTION bt_index_check(regclass, boolean) TO bttest_role;

-GRANT EXECUTE ON FUNCTION bt_index_parent_check(regclass, boolean) 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;

+GRANT EXECUTE ON FUNCTION bt_index_check(regclass, boolean) TO regress_bttest_role;

+GRANT EXECUTE ON FUNCTION bt_index_parent_check(regclass, boolean) TO regress_bttest_role;

+SET ROLE regress_bttest_role;

SELECT bt_index_check('bttest_a_idx');

bt_index_check

----------------

DROP TABLE bttest_multi;

DROP TABLE delete_test_table;

DROP TABLE toast_bug;

-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 2fd3dc388b1f94f3256446ddadc639b31cfe4627..9a1987598da9855c529e474475aaceb567e0b378 100644 (file)

--- a/contrib/amcheck/sql/check_btree.sql

+++ b/contrib/amcheck/sql/check_btree.sql

CREATE UNIQUE INDEX bttest_multi_idx ON bttest_multi

USING btree (id) INCLUDE (data);

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

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

-GRANT EXECUTE ON FUNCTION bt_index_check(regclass, boolean) TO bttest_role;

-GRANT EXECUTE ON FUNCTION bt_index_parent_check(regclass, boolean) 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;

+GRANT EXECUTE ON FUNCTION bt_index_check(regclass, boolean) TO regress_bttest_role;

+GRANT EXECUTE ON FUNCTION bt_index_parent_check(regclass, boolean) 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;

DROP TABLE bttest_multi;

DROP TABLE delete_test_table;

DROP TABLE toast_bug;

-DROP OWNED BY bttest_role; -- permissions

-DROP ROLE bttest_role;

+DROP OWNED BY regress_bttest_role; -- permissions

+DROP ROLE regress_bttest_role;