From 6928484bda454f9ab2456d385b2d317f18b6bf1a Mon Sep 17 00:00:00 2001 From: Stephen Frost <sfrost@snowman.net> Date: Thu, 7 Apr 2016 14:40:23 -0400 Subject: [PATCH] GRANT rights to CURRENT_USER instead of adding roles We shouldn't be adding roles during the regression tests as that can cause back-to-back installcheck runs to fail and users running the regression tests likley don't want those extra roles. Pointed out by Tom --- src/test/regress/expected/init_privs.out | 7 +++---- src/test/regress/sql/init_privs.sql | 9 ++++----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/test/regress/expected/init_privs.out b/src/test/regress/expected/init_privs.out index 980940fa67f..55139d4d37c 100644 --- a/src/test/regress/expected/init_privs.out +++ b/src/test/regress/expected/init_privs.out @@ -6,8 +6,7 @@ SELECT count(*) > 0 FROM pg_init_privs; t (1 row) -CREATE ROLE init_privs_test_role1; -CREATE ROLE init_privs_test_role2; -- Intentionally include some non-initial privs for pg_dump to dump out -GRANT SELECT ON pg_proc TO init_privs_test_role1; -GRANT SELECT (prosrc) ON pg_proc TO init_privs_test_role2; +GRANT SELECT ON pg_proc TO CURRENT_USER; +GRANT SELECT (prosrc) ON pg_proc TO CURRENT_USER; +GRANT SELECT (rolname, rolsuper) ON pg_authid TO CURRENT_USER; diff --git a/src/test/regress/sql/init_privs.sql b/src/test/regress/sql/init_privs.sql index 38d4a885389..9b4c70246e5 100644 --- a/src/test/regress/sql/init_privs.sql +++ b/src/test/regress/sql/init_privs.sql @@ -3,9 +3,8 @@ -- There should always be some initial privileges, set up by initdb SELECT count(*) > 0 FROM pg_init_privs; -CREATE ROLE init_privs_test_role1; -CREATE ROLE init_privs_test_role2; - -- Intentionally include some non-initial privs for pg_dump to dump out -GRANT SELECT ON pg_proc TO init_privs_test_role1; -GRANT SELECT (prosrc) ON pg_proc TO init_privs_test_role2; +GRANT SELECT ON pg_proc TO CURRENT_USER; +GRANT SELECT (prosrc) ON pg_proc TO CURRENT_USER; + +GRANT SELECT (rolname, rolsuper) ON pg_authid TO CURRENT_USER; -- GitLab