Skip to content

Commit 314288f

Browse files
committed
Avoid using trivial usernames in foreign_data regression test.
Author: Martin Pihlak
1 parent b2734a0 commit 314288f

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

src/test/regress/expected/foreign_data.out

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -524,8 +524,8 @@ List of user mappings
524524
(0 rows)
525525

526526
-- CREATE USER MAPPING
527-
CREATE USER MAPPING FOR baz SERVER s1; -- ERROR
528-
ERROR: role "baz" does not exist
527+
CREATE USER MAPPING FOR regress_test_missing_role SERVER s1; -- ERROR
528+
ERROR: role "regress_test_missing_role" does not exist
529529
CREATE USER MAPPING FOR current_user SERVER s1; -- ERROR
530530
ERROR: server "s1" does not exist
531531
CREATE USER MAPPING FOR current_user SERVER s4;
@@ -565,8 +565,8 @@ RESET ROLE;
565565
(7 rows)
566566

567567
-- ALTER USER MAPPING
568-
ALTER USER MAPPING FOR bob SERVER s4 OPTIONS (gotcha 'true'); -- ERROR
569-
ERROR: role "bob" does not exist
568+
ALTER USER MAPPING FOR regress_test_missing_role SERVER s4 OPTIONS (gotcha 'true'); -- ERROR
569+
ERROR: role "regress_test_missing_role" does not exist
570570
ALTER USER MAPPING FOR user SERVER ss4 OPTIONS (gotcha 'true'); -- ERROR
571571
ERROR: server "ss4" does not exist
572572
ALTER USER MAPPING FOR public SERVER s5 OPTIONS (gotcha 'true'); -- ERROR
@@ -595,14 +595,14 @@ RESET ROLE;
595595
(7 rows)
596596

597597
-- DROP USER MAPPING
598-
DROP USER MAPPING FOR bob SERVER s4; -- ERROR
599-
ERROR: role "bob" does not exist
598+
DROP USER MAPPING FOR regress_test_missing_role SERVER s4; -- ERROR
599+
ERROR: role "regress_test_missing_role" does not exist
600600
DROP USER MAPPING FOR user SERVER ss4;
601601
ERROR: server "ss4" does not exist
602602
DROP USER MAPPING FOR public SERVER s7; -- ERROR
603603
ERROR: user mapping "public" does not exist for the server
604-
DROP USER MAPPING IF EXISTS FOR bob SERVER s4;
605-
NOTICE: role "bob" does not exist, skipping
604+
DROP USER MAPPING IF EXISTS FOR regress_test_missing_role SERVER s4;
605+
NOTICE: role "regress_test_missing_role" does not exist, skipping
606606
DROP USER MAPPING IF EXISTS FOR user SERVER ss4;
607607
NOTICE: server does not exist, skipping
608608
DROP USER MAPPING IF EXISTS FOR public SERVER s7;

src/test/regress/sql/foreign_data.sql

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ DROP SERVER s3 CASCADE;
204204
\deu
205205

206206
-- CREATE USER MAPPING
207-
CREATE USER MAPPING FOR baz SERVER s1; -- ERROR
207+
CREATE USER MAPPING FOR regress_test_missing_role SERVER s1; -- ERROR
208208
CREATE USER MAPPING FOR current_user SERVER s1; -- ERROR
209209
CREATE USER MAPPING FOR current_user SERVER s4;
210210
CREATE USER MAPPING FOR user SERVER s4; -- ERROR duplicate
@@ -228,7 +228,7 @@ RESET ROLE;
228228
\deu
229229

230230
-- ALTER USER MAPPING
231-
ALTER USER MAPPING FOR bob SERVER s4 OPTIONS (gotcha 'true'); -- ERROR
231+
ALTER USER MAPPING FOR regress_test_missing_role SERVER s4 OPTIONS (gotcha 'true'); -- ERROR
232232
ALTER USER MAPPING FOR user SERVER ss4 OPTIONS (gotcha 'true'); -- ERROR
233233
ALTER USER MAPPING FOR public SERVER s5 OPTIONS (gotcha 'true'); -- ERROR
234234
ALTER USER MAPPING FOR current_user SERVER s8 OPTIONS (username 'test'); -- ERROR
@@ -241,10 +241,10 @@ RESET ROLE;
241241
\deu+
242242

243243
-- DROP USER MAPPING
244-
DROP USER MAPPING FOR bob SERVER s4; -- ERROR
244+
DROP USER MAPPING FOR regress_test_missing_role SERVER s4; -- ERROR
245245
DROP USER MAPPING FOR user SERVER ss4;
246246
DROP USER MAPPING FOR public SERVER s7; -- ERROR
247-
DROP USER MAPPING IF EXISTS FOR bob SERVER s4;
247+
DROP USER MAPPING IF EXISTS FOR regress_test_missing_role SERVER s4;
248248
DROP USER MAPPING IF EXISTS FOR user SERVER ss4;
249249
DROP USER MAPPING IF EXISTS FOR public SERVER s7;
250250
CREATE USER MAPPING FOR public SERVER s8;

0 commit comments

Comments
 (0)