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

Commit18555b1

Browse files
committed
Establish conventions about global object names used in regression tests.
To ensure that "make installcheck" can be used safely against an existinginstallation, we need to be careful about what global object names(database, role, and tablespace names) we use; otherwise we mightaccidentally clobber important objects. There's been a weak consensus thattest databases should have names including "regression", and that test rolenames should start with "regress_", but we didn't have any particular ruleabout tablespace names; and neither of the other rules was followed withany consistency either.This commit moves us a long way towards having a hard-and-fast rule thatregression test databases must have names including "regression", and thattest role and tablespace names must start with "regress_". It's notcompletely there because I did not touch some test cases in rolenames.sqlthat test creation of special role names like "session_user". That willrequire some rethinking of exactly what we want to test, whereas the intentof this patch is just to hit all the cases in which the needed renamingsare cosmetic.There is no enforcement mechanism in this patch either, but if we don'tadd one we can expect that the tests will soon be violating the conventionagain. Again, that's not such a cosmetic change and it will requirediscussion. (But I did use a quick-hack enforcement patch to find thesecases.)Discussion: <16638.1468620817@sss.pgh.pa.us>
1 parent7482fc4 commit18555b1

File tree

173 files changed

+3338
-3288
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

173 files changed

+3338
-3288
lines changed

‎contrib/dblink/expected/dblink.out

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,7 @@ SELECT dblink_disconnect('dtest1');
814814
(1 row)
815815

816816
-- test foreign data wrapper functionality
817-
CREATE ROLEdblink_regression_test;
817+
CREATE ROLEregress_dblink_user;
818818
DO $d$
819819
BEGIN
820820
EXECUTE $$CREATE SERVER fdtest FOREIGN DATA WRAPPER dblink_fdw
@@ -828,9 +828,9 @@ CREATE USER MAPPING FOR public SERVER fdtest
828828
ERROR: invalid option "server"
829829
HINT: Valid options in this context are: user, password
830830
CREATE USER MAPPING FOR public SERVER fdtest OPTIONS (user :'USER');
831-
GRANT USAGE ON FOREIGN SERVER fdtest TOdblink_regression_test;
832-
GRANT EXECUTE ON FUNCTION dblink_connect_u(text, text) TOdblink_regression_test;
833-
SET SESSION AUTHORIZATIONdblink_regression_test;
831+
GRANT USAGE ON FOREIGN SERVER fdtest TOregress_dblink_user;
832+
GRANT EXECUTE ON FUNCTION dblink_connect_u(text, text) TOregress_dblink_user;
833+
SET SESSION AUTHORIZATIONregress_dblink_user;
834834
-- should fail
835835
SELECT dblink_connect('myconn', 'fdtest');
836836
ERROR: password is required
@@ -859,9 +859,9 @@ SELECT * FROM dblink('myconn','SELECT * FROM foo') AS t(a int, b text, c text[])
859859
(11 rows)
860860

861861
\c - -
862-
REVOKE USAGE ON FOREIGN SERVER fdtest FROMdblink_regression_test;
863-
REVOKE EXECUTE ON FUNCTION dblink_connect_u(text, text) FROMdblink_regression_test;
864-
DROP USERdblink_regression_test;
862+
REVOKE USAGE ON FOREIGN SERVER fdtest FROMregress_dblink_user;
863+
REVOKE EXECUTE ON FUNCTION dblink_connect_u(text, text) FROMregress_dblink_user;
864+
DROP USERregress_dblink_user;
865865
DROP USER MAPPING FOR public SERVER fdtest;
866866
DROP SERVER fdtest;
867867
-- test asynchronous notifications

‎contrib/dblink/sql/dblink.sql

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ SELECT dblink_error_message('dtest1');
394394
SELECT dblink_disconnect('dtest1');
395395

396396
-- test foreign data wrapper functionality
397-
CREATE ROLEdblink_regression_test;
397+
CREATE ROLEregress_dblink_user;
398398
DO $d$
399399
BEGIN
400400
EXECUTE $$CREATE SERVER fdtest FOREIGN DATA WRAPPER dblink_fdw
@@ -408,20 +408,20 @@ CREATE USER MAPPING FOR public SERVER fdtest
408408
OPTIONS (server'localhost');-- fail, can't specify server here
409409
CREATEUSERMAPPING FOR public SERVER fdtest OPTIONS (user :'USER');
410410

411-
GRANT USAGEON FOREIGN SERVER fdtest TOdblink_regression_test;
412-
GRANT EXECUTEON FUNCTION dblink_connect_u(text,text) TOdblink_regression_test;
411+
GRANT USAGEON FOREIGN SERVER fdtest TOregress_dblink_user;
412+
GRANT EXECUTEON FUNCTION dblink_connect_u(text,text) TOregress_dblink_user;
413413

414-
SET SESSION AUTHORIZATIONdblink_regression_test;
414+
SET SESSION AUTHORIZATIONregress_dblink_user;
415415
-- should fail
416416
SELECT dblink_connect('myconn','fdtest');
417417
-- should succeed
418418
SELECT dblink_connect_u('myconn','fdtest');
419419
SELECT*FROM dblink('myconn','SELECT * FROM foo')AS t(aint, btext, ctext[]);
420420

421421
\c--
422-
REVOKE USAGEON FOREIGN SERVER fdtestFROMdblink_regression_test;
423-
REVOKE EXECUTEON FUNCTION dblink_connect_u(text,text)FROMdblink_regression_test;
424-
DROPUSERdblink_regression_test;
422+
REVOKE USAGEON FOREIGN SERVER fdtestFROMregress_dblink_user;
423+
REVOKE EXECUTEON FUNCTION dblink_connect_u(text,text)FROMregress_dblink_user;
424+
DROPUSERregress_dblink_user;
425425
DROPUSER MAPPING FOR public SERVER fdtest;
426426
DROP SERVER fdtest;
427427

‎contrib/file_fdw/input/file_fdw.source

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,37 @@
33
--
44

55
-- Clean up in case a prior regression run failed
6-
SET client_min_messages TO 'error';
7-
DROP ROLE IF EXISTSfile_fdw_superuser, file_fdw_user, no_priv_user;
6+
SET client_min_messages TO 'warning';
7+
DROP ROLE IF EXISTSregress_file_fdw_superuser, regress_file_fdw_user, regress_no_priv_user;
88
RESET client_min_messages;
99

10-
CREATE ROLEfile_fdw_superuser LOGIN SUPERUSER; -- is a superuser
11-
CREATE ROLEfile_fdw_user LOGIN; -- has priv and user mapping
12-
CREATE ROLEno_priv_user LOGIN; -- has priv but no user mapping
10+
CREATE ROLEregress_file_fdw_superuser LOGIN SUPERUSER; -- is a superuser
11+
CREATE ROLEregress_file_fdw_user LOGIN; -- has priv and user mapping
12+
CREATE ROLEregress_no_priv_user LOGIN; -- has priv but no user mapping
1313

1414
-- Install file_fdw
1515
CREATE EXTENSION file_fdw;
1616

17-
--file_fdw_superuser owns fdw-related objects
18-
SET ROLEfile_fdw_superuser;
17+
--regress_file_fdw_superuser owns fdw-related objects
18+
SET ROLEregress_file_fdw_superuser;
1919
CREATE SERVER file_server FOREIGN DATA WRAPPER file_fdw;
2020

2121
-- privilege tests
22-
SET ROLEfile_fdw_user;
22+
SET ROLEregress_file_fdw_user;
2323
CREATE FOREIGN DATA WRAPPER file_fdw2 HANDLER file_fdw_handler VALIDATOR file_fdw_validator; -- ERROR
2424
CREATE SERVER file_server2 FOREIGN DATA WRAPPER file_fdw; -- ERROR
25-
CREATE USER MAPPING FORfile_fdw_user SERVER file_server; -- ERROR
25+
CREATE USER MAPPING FORregress_file_fdw_user SERVER file_server; -- ERROR
2626

27-
SET ROLEfile_fdw_superuser;
28-
GRANT USAGE ON FOREIGN SERVER file_server TOfile_fdw_user;
27+
SET ROLEregress_file_fdw_superuser;
28+
GRANT USAGE ON FOREIGN SERVER file_server TOregress_file_fdw_user;
2929

30-
SET ROLEfile_fdw_user;
31-
CREATE USER MAPPING FORfile_fdw_user SERVER file_server;
30+
SET ROLEregress_file_fdw_user;
31+
CREATE USER MAPPING FORregress_file_fdw_user SERVER file_server;
3232

3333
-- create user mappings and grant privilege to test users
34-
SET ROLEfile_fdw_superuser;
35-
CREATE USER MAPPING FORfile_fdw_superuser SERVER file_server;
36-
CREATE USER MAPPING FORno_priv_user SERVER file_server;
34+
SET ROLEregress_file_fdw_superuser;
35+
CREATE USER MAPPING FORregress_file_fdw_superuser SERVER file_server;
36+
CREATE USER MAPPING FORregress_no_priv_user SERVER file_server;
3737

3838
-- validator tests
3939
CREATE FOREIGN TABLE tbl () SERVER file_server OPTIONS (format 'xml'); -- ERROR
@@ -66,7 +66,7 @@ CREATE FOREIGN TABLE agg_text (
6666
bfloat4
6767
) SERVER file_server
6868
OPTIONS (format 'text', filename '@abs_srcdir@/data/agg.data', delimiter '', null '\N');
69-
GRANT SELECT ON agg_text TOfile_fdw_user;
69+
GRANT SELECT ON agg_text TOregress_file_fdw_user;
7070
CREATE FOREIGN TABLE agg_csv (
7171
aint2,
7272
bfloat4
@@ -163,29 +163,29 @@ ALTER FOREIGN TABLE agg_csv NO INHERIT agg;
163163
DROP TABLE agg;
164164

165165
-- privilege tests
166-
SET ROLEfile_fdw_superuser;
166+
SET ROLEregress_file_fdw_superuser;
167167
SELECT * FROM agg_text ORDER BY a;
168-
SET ROLEfile_fdw_user;
168+
SET ROLEregress_file_fdw_user;
169169
SELECT * FROM agg_text ORDER BY a;
170-
SET ROLEno_priv_user;
170+
SET ROLEregress_no_priv_user;
171171
SELECT * FROM agg_text ORDER BY a; -- ERROR
172-
SET ROLEfile_fdw_user;
172+
SET ROLEregress_file_fdw_user;
173173
\t on
174174
EXPLAIN (VERBOSE, COSTS FALSE) SELECT * FROM agg_text WHERE a > 0;
175175
\t off
176176
-- file FDW allows foreign tables to be accessed without user mapping
177-
DROP USER MAPPING FORfile_fdw_user SERVER file_server;
177+
DROP USER MAPPING FORregress_file_fdw_user SERVER file_server;
178178
SELECT * FROM agg_text ORDER BY a;
179179

180180
-- privilege tests for object
181-
SET ROLEfile_fdw_superuser;
182-
ALTER FOREIGN TABLE agg_text OWNER TOfile_fdw_user;
181+
SET ROLEregress_file_fdw_superuser;
182+
ALTER FOREIGN TABLE agg_text OWNER TOregress_file_fdw_user;
183183
ALTER FOREIGN TABLE agg_text OPTIONS (SET format 'text');
184-
SET ROLEfile_fdw_user;
184+
SET ROLEregress_file_fdw_user;
185185
ALTER FOREIGN TABLE agg_text OPTIONS (SET format 'text');
186-
SET ROLEfile_fdw_superuser;
186+
SET ROLEregress_file_fdw_superuser;
187187

188188
-- cleanup
189189
RESET ROLE;
190190
DROP EXTENSION file_fdw CASCADE;
191-
DROP ROLEfile_fdw_superuser, file_fdw_user, no_priv_user;
191+
DROP ROLEregress_file_fdw_superuser, regress_file_fdw_user, regress_no_priv_user;

‎contrib/file_fdw/output/file_fdw.source

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,34 @@
22
-- Test foreign-data wrapper file_fdw.
33
--
44
-- Clean up in case a prior regression run failed
5-
SET client_min_messages TO 'error';
6-
DROP ROLE IF EXISTSfile_fdw_superuser, file_fdw_user, no_priv_user;
5+
SET client_min_messages TO 'warning';
6+
DROP ROLE IF EXISTSregress_file_fdw_superuser, regress_file_fdw_user, regress_no_priv_user;
77
RESET client_min_messages;
8-
CREATE ROLEfile_fdw_superuser LOGIN SUPERUSER; -- is a superuser
9-
CREATE ROLEfile_fdw_user LOGIN; -- has priv and user mapping
10-
CREATE ROLEno_priv_user LOGIN; -- has priv but no user mapping
8+
CREATE ROLEregress_file_fdw_superuser LOGIN SUPERUSER; -- is a superuser
9+
CREATE ROLEregress_file_fdw_user LOGIN; -- has priv and user mapping
10+
CREATE ROLEregress_no_priv_user LOGIN; -- has priv but no user mapping
1111
-- Install file_fdw
1212
CREATE EXTENSION file_fdw;
13-
--file_fdw_superuser owns fdw-related objects
14-
SET ROLEfile_fdw_superuser;
13+
--regress_file_fdw_superuser owns fdw-related objects
14+
SET ROLEregress_file_fdw_superuser;
1515
CREATE SERVER file_server FOREIGN DATA WRAPPER file_fdw;
1616
-- privilege tests
17-
SET ROLEfile_fdw_user;
17+
SET ROLEregress_file_fdw_user;
1818
CREATE FOREIGN DATA WRAPPER file_fdw2 HANDLER file_fdw_handler VALIDATOR file_fdw_validator; -- ERROR
1919
ERROR: permission denied to create foreign-data wrapper "file_fdw2"
2020
HINT: Must be superuser to create a foreign-data wrapper.
2121
CREATE SERVER file_server2 FOREIGN DATA WRAPPER file_fdw; -- ERROR
2222
ERROR: permission denied for foreign-data wrapper file_fdw
23-
CREATE USER MAPPING FORfile_fdw_user SERVER file_server; -- ERROR
23+
CREATE USER MAPPING FORregress_file_fdw_user SERVER file_server; -- ERROR
2424
ERROR: permission denied for foreign server file_server
25-
SET ROLEfile_fdw_superuser;
26-
GRANT USAGE ON FOREIGN SERVER file_server TOfile_fdw_user;
27-
SET ROLEfile_fdw_user;
28-
CREATE USER MAPPING FORfile_fdw_user SERVER file_server;
25+
SET ROLEregress_file_fdw_superuser;
26+
GRANT USAGE ON FOREIGN SERVER file_server TOregress_file_fdw_user;
27+
SET ROLEregress_file_fdw_user;
28+
CREATE USER MAPPING FORregress_file_fdw_user SERVER file_server;
2929
-- create user mappings and grant privilege to test users
30-
SET ROLEfile_fdw_superuser;
31-
CREATE USER MAPPING FORfile_fdw_superuser SERVER file_server;
32-
CREATE USER MAPPING FORno_priv_user SERVER file_server;
30+
SET ROLEregress_file_fdw_superuser;
31+
CREATE USER MAPPING FORregress_file_fdw_superuser SERVER file_server;
32+
CREATE USER MAPPING FORregress_no_priv_user SERVER file_server;
3333
-- validator tests
3434
CREATE FOREIGN TABLE tbl () SERVER file_server OPTIONS (format 'xml'); -- ERROR
3535
ERROR: COPY format "xml" not recognized
@@ -82,7 +82,7 @@ CREATE FOREIGN TABLE agg_text (
8282
bfloat4
8383
) SERVER file_server
8484
OPTIONS (format 'text', filename '@abs_srcdir@/data/agg.data', delimiter '', null '\N');
85-
GRANT SELECT ON agg_text TOfile_fdw_user;
85+
GRANT SELECT ON agg_text TOregress_file_fdw_user;
8686
CREATE FOREIGN TABLE agg_csv (
8787
aint2,
8888
bfloat4
@@ -290,7 +290,7 @@ SELECT tableoid::regclass, * FROM agg FOR UPDATE;
290290
ALTER FOREIGN TABLE agg_csv NO INHERIT agg;
291291
DROP TABLE agg;
292292
-- privilege tests
293-
SET ROLEfile_fdw_superuser;
293+
SET ROLEregress_file_fdw_superuser;
294294
SELECT * FROM agg_text ORDER BY a;
295295
a | b
296296
-----+---------
@@ -300,7 +300,7 @@ SELECT * FROM agg_text ORDER BY a;
300300
100 | 99.097
301301
(4 rows)
302302

303-
SET ROLEfile_fdw_user;
303+
SET ROLEregress_file_fdw_user;
304304
SELECT * FROM agg_text ORDER BY a;
305305
a | b
306306
-----+---------
@@ -310,10 +310,10 @@ SELECT * FROM agg_text ORDER BY a;
310310
100 | 99.097
311311
(4 rows)
312312

313-
SET ROLEno_priv_user;
313+
SET ROLEregress_no_priv_user;
314314
SELECT * FROM agg_text ORDER BY a; -- ERROR
315315
ERROR: permission denied for relation agg_text
316-
SET ROLEfile_fdw_user;
316+
SET ROLEregress_file_fdw_user;
317317
\t on
318318
EXPLAIN (VERBOSE, COSTS FALSE) SELECT * FROM agg_text WHERE a > 0;
319319
Foreign Scan on public.agg_text
@@ -323,7 +323,7 @@ EXPLAIN (VERBOSE, COSTS FALSE) SELECT * FROM agg_text WHERE a > 0;
323323

324324
\t off
325325
-- file FDW allows foreign tables to be accessed without user mapping
326-
DROP USER MAPPING FORfile_fdw_user SERVER file_server;
326+
DROP USER MAPPING FORregress_file_fdw_user SERVER file_server;
327327
SELECT * FROM agg_text ORDER BY a;
328328
a | b
329329
-----+---------
@@ -334,22 +334,22 @@ SELECT * FROM agg_text ORDER BY a;
334334
(4 rows)
335335

336336
-- privilege tests for object
337-
SET ROLEfile_fdw_superuser;
338-
ALTER FOREIGN TABLE agg_text OWNER TOfile_fdw_user;
337+
SET ROLEregress_file_fdw_superuser;
338+
ALTER FOREIGN TABLE agg_text OWNER TOregress_file_fdw_user;
339339
ALTER FOREIGN TABLE agg_text OPTIONS (SET format 'text');
340-
SET ROLEfile_fdw_user;
340+
SET ROLEregress_file_fdw_user;
341341
ALTER FOREIGN TABLE agg_text OPTIONS (SET format 'text');
342342
ERROR: only superuser can change options of a file_fdw foreign table
343-
SET ROLEfile_fdw_superuser;
343+
SET ROLEregress_file_fdw_superuser;
344344
-- cleanup
345345
RESET ROLE;
346346
DROP EXTENSION file_fdw CASCADE;
347347
NOTICE: drop cascades to 7 other objects
348348
DETAIL: drop cascades to server file_server
349-
drop cascades to user mapping forfile_fdw_superuser on server file_server
350-
drop cascades to user mapping forno_priv_user on server file_server
349+
drop cascades to user mapping forregress_file_fdw_superuser on server file_server
350+
drop cascades to user mapping forregress_no_priv_user on server file_server
351351
drop cascades to foreign table agg_text
352352
drop cascades to foreign table agg_csv
353353
drop cascades to foreign table agg_bad
354354
drop cascades to foreign table text_csv
355-
DROP ROLEfile_fdw_superuser, file_fdw_user, no_priv_user;
355+
DROP ROLEregress_file_fdw_superuser, regress_file_fdw_user, regress_no_priv_user;

0 commit comments

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