Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 386ca0a

Browse files
alvherrealvherre
committed
Fix role names in merge.sql regress file
These names need to be prefixed with "regress_". Per buildfarm.
1 parent 7103ebb commit 386ca0a

File tree

2 files changed

+28
-28
lines changed

2 files changed

+28
-28
lines changed

‎src/test/regress/expected/merge.out

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
--set debug_print_rewritten = true;
66
--set debug_print_parse = true;
77
--set debug_print_pretty = true;
8-
CREATE USER merge_privs;
9-
CREATE USER merge_no_privs;
8+
CREATE USER regress_merge_privs;
9+
CREATE USER regress_merge_no_privs;
1010
DROP TABLE IF EXISTS target;
1111
NOTICE: table "target" does not exist, skipping
1212
DROP TABLE IF EXISTS source;
@@ -24,14 +24,14 @@ SELECT t.ctid is not null as matched, t.*, s.* FROM source s FULL OUTER JOIN tar
2424
t | 3 | 30 | |
2525
(3 rows)
2626

27-
ALTER TABLE target OWNER TO merge_privs;
28-
ALTER TABLE source OWNER TO merge_privs;
27+
ALTER TABLE target OWNER TO regress_merge_privs;
28+
ALTER TABLE source OWNER TO regress_merge_privs;
2929
CREATE TABLE target2 (tid integer, balance integer);
3030
CREATE TABLE source2 (sid integer, delta integer);
31-
ALTER TABLE target2 OWNER TO merge_no_privs;
32-
ALTER TABLE source2 OWNER TO merge_no_privs;
33-
GRANT INSERT ON target TO merge_no_privs;
34-
SET SESSION AUTHORIZATION merge_privs;
31+
ALTER TABLE target2 OWNER TO regress_merge_no_privs;
32+
ALTER TABLE source2 OWNER TO regress_merge_no_privs;
33+
GRANT INSERT ON target TO regress_merge_no_privs;
34+
SET SESSION AUTHORIZATION regress_merge_privs;
3535
EXPLAIN (COSTS OFF)
3636
MERGE INTO target t
3737
USING source AS s
@@ -151,16 +151,16 @@ ON target.tid = source2.sid
151151
WHEN MATCHED THEN
152152
UPDATE SET balance = 0;
153153
ERROR: permission denied for table source2
154-
GRANT INSERT ON target TO merge_no_privs;
155-
SET SESSION AUTHORIZATION merge_no_privs;
154+
GRANT INSERT ON target TO regress_merge_no_privs;
155+
SET SESSION AUTHORIZATION regress_merge_no_privs;
156156
MERGE INTO target
157157
USING source2
158158
ON target.tid = source2.sid
159159
WHEN MATCHED THEN
160160
UPDATE SET balance = 0;
161161
ERROR: permission denied for table target
162-
GRANT UPDATE ON target2 TO merge_privs;
163-
SET SESSION AUTHORIZATION merge_privs;
162+
GRANT UPDATE ON target2 TO regress_merge_privs;
163+
SET SESSION AUTHORIZATION regress_merge_privs;
164164
MERGE INTO target2
165165
USING source
166166
ON target2.tid = source.sid
@@ -1930,5 +1930,5 @@ RESET SESSION AUTHORIZATION;
19301930
DROP TABLE target, target2;
19311931
DROP TABLE source, source2;
19321932
DROP FUNCTION merge_trigfunc();
1933-
DROP USER merge_privs;
1934-
DROP USER merge_no_privs;
1933+
DROP USER regress_merge_privs;
1934+
DROP USER regress_merge_no_privs;

‎src/test/regress/sql/merge.sql

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
--set debug_print_pretty = true;
99

1010

11-
CREATE USER merge_privs;
12-
CREATE USER merge_no_privs;
11+
CREATE USER regress_merge_privs;
12+
CREATE USER regress_merge_no_privs;
1313
DROP TABLE IF EXISTS target;
1414
DROP TABLE IF EXISTS source;
1515
CREATE TABLE target (tid integer, balance integer);
@@ -19,18 +19,18 @@ INSERT INTO target VALUES (2, 20);
1919
INSERT INTO target VALUES (3, 30);
2020
SELECT t.ctid is not null as matched, t.*, s.* FROM source s FULL OUTER JOIN target t ON s.sid = t.tid ORDER BY t.tid, s.sid;
2121

22-
ALTER TABLE target OWNER TO merge_privs;
23-
ALTER TABLE source OWNER TO merge_privs;
22+
ALTER TABLE target OWNER TO regress_merge_privs;
23+
ALTER TABLE source OWNER TO regress_merge_privs;
2424

2525
CREATE TABLE target2 (tid integer, balance integer);
2626
CREATE TABLE source2 (sid integer, delta integer);
2727

28-
ALTER TABLE target2 OWNER TO merge_no_privs;
29-
ALTER TABLE source2 OWNER TO merge_no_privs;
28+
ALTER TABLE target2 OWNER TO regress_merge_no_privs;
29+
ALTER TABLE source2 OWNER TO regress_merge_no_privs;
3030

31-
GRANT INSERT ON target TO merge_no_privs;
31+
GRANT INSERT ON target TO regress_merge_no_privs;
3232

33-
SET SESSION AUTHORIZATION merge_privs;
33+
SET SESSION AUTHORIZATION regress_merge_privs;
3434

3535
EXPLAIN (COSTS OFF)
3636
MERGE INTO target t
@@ -116,17 +116,17 @@ ON target.tid = source2.sid
116116
WHEN MATCHED THEN
117117
UPDATE SET balance = 0;
118118

119-
GRANT INSERT ON target TO merge_no_privs;
120-
SET SESSION AUTHORIZATION merge_no_privs;
119+
GRANT INSERT ON target TO regress_merge_no_privs;
120+
SET SESSION AUTHORIZATION regress_merge_no_privs;
121121

122122
MERGE INTO target
123123
USING source2
124124
ON target.tid = source2.sid
125125
WHEN MATCHED THEN
126126
UPDATE SET balance = 0;
127127

128-
GRANT UPDATE ON target2 TO merge_privs;
129-
SET SESSION AUTHORIZATION merge_privs;
128+
GRANT UPDATE ON target2 TO regress_merge_privs;
129+
SET SESSION AUTHORIZATION regress_merge_privs;
130130

131131
MERGE INTO target2
132132
USING source
@@ -1269,5 +1269,5 @@ RESET SESSION AUTHORIZATION;
12691269
DROP TABLE target, target2;
12701270
DROP TABLE source, source2;
12711271
DROP FUNCTION merge_trigfunc();
1272-
DROP USER merge_privs;
1273-
DROP USER merge_no_privs;
1272+
DROP USER regress_merge_privs;
1273+
DROP USER regress_merge_no_privs;

0 commit comments

Comments
 (0)