From: Alvaro Herrera <alvherre@alvh.no-ip.org>
Date: Wed, 14 Oct 2009 23:36:43 +0000 (+0000)
Subject: Avoid using trivial usernames in foreign_data regression test.
X-Git-Tag: REL8_5_ALPHA2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=314288fc04047f7dab8b571a41bbc57e8c2d4394;p=thirdparty%2Fpostgresql.git

Avoid using trivial usernames in foreign_data regression test.

Author: Martin Pihlak
---

diff --git a/src/test/regress/expected/foreign_data.out b/src/test/regress/expected/foreign_data.out
index 1d072cd3a83..f8dd6e8773d 100644
--- a/src/test/regress/expected/foreign_data.out
+++ b/src/test/regress/expected/foreign_data.out
@@ -524,8 +524,8 @@ List of user mappings
 (0 rows)
 
 -- CREATE USER MAPPING
-CREATE USER MAPPING FOR baz SERVER s1;                      -- ERROR
-ERROR:  role "baz" does not exist
+CREATE USER MAPPING FOR regress_test_missing_role SERVER s1;  -- ERROR
+ERROR:  role "regress_test_missing_role" does not exist
 CREATE USER MAPPING FOR current_user SERVER s1;             -- ERROR
 ERROR:  server "s1" does not exist
 CREATE USER MAPPING FOR current_user SERVER s4;
@@ -565,8 +565,8 @@ RESET ROLE;
 (7 rows)
 
 -- ALTER USER MAPPING
-ALTER USER MAPPING FOR bob SERVER s4 OPTIONS (gotcha 'true');   -- ERROR
-ERROR:  role "bob" does not exist
+ALTER USER MAPPING FOR regress_test_missing_role SERVER s4 OPTIONS (gotcha 'true'); -- ERROR
+ERROR:  role "regress_test_missing_role" does not exist
 ALTER USER MAPPING FOR user SERVER ss4 OPTIONS (gotcha 'true'); -- ERROR
 ERROR:  server "ss4" does not exist
 ALTER USER MAPPING FOR public SERVER s5 OPTIONS (gotcha 'true');            -- ERROR
@@ -595,14 +595,14 @@ RESET ROLE;
 (7 rows)
 
 -- DROP USER MAPPING
-DROP USER MAPPING FOR bob SERVER s4;                        -- ERROR
-ERROR:  role "bob" does not exist
+DROP USER MAPPING FOR regress_test_missing_role SERVER s4;  -- ERROR
+ERROR:  role "regress_test_missing_role" does not exist
 DROP USER MAPPING FOR user SERVER ss4;
 ERROR:  server "ss4" does not exist
 DROP USER MAPPING FOR public SERVER s7;                     -- ERROR
 ERROR:  user mapping "public" does not exist for the server
-DROP USER MAPPING IF EXISTS FOR bob SERVER s4;
-NOTICE:  role "bob" does not exist, skipping
+DROP USER MAPPING IF EXISTS FOR regress_test_missing_role SERVER s4;
+NOTICE:  role "regress_test_missing_role" does not exist, skipping
 DROP USER MAPPING IF EXISTS FOR user SERVER ss4;
 NOTICE:  server does not exist, skipping
 DROP USER MAPPING IF EXISTS FOR public SERVER s7;
diff --git a/src/test/regress/sql/foreign_data.sql b/src/test/regress/sql/foreign_data.sql
index d027081701a..d89b26d1fc6 100644
--- a/src/test/regress/sql/foreign_data.sql
+++ b/src/test/regress/sql/foreign_data.sql
@@ -204,7 +204,7 @@ DROP SERVER s3 CASCADE;
 \deu
 
 -- CREATE USER MAPPING
-CREATE USER MAPPING FOR baz SERVER s1;                      -- ERROR
+CREATE USER MAPPING FOR regress_test_missing_role SERVER s1;  -- ERROR
 CREATE USER MAPPING FOR current_user SERVER s1;             -- ERROR
 CREATE USER MAPPING FOR current_user SERVER s4;
 CREATE USER MAPPING FOR user SERVER s4;                     -- ERROR duplicate
@@ -228,7 +228,7 @@ RESET ROLE;
 \deu
 
 -- ALTER USER MAPPING
-ALTER USER MAPPING FOR bob SERVER s4 OPTIONS (gotcha 'true');   -- ERROR
+ALTER USER MAPPING FOR regress_test_missing_role SERVER s4 OPTIONS (gotcha 'true'); -- ERROR
 ALTER USER MAPPING FOR user SERVER ss4 OPTIONS (gotcha 'true'); -- ERROR
 ALTER USER MAPPING FOR public SERVER s5 OPTIONS (gotcha 'true');            -- ERROR
 ALTER USER MAPPING FOR current_user SERVER s8 OPTIONS (username 'test');    -- ERROR
@@ -241,10 +241,10 @@ RESET ROLE;
 \deu+
 
 -- DROP USER MAPPING
-DROP USER MAPPING FOR bob SERVER s4;                        -- ERROR
+DROP USER MAPPING FOR regress_test_missing_role SERVER s4;  -- ERROR
 DROP USER MAPPING FOR user SERVER ss4;
 DROP USER MAPPING FOR public SERVER s7;                     -- ERROR
-DROP USER MAPPING IF EXISTS FOR bob SERVER s4;
+DROP USER MAPPING IF EXISTS FOR regress_test_missing_role SERVER s4;
 DROP USER MAPPING IF EXISTS FOR user SERVER ss4;
 DROP USER MAPPING IF EXISTS FOR public SERVER s7;
 CREATE USER MAPPING FOR public SERVER s8;