Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit386ca0a

Browse files
committed
Fix role names in merge.sql regress file
These names need to be prefixed with "regress_". Per buildfarm.
1 parent7103ebb commit386ca0a

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 USERmerge_privs;
9-
CREATE USERmerge_no_privs;
8+
CREATE USERregress_merge_privs;
9+
CREATE USERregress_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 TOmerge_privs;
28-
ALTER TABLE source OWNER TOmerge_privs;
27+
ALTER TABLE target OWNER TOregress_merge_privs;
28+
ALTER TABLE source OWNER TOregress_merge_privs;
2929
CREATE TABLE target2 (tid integer, balance integer);
3030
CREATE TABLE source2 (sid integer, delta integer);
31-
ALTER TABLE target2 OWNER TOmerge_no_privs;
32-
ALTER TABLE source2 OWNER TOmerge_no_privs;
33-
GRANT INSERT ON target TOmerge_no_privs;
34-
SET SESSION AUTHORIZATIONmerge_privs;
31+
ALTER TABLE target2 OWNER TOregress_merge_no_privs;
32+
ALTER TABLE source2 OWNER TOregress_merge_no_privs;
33+
GRANT INSERT ON target TOregress_merge_no_privs;
34+
SET SESSION AUTHORIZATIONregress_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 TOmerge_no_privs;
155-
SET SESSION AUTHORIZATIONmerge_no_privs;
154+
GRANT INSERT ON target TOregress_merge_no_privs;
155+
SET SESSION AUTHORIZATIONregress_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 TOmerge_privs;
163-
SET SESSION AUTHORIZATIONmerge_privs;
162+
GRANT UPDATE ON target2 TOregress_merge_privs;
163+
SET SESSION AUTHORIZATIONregress_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 USERmerge_privs;
1934-
DROP USERmerge_no_privs;
1933+
DROP USERregress_merge_privs;
1934+
DROP USERregress_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-
CREATEUSERmerge_privs;
12-
CREATEUSERmerge_no_privs;
11+
CREATEUSERregress_merge_privs;
12+
CREATEUSERregress_merge_no_privs;
1313
DROPTABLE IF EXISTS target;
1414
DROPTABLE IF EXISTS source;
1515
CREATETABLEtarget (tidinteger, balanceinteger);
@@ -19,18 +19,18 @@ INSERT INTO target VALUES (2, 20);
1919
INSERT INTO targetVALUES (3,30);
2020
SELECTt.ctidis not nullas matched, t.*, s.*FROM source s FULL OUTERJOIN target tONs.sid=t.tidORDER BYt.tid,s.sid;
2121

22-
ALTERTABLE target OWNER TOmerge_privs;
23-
ALTERTABLE source OWNER TOmerge_privs;
22+
ALTERTABLE target OWNER TOregress_merge_privs;
23+
ALTERTABLE source OWNER TOregress_merge_privs;
2424

2525
CREATETABLEtarget2 (tidinteger, balanceinteger);
2626
CREATETABLEsource2 (sidinteger, deltainteger);
2727

28-
ALTERTABLE target2 OWNER TOmerge_no_privs;
29-
ALTERTABLE source2 OWNER TOmerge_no_privs;
28+
ALTERTABLE target2 OWNER TOregress_merge_no_privs;
29+
ALTERTABLE source2 OWNER TOregress_merge_no_privs;
3030

31-
GRANT INSERTON target TOmerge_no_privs;
31+
GRANT INSERTON target TOregress_merge_no_privs;
3232

33-
SET SESSION AUTHORIZATIONmerge_privs;
33+
SET SESSION AUTHORIZATIONregress_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
UPDATESET balance=0;
118118

119-
GRANT INSERTON target TOmerge_no_privs;
120-
SET SESSION AUTHORIZATIONmerge_no_privs;
119+
GRANT INSERTON target TOregress_merge_no_privs;
120+
SET SESSION AUTHORIZATIONregress_merge_no_privs;
121121

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

128-
GRANTUPDATEON target2 TOmerge_privs;
129-
SET SESSION AUTHORIZATIONmerge_privs;
128+
GRANTUPDATEON target2 TOregress_merge_privs;
129+
SET SESSION AUTHORIZATIONregress_merge_privs;
130130

131131
MERGE INTO target2
132132
USING source
@@ -1269,5 +1269,5 @@ RESET SESSION AUTHORIZATION;
12691269
DROPTABLE target, target2;
12701270
DROPTABLE source, source2;
12711271
DROPFUNCTION merge_trigfunc();
1272-
DROPUSERmerge_privs;
1273-
DROPUSERmerge_no_privs;
1272+
DROPUSERregress_merge_privs;
1273+
DROPUSERregress_merge_no_privs;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp