Skip to content

Commit 020d5e2

Browse files
akorotkovpull[bot]
akorotkov
authored and
pull[bot]
committed
Fix invalid role names introduced in 096dd80
096dd80 added new regression tests dealing with roles. By oversight, role names didn't start with regress_ prefix. This commit fixes that.
1 parent 445e2d5 commit 020d5e2

File tree

2 files changed

+59
-59
lines changed

2 files changed

+59
-59
lines changed

‎src/test/modules/test_pg_db_role_setting/expected/test_pg_db_role_setting.out

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
CREATE EXTENSION test_pg_db_role_setting;
2-
CREATE USER super_user SUPERUSER;
3-
CREATE USER regular_user;
4-
\c - regular_user
2+
CREATE USER regress_super_user SUPERUSER;
3+
CREATE USER regress_regular_user;
4+
\c - regress_regular_user
55
-- successfully set a placeholder value
66
SET test_pg_db_role_setting.superuser_param = 'aaa';
77
-- module is loaded, the placeholder value is thrown away
@@ -24,24 +24,24 @@ SHOW test_pg_db_role_setting.user_param;
2424
user_param_value
2525
(1 row)
2626

27-
\c - regular_user
27+
\c - regress_regular_user
2828
-- fail, not privileges
29-
ALTER ROLE regular_user SET test_pg_db_role_setting.superuser_param = 'aaa';
29+
ALTER ROLE regress_regular_user SET test_pg_db_role_setting.superuser_param = 'aaa';
3030
ERROR: permission denied to set parameter "test_pg_db_role_setting.superuser_param"
31-
ALTER ROLE regular_user SET test_pg_db_role_setting.user_param = 'bbb';
31+
ALTER ROLE regress_regular_user SET test_pg_db_role_setting.user_param = 'bbb';
3232
ERROR: permission denied to set parameter "test_pg_db_role_setting.user_param"
3333
-- success for USER SET parameters
34-
ALTER ROLE regular_user SET test_pg_db_role_setting.superuser_param = 'aaa' USER SET;
35-
ALTER ROLE regular_user SET test_pg_db_role_setting.user_param = 'bbb' USER SET;
36-
\drds regular_user
37-
List of settings
38-
Role | Database | Settings | User set
39-
--------------+----------+---------------------------------------------+----------
40-
regular_user | | test_pg_db_role_setting.superuser_param=aaa+| t +
41-
| | test_pg_db_role_setting.user_param=bbb | t
34+
ALTER ROLE regress_regular_user SET test_pg_db_role_setting.superuser_param = 'aaa' USER SET;
35+
ALTER ROLE regress_regular_user SET test_pg_db_role_setting.user_param = 'bbb' USER SET;
36+
\drds regress_regular_user
37+
List of settings
38+
Role | Database | Settings | User set
39+
----------------------+----------+---------------------------------------------+----------
40+
regress_regular_user | | test_pg_db_role_setting.superuser_param=aaa+| t +
41+
| | test_pg_db_role_setting.user_param=bbb | t
4242
(1 row)
4343

44-
\c - regular_user
44+
\c - regress_regular_user
4545
-- successfully set placeholders
4646
SHOW test_pg_db_role_setting.superuser_param;
4747
test_pg_db_role_setting.superuser_param
@@ -75,40 +75,40 @@ SHOW test_pg_db_role_setting.user_param;
7575
bbb
7676
(1 row)
7777

78-
\c - super_user
79-
ALTER ROLE regular_user SET test_pg_db_role_setting.superuser_param = 'aaa';
80-
\drds regular_user
81-
List of settings
82-
Role | Database | Settings | User set
83-
--------------+----------+---------------------------------------------+----------
84-
regular_user | | test_pg_db_role_setting.superuser_param=aaa+| f +
85-
| | test_pg_db_role_setting.user_param=bbb | t
78+
\c - regress_super_user
79+
ALTER ROLE regress_regular_user SET test_pg_db_role_setting.superuser_param = 'aaa';
80+
\drds regress_regular_user
81+
List of settings
82+
Role | Database | Settings | User set
83+
----------------------+----------+---------------------------------------------+----------
84+
regress_regular_user | | test_pg_db_role_setting.superuser_param=aaa+| f +
85+
| | test_pg_db_role_setting.user_param=bbb | t
8686
(1 row)
8787

88-
\c - regular_user
88+
\c - regress_regular_user
8989
-- don't have a priviledge to change superuser value to user set one
90-
ALTER ROLE regular_user SET test_pg_db_role_setting.superuser_param = 'ccc' USER SET;
90+
ALTER ROLE regress_regular_user SET test_pg_db_role_setting.superuser_param = 'ccc' USER SET;
9191
ERROR: permission denied to set parameter "test_pg_db_role_setting.superuser_param"
92-
\c - super_user
92+
\c - regress_super_user
9393
SELECT load_test_pg_db_role_setting();
9494
load_test_pg_db_role_setting
9595
------------------------------
9696

9797
(1 row)
9898

9999
-- give the privilege to set SUSET param to the regular user
100-
GRANT SET ON PARAMETER test_pg_db_role_setting.superuser_param TO regular_user;
101-
\c - regular_user
102-
ALTER ROLE regular_user SET test_pg_db_role_setting.superuser_param = 'ccc';
103-
\drds regular_user
104-
List of settings
105-
Role | Database | Settings | User set
106-
--------------+----------+---------------------------------------------+----------
107-
regular_user | | test_pg_db_role_setting.superuser_param=ccc+| f +
108-
| | test_pg_db_role_setting.user_param=bbb | t
109-
(1 row)
110-
111-
\c - regular_user
100+
GRANT SET ON PARAMETER test_pg_db_role_setting.superuser_param TO regress_regular_user;
101+
\c - regress_regular_user
102+
ALTER ROLE regress_regular_user SET test_pg_db_role_setting.superuser_param = 'ccc';
103+
\drds regress_regular_user
104+
List of settings
105+
Role | Database | Settings | User set
106+
----------------------+----------+---------------------------------------------+----------
107+
regress_regular_user | | test_pg_db_role_setting.superuser_param=ccc+| f +
108+
| | test_pg_db_role_setting.user_param=bbb | t
109+
(1 row)
110+
111+
\c - regress_regular_user
112112
-- successfully set placeholders
113113
SHOW test_pg_db_role_setting.superuser_param;
114114
test_pg_db_role_setting.superuser_param

‎src/test/modules/test_pg_db_role_setting/sql/test_pg_db_role_setting.sql

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
CREATE EXTENSION test_pg_db_role_setting;
2-
CREATE USER super_user SUPERUSER;
3-
CREATE USER regular_user;
2+
CREATE USER regress_super_user SUPERUSER;
3+
CREATE USER regress_regular_user;
44

5-
\c - regular_user
5+
\c - regress_regular_user
66
-- successfully set a placeholder value
77
SET test_pg_db_role_setting.superuser_param = 'aaa';
88

@@ -12,17 +12,17 @@ SELECT load_test_pg_db_role_setting();
1212
SHOW test_pg_db_role_setting.superuser_param;
1313
SHOW test_pg_db_role_setting.user_param;
1414

15-
\c - regular_user
15+
\c - regress_regular_user
1616
-- fail, not privileges
17-
ALTER ROLE regular_user SET test_pg_db_role_setting.superuser_param = 'aaa';
18-
ALTER ROLE regular_user SET test_pg_db_role_setting.user_param = 'bbb';
17+
ALTER ROLE regress_regular_user SET test_pg_db_role_setting.superuser_param = 'aaa';
18+
ALTER ROLE regress_regular_user SET test_pg_db_role_setting.user_param = 'bbb';
1919
-- success for USER SET parameters
20-
ALTER ROLE regular_user SET test_pg_db_role_setting.superuser_param = 'aaa' USER SET;
21-
ALTER ROLE regular_user SET test_pg_db_role_setting.user_param = 'bbb' USER SET;
20+
ALTER ROLE regress_regular_user SET test_pg_db_role_setting.superuser_param = 'aaa' USER SET;
21+
ALTER ROLE regress_regular_user SET test_pg_db_role_setting.user_param = 'bbb' USER SET;
2222

23-
\drds regular_user
23+
\drds regress_regular_user
2424

25-
\c - regular_user
25+
\c - regress_regular_user
2626
-- successfully set placeholders
2727
SHOW test_pg_db_role_setting.superuser_param;
2828
SHOW test_pg_db_role_setting.user_param;
@@ -33,25 +33,25 @@ SELECT load_test_pg_db_role_setting();
3333
SHOW test_pg_db_role_setting.superuser_param;
3434
SHOW test_pg_db_role_setting.user_param;
3535

36-
\c - super_user
37-
ALTER ROLE regular_user SET test_pg_db_role_setting.superuser_param = 'aaa';
38-
\drds regular_user
36+
\c - regress_super_user
37+
ALTER ROLE regress_regular_user SET test_pg_db_role_setting.superuser_param = 'aaa';
38+
\drds regress_regular_user
3939

40-
\c - regular_user
40+
\c - regress_regular_user
4141
-- don't have a priviledge to change superuser value to user set one
42-
ALTER ROLE regular_user SET test_pg_db_role_setting.superuser_param = 'ccc' USER SET;
42+
ALTER ROLE regress_regular_user SET test_pg_db_role_setting.superuser_param = 'ccc' USER SET;
4343

44-
\c - super_user
44+
\c - regress_super_user
4545
SELECT load_test_pg_db_role_setting();
4646
-- give the privilege to set SUSET param to the regular user
47-
GRANT SET ON PARAMETER test_pg_db_role_setting.superuser_param TO regular_user;
47+
GRANT SET ON PARAMETER test_pg_db_role_setting.superuser_param TO regress_regular_user;
4848

49-
\c - regular_user
50-
ALTER ROLE regular_user SET test_pg_db_role_setting.superuser_param = 'ccc';
49+
\c - regress_regular_user
50+
ALTER ROLE regress_regular_user SET test_pg_db_role_setting.superuser_param = 'ccc';
5151

52-
\drds regular_user
52+
\drds regress_regular_user
5353

54-
\c - regular_user
54+
\c - regress_regular_user
5555
-- successfully set placeholders
5656
SHOW test_pg_db_role_setting.superuser_param;
5757
SHOW test_pg_db_role_setting.user_param;

0 commit comments

Comments
 (0)