Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 8cd3755

Browse files
peterepetere
committed
Tweak the regression test case so that the ordering of numbers vs. letters
doesn't matter. This fixes failures in the Czech locale.
1 parent 05a7db0 commit 8cd3755

File tree

2 files changed

+54
-54
lines changed

2 files changed

+54
-54
lines changed

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

+43-43
Original file line numberDiff line numberDiff line change
@@ -301,12 +301,12 @@ CREATE SERVER s8 FOREIGN DATA WRAPPER postgresql OPTIONS (host 'localhost', dbna
301301
(8 rows)
302302

303303
SET ROLE regress_test_role;
304-
CREATE SERVER st1 FOREIGN DATA WRAPPER foo; -- ERROR: no usage on FDW
304+
CREATE SERVER t1 FOREIGN DATA WRAPPER foo; -- ERROR: no usage on FDW
305305
ERROR: permission denied for foreign-data wrapper foo
306306
RESET ROLE;
307307
GRANT USAGE ON FOREIGN DATA WRAPPER foo TO regress_test_role;
308308
SET ROLE regress_test_role;
309-
CREATE SERVER st1 FOREIGN DATA WRAPPER foo;
309+
CREATE SERVER t1 FOREIGN DATA WRAPPER foo;
310310
RESET ROLE;
311311
\des+
312312
List of foreign servers
@@ -320,18 +320,18 @@ RESET ROLE;
320320
s6 | foreign_data_user | foo | | | 16.0 | {host=a,dbname=b}
321321
s7 | foreign_data_user | foo | | oracle | 17.0 | {host=a,dbname=b}
322322
s8 | foreign_data_user | postgresql | | | | {host=localhost,dbname=s8db}
323-
st1 | regress_test_role | foo | | | |
323+
t1 | regress_test_role | foo | | | |
324324
(9 rows)
325325

326326
REVOKE USAGE ON FOREIGN DATA WRAPPER foo FROM regress_test_role;
327327
GRANT USAGE ON FOREIGN DATA WRAPPER foo TO regress_test_indirect;
328328
SET ROLE regress_test_role;
329-
CREATE SERVER st2 FOREIGN DATA WRAPPER foo; -- ERROR
329+
CREATE SERVER t2 FOREIGN DATA WRAPPER foo; -- ERROR
330330
ERROR: permission denied for foreign-data wrapper foo
331331
RESET ROLE;
332332
GRANT regress_test_indirect TO regress_test_role;
333333
SET ROLE regress_test_role;
334-
CREATE SERVER st2 FOREIGN DATA WRAPPER foo;
334+
CREATE SERVER t2 FOREIGN DATA WRAPPER foo;
335335
\des+
336336
List of foreign servers
337337
Name | Owner | Foreign-data wrapper | Access privileges | Type | Version | Options
@@ -344,8 +344,8 @@ CREATE SERVER st2 FOREIGN DATA WRAPPER foo;
344344
s6 | foreign_data_user | foo | | | 16.0 | {host=a,dbname=b}
345345
s7 | foreign_data_user | foo | | oracle | 17.0 | {host=a,dbname=b}
346346
s8 | foreign_data_user | postgresql | | | | {host=localhost,dbname=s8db}
347-
st1 | regress_test_role | foo | | | |
348-
st2 | regress_test_role | foo | | | |
347+
t1 | regress_test_role | foo | | | |
348+
t2 | regress_test_role | foo | | | |
349349
(10 rows)
350350

351351
RESET ROLE;
@@ -376,8 +376,8 @@ GRANT USAGE ON FOREIGN SERVER s6 TO regress_test_role2 WITH GRANT OPTION;
376376
: regress_test_role2=U*/foreign_data_user
377377
s7 | foreign_data_user | foo | | oracle | 17.0 | {host=a,dbname=b}
378378
s8 | foreign_data_user | postgresql | | | | {host=localhost,dbname=s8db}
379-
st1 | regress_test_role | foo | | | |
380-
st2 | regress_test_role | foo | | | |
379+
t1 | regress_test_role | foo | | | |
380+
t2 | regress_test_role | foo | | | |
381381
(10 rows)
382382

383383
SET ROLE regress_test_role;
@@ -427,8 +427,8 @@ access to foreign-data wrapper foo
427427
: regress_test_role2=U*/foreign_data_user
428428
s7 | foreign_data_user | foo | | oracle | 17.0 | {host=a,dbname=b}
429429
s8 | foreign_data_user | postgresql | | | | {dbname=db1,connect_timeout=30}
430-
st1 | regress_test_role | foo | | | |
431-
st2 | regress_test_role | foo | | | |
430+
t1 | regress_test_role | foo | | | |
431+
t2 | regress_test_role | foo | | | |
432432
(10 rows)
433433

434434
-- DROP SERVER
@@ -448,8 +448,8 @@ NOTICE: server "nonexistent" does not exist, skipping
448448
s6 | foreign_data_user | foo
449449
s7 | foreign_data_user | foo
450450
s8 | foreign_data_user | postgresql
451-
st1 | regress_test_role | foo
452-
st2 | regress_test_role | foo
451+
t1 | regress_test_role | foo
452+
t2 | regress_test_role | foo
453453
(10 rows)
454454

455455
SET ROLE regress_test_role;
@@ -468,8 +468,8 @@ RESET ROLE;
468468
s6 | foreign_data_user | foo
469469
s7 | foreign_data_user | foo
470470
s8 | foreign_data_user | postgresql
471-
st1 | regress_test_role | foo
472-
st2 | regress_test_role | foo
471+
t1 | regress_test_role | foo
472+
t2 | regress_test_role | foo
473473
(9 rows)
474474

475475
ALTER SERVER s2 OWNER TO regress_test_role;
@@ -486,8 +486,8 @@ RESET ROLE;
486486
s6 | foreign_data_user | foo
487487
s7 | foreign_data_user | foo
488488
s8 | foreign_data_user | postgresql
489-
st1 | regress_test_role | foo
490-
st2 | regress_test_role | foo
489+
t1 | regress_test_role | foo
490+
t2 | regress_test_role | foo
491491
(8 rows)
492492

493493
CREATE USER MAPPING FOR current_user SERVER s3;
@@ -513,8 +513,8 @@ NOTICE: drop cascades to user mapping for foreign_data_user
513513
s6 | foreign_data_user | foo
514514
s7 | foreign_data_user | foo
515515
s8 | foreign_data_user | postgresql
516-
st1 | regress_test_role | foo
517-
st2 | regress_test_role | foo
516+
t1 | regress_test_role | foo
517+
t2 | regress_test_role | foo
518518
(7 rows)
519519

520520
\deu
@@ -546,10 +546,10 @@ ERROR: permission denied for foreign server s7
546546
CREATE USER MAPPING FOR public SERVER s8; -- ERROR
547547
ERROR: must be owner of foreign server s8
548548
RESET ROLE;
549-
ALTER SERVER st1 OWNER TO regress_test_indirect;
549+
ALTER SERVER t1 OWNER TO regress_test_indirect;
550550
SET ROLE regress_test_role;
551-
CREATE USER MAPPING FOR current_user SERVER st1 OPTIONS (username 'bob', password 'boo');
552-
CREATE USER MAPPING FOR public SERVER st1;
551+
CREATE USER MAPPING FOR current_user SERVER t1 OPTIONS (username 'bob', password 'boo');
552+
CREATE USER MAPPING FOR public SERVER t1;
553553
RESET ROLE;
554554
\deu
555555
List of user mappings
@@ -560,8 +560,8 @@ RESET ROLE;
560560
s5 | regress_test_role
561561
s6 | regress_test_role
562562
s8 | foreign_data_user
563-
st1 | public
564-
st1 | regress_test_role
563+
t1 | public
564+
t1 | regress_test_role
565565
(7 rows)
566566

567567
-- ALTER USER MAPPING
@@ -579,7 +579,7 @@ SET ROLE regress_test_role;
579579
ALTER USER MAPPING FOR current_user SERVER s5 OPTIONS (ADD modified '1');
580580
ALTER USER MAPPING FOR public SERVER s4 OPTIONS (ADD modified '1'); -- ERROR
581581
ERROR: must be owner of foreign server s4
582-
ALTER USER MAPPING FOR public SERVER st1 OPTIONS (ADD modified '1');
582+
ALTER USER MAPPING FOR public SERVER t1 OPTIONS (ADD modified '1');
583583
RESET ROLE;
584584
\deu+
585585
List of user mappings
@@ -590,8 +590,8 @@ RESET ROLE;
590590
s5 | regress_test_role | {modified=1}
591591
s6 | regress_test_role | {username=test}
592592
s8 | foreign_data_user | {password=public}
593-
st1 | public | {modified=1}
594-
st1 | regress_test_role | {username=bob,password=boo}
593+
t1 | public | {modified=1}
594+
t1 | regress_test_role | {username=bob,password=boo}
595595
(7 rows)
596596

597597
-- DROP USER MAPPING
@@ -623,8 +623,8 @@ DROP SERVER s7;
623623
s6 | regress_test_role
624624
s8 | foreign_data_user
625625
s8 | public
626-
st1 | public
627-
st1 | regress_test_role
626+
t1 | public
627+
t1 | regress_test_role
628628
(8 rows)
629629

630630
-- Information schema
@@ -649,8 +649,8 @@ SELECT * FROM information_schema.foreign_servers ORDER BY 1, 2;
649649
regression | s5 | regression | foo | | 15.0 | regress_test_role
650650
regression | s6 | regression | foo | | 16.0 | regress_test_indirect
651651
regression | s8 | regression | postgresql | | | foreign_data_user
652-
regression | st1 | regression | foo | | | regress_test_indirect
653-
regression | st2 | regression | foo | | | regress_test_role
652+
regression | t1 | regression | foo | | | regress_test_indirect
653+
regression | t2 | regression | foo | | | regress_test_role
654654
(6 rows)
655655

656656
SELECT * FROM information_schema.foreign_server_options ORDER BY 1, 2, 3;
@@ -671,22 +671,22 @@ SELECT * FROM information_schema.user_mappings ORDER BY lower(authorization_iden
671671
foreign_data_user | regression | s8
672672
PUBLIC | regression | s4
673673
PUBLIC | regression | s8
674-
PUBLIC | regression | st1
674+
PUBLIC | regression | t1
675675
regress_test_role | regression | s5
676676
regress_test_role | regression | s6
677-
regress_test_role | regression | st1
677+
regress_test_role | regression | t1
678678
(8 rows)
679679

680680
SELECT * FROM information_schema.user_mapping_options ORDER BY lower(authorization_identifier), 2, 3, 4;
681681
authorization_identifier | foreign_server_catalog | foreign_server_name | option_name | option_value
682682
--------------------------+------------------------+---------------------+-------------+--------------
683683
foreign_data_user | regression | s8 | password | public
684684
PUBLIC | regression | s4 | mapping | is public
685-
PUBLIC | regression | st1 | modified | 1
685+
PUBLIC | regression | t1 | modified | 1
686686
regress_test_role | regression | s5 | modified | 1
687687
regress_test_role | regression | s6 | username | test
688-
regress_test_role | regression | st1 | password | boo
689-
regress_test_role | regression | st1 | username | bob
688+
regress_test_role | regression | t1 | password | boo
689+
regress_test_role | regression | t1 | username | bob
690690
(7 rows)
691691

692692
SELECT * FROM information_schema.usage_privileges WHERE object_type LIKE 'FOREIGN%' ORDER BY 1, 2, 3, 4, 5;
@@ -711,11 +711,11 @@ SET ROLE regress_test_role;
711711
SELECT * FROM information_schema.user_mapping_options ORDER BY 1, 2, 3, 4;
712712
authorization_identifier | foreign_server_catalog | foreign_server_name | option_name | option_value
713713
--------------------------+------------------------+---------------------+-------------+--------------
714-
PUBLIC | regression | st1 | modified | 1
714+
PUBLIC | regression | t1 | modified | 1
715715
regress_test_role | regression | s5 | modified | 1
716716
regress_test_role | regression | s6 | username | test
717-
regress_test_role | regression | st1 | password | boo
718-
regress_test_role | regression | st1 | username | bob
717+
regress_test_role | regression | t1 | password | boo
718+
regress_test_role | regression | t1 | username | bob
719719
(5 rows)
720720

721721
SELECT * FROM information_schema.usage_privileges WHERE object_type LIKE 'FOREIGN%' ORDER BY 1, 2, 3, 4, 5;
@@ -732,7 +732,7 @@ SELECT * FROM information_schema.role_usage_grants WHERE object_type LIKE 'FOREI
732732
foreign_data_user | regress_test_role2 | regression | | s6 | FOREIGN SERVER | USAGE | YES
733733
(2 rows)
734734

735-
DROP USER MAPPING FOR current_user SERVER st1;
735+
DROP USER MAPPING FOR current_user SERVER t1;
736736
SET ROLE regress_test_role2;
737737
SELECT * FROM information_schema.user_mapping_options ORDER BY 1, 2, 3, 4;
738738
authorization_identifier | foreign_server_catalog | foreign_server_name | option_name | option_value
@@ -946,12 +946,12 @@ access to foreign-data wrapper foo
946946
owner of user mapping for regress_test_role
947947
owner of user mapping for regress_test_role
948948
owner of server s5
949-
owner of server st2
949+
owner of server t2
950950
DROP SERVER s5 CASCADE;
951951
NOTICE: drop cascades to user mapping for regress_test_role
952-
DROP SERVER st1 CASCADE;
952+
DROP SERVER t1 CASCADE;
953953
NOTICE: drop cascades to user mapping for public
954-
DROP SERVER st2;
954+
DROP SERVER t2;
955955
DROP USER MAPPING FOR regress_test_role SERVER s6;
956956
DROP FOREIGN DATA WRAPPER foo CASCADE;
957957
NOTICE: drop cascades to 5 other objects

‎src/test/regress/sql/foreign_data.sql

+11-11
Original file line numberDiff line numberDiff line change
@@ -127,22 +127,22 @@ CREATE SERVER s8 FOREIGN DATA WRAPPER postgresql OPTIONS (foo '1'); -- ERROR
127127
CREATE SERVER s8 FOREIGN DATA WRAPPER postgresql OPTIONS (host 'localhost', dbname 's8db');
128128
\des+
129129
SET ROLE regress_test_role;
130-
CREATE SERVER st1 FOREIGN DATA WRAPPER foo; -- ERROR: no usage on FDW
130+
CREATE SERVER t1 FOREIGN DATA WRAPPER foo; -- ERROR: no usage on FDW
131131
RESET ROLE;
132132
GRANT USAGE ON FOREIGN DATA WRAPPER foo TO regress_test_role;
133133
SET ROLE regress_test_role;
134-
CREATE SERVER st1 FOREIGN DATA WRAPPER foo;
134+
CREATE SERVER t1 FOREIGN DATA WRAPPER foo;
135135
RESET ROLE;
136136
\des+
137137

138138
REVOKE USAGE ON FOREIGN DATA WRAPPER foo FROM regress_test_role;
139139
GRANT USAGE ON FOREIGN DATA WRAPPER foo TO regress_test_indirect;
140140
SET ROLE regress_test_role;
141-
CREATE SERVER st2 FOREIGN DATA WRAPPER foo; -- ERROR
141+
CREATE SERVER t2 FOREIGN DATA WRAPPER foo; -- ERROR
142142
RESET ROLE;
143143
GRANT regress_test_indirect TO regress_test_role;
144144
SET ROLE regress_test_role;
145-
CREATE SERVER st2 FOREIGN DATA WRAPPER foo;
145+
CREATE SERVER t2 FOREIGN DATA WRAPPER foo;
146146
\des+
147147
RESET ROLE;
148148
REVOKE regress_test_indirect FROM regress_test_role;
@@ -220,10 +220,10 @@ CREATE USER MAPPING FOR current_user SERVER s7; -- ERROR
220220
CREATE USER MAPPING FOR public SERVER s8; -- ERROR
221221
RESET ROLE;
222222

223-
ALTER SERVER st1 OWNER TO regress_test_indirect;
223+
ALTER SERVER t1 OWNER TO regress_test_indirect;
224224
SET ROLE regress_test_role;
225-
CREATE USER MAPPING FOR current_user SERVER st1 OPTIONS (username 'bob', password 'boo');
226-
CREATE USER MAPPING FOR public SERVER st1;
225+
CREATE USER MAPPING FOR current_user SERVER t1 OPTIONS (username 'bob', password 'boo');
226+
CREATE USER MAPPING FOR public SERVER t1;
227227
RESET ROLE;
228228
\deu
229229

@@ -236,7 +236,7 @@ ALTER USER MAPPING FOR current_user SERVER s8 OPTIONS (DROP user, SET password '
236236
SET ROLE regress_test_role;
237237
ALTER USER MAPPING FOR current_user SERVER s5 OPTIONS (ADD modified '1');
238238
ALTER USER MAPPING FOR public SERVER s4 OPTIONS (ADD modified '1'); -- ERROR
239-
ALTER USER MAPPING FOR public SERVER st1 OPTIONS (ADD modified '1');
239+
ALTER USER MAPPING FOR public SERVER t1 OPTIONS (ADD modified '1');
240240
RESET ROLE;
241241
\deu+
242242

@@ -268,7 +268,7 @@ SET ROLE regress_test_role;
268268
SELECT * FROM information_schema.user_mapping_options ORDER BY 1, 2, 3, 4;
269269
SELECT * FROM information_schema.usage_privileges WHERE object_type LIKE 'FOREIGN%' ORDER BY 1, 2, 3, 4, 5;
270270
SELECT * FROM information_schema.role_usage_grants WHERE object_type LIKE 'FOREIGN%' ORDER BY 1, 2, 3, 4, 5;
271-
DROP USER MAPPING FOR current_user SERVER st1;
271+
DROP USER MAPPING FOR current_user SERVER t1;
272272
SET ROLE regress_test_role2;
273273
SELECT * FROM information_schema.user_mapping_options ORDER BY 1, 2, 3, 4;
274274
RESET ROLE;
@@ -369,8 +369,8 @@ RESET ROLE;
369369
-- Cleanup
370370
DROP ROLE regress_test_role; -- ERROR
371371
DROP SERVER s5 CASCADE;
372-
DROP SERVER st1 CASCADE;
373-
DROP SERVER st2;
372+
DROP SERVER t1 CASCADE;
373+
DROP SERVER t2;
374374
DROP USER MAPPING FOR regress_test_role SERVER s6;
375375
DROP FOREIGN DATA WRAPPER foo CASCADE;
376376
DROP SERVER s8 CASCADE;

0 commit comments

Comments
 (0)