Change expected output for test cases 'alter_generic' and 'rolenames'.

FDWs are currently not supported in XL and we throw an error for its usage.
Change expected output files for these test cases to accomodate that fact

2 files changed, 128 insertions, 97 deletions

diff --git a/src/test/regress/expected/alter_generic.out b/src/test/regress/expected/alter_generic.out
index 7845b8af59..228bf6d2e8 100644
--- a/src/test/regress/expected/alter_generic.out
+++ b/src/test/regress/expected/alter_generic.out
@@ -148,28 +148,34 @@ SELECT n.nspname, c.conname, a.rolname
 -- Foreign Data Wrapper and Foreign Server
 --
 CREATE FOREIGN DATA WRAPPER alt_fdw1;
+ERROR:  Postgres-XL does not support FOREIGN DATA WRAPPER yet
+DETAIL:  The feature is not currently supported
 CREATE FOREIGN DATA WRAPPER alt_fdw2;
+ERROR:  Postgres-XL does not support FOREIGN DATA WRAPPER yet
+DETAIL:  The feature is not currently supported
 CREATE SERVER alt_fserv1 FOREIGN DATA WRAPPER alt_fdw1;
+ERROR:  Postgres-XL does not support SERVER yet
+DETAIL:  The feature is not currently supported
 CREATE SERVER alt_fserv2 FOREIGN DATA WRAPPER alt_fdw2;
+ERROR:  Postgres-XL does not support SERVER yet
+DETAIL:  The feature is not currently supported
 ALTER FOREIGN DATA WRAPPER alt_fdw1 RENAME TO alt_fdw2;  -- failed (name conflict)
-ERROR:  foreign-data wrapper "alt_fdw2" already exists
+ERROR:  foreign-data wrapper "alt_fdw1" does not exist
 ALTER FOREIGN DATA WRAPPER alt_fdw1 RENAME TO alt_fdw3;  -- OK
+ERROR:  foreign-data wrapper "alt_fdw1" does not exist
 ALTER SERVER alt_fserv1 RENAME TO alt_fserv2;   -- failed (name conflict)
-ERROR:  server "alt_fserv2" already exists
+ERROR:  server "alt_fserv1" does not exist
 ALTER SERVER alt_fserv1 RENAME TO alt_fserv3;   -- OK
+ERROR:  server "alt_fserv1" does not exist
 SELECT fdwname FROM pg_foreign_data_wrapper WHERE fdwname like 'alt_fdw%';
- fdwname  
-----------
- alt_fdw2
- alt_fdw3
-(2 rows)
+ fdwname 
+---------
+(0 rows)
 
 SELECT srvname FROM pg_foreign_server WHERE srvname like 'alt_fserv%';
-  srvname   
-------------
- alt_fserv2
- alt_fserv3
-(2 rows)
+ srvname 
+---------
+(0 rows)
 
 --
 -- Procedural Language
@@ -630,9 +636,9 @@ SELECT nspname, prsname
 --- Cleanup resources
 ---
 DROP FOREIGN DATA WRAPPER alt_fdw2 CASCADE;
-NOTICE:  drop cascades to server alt_fserv2
+ERROR:  foreign-data wrapper "alt_fdw2" does not exist
 DROP FOREIGN DATA WRAPPER alt_fdw3 CASCADE;
-NOTICE:  drop cascades to server alt_fserv3
+ERROR:  foreign-data wrapper "alt_fdw3" does not exist
 DROP LANGUAGE alt_lang2 CASCADE;
 DROP LANGUAGE alt_lang3 CASCADE;
 DROP LANGUAGE alt_lang4 CASCADE;
diff --git a/src/test/regress/expected/rolenames.out b/src/test/regress/expected/rolenames.out
index 8f88c025e8..fb4dfffea4 100644
--- a/src/test/regress/expected/rolenames.out
+++ b/src/test/regress/expected/rolenames.out
@@ -603,23 +603,59 @@ SELECT p.proname, r.rolname
 
 -- CREATE USER MAPPING
 CREATE FOREIGN DATA WRAPPER test_wrapper;
+ERROR:  Postgres-XL does not support FOREIGN DATA WRAPPER yet
+DETAIL:  The feature is not currently supported
 CREATE SERVER sv1 FOREIGN DATA WRAPPER test_wrapper;
+ERROR:  Postgres-XL does not support SERVER yet
+DETAIL:  The feature is not currently supported
 CREATE SERVER sv2 FOREIGN DATA WRAPPER test_wrapper;
+ERROR:  Postgres-XL does not support SERVER yet
+DETAIL:  The feature is not currently supported
 CREATE SERVER sv3 FOREIGN DATA WRAPPER test_wrapper;
+ERROR:  Postgres-XL does not support SERVER yet
+DETAIL:  The feature is not currently supported
 CREATE SERVER sv4 FOREIGN DATA WRAPPER test_wrapper;
+ERROR:  Postgres-XL does not support SERVER yet
+DETAIL:  The feature is not currently supported
 CREATE SERVER sv5 FOREIGN DATA WRAPPER test_wrapper;
+ERROR:  Postgres-XL does not support SERVER yet
+DETAIL:  The feature is not currently supported
 CREATE SERVER sv6 FOREIGN DATA WRAPPER test_wrapper;
+ERROR:  Postgres-XL does not support SERVER yet
+DETAIL:  The feature is not currently supported
 CREATE SERVER sv7 FOREIGN DATA WRAPPER test_wrapper;
+ERROR:  Postgres-XL does not support SERVER yet
+DETAIL:  The feature is not currently supported
 CREATE SERVER sv8 FOREIGN DATA WRAPPER test_wrapper;
+ERROR:  Postgres-XL does not support SERVER yet
+DETAIL:  The feature is not currently supported
 CREATE SERVER sv9 FOREIGN DATA WRAPPER test_wrapper;
+ERROR:  Postgres-XL does not support SERVER yet
+DETAIL:  The feature is not currently supported
 CREATE USER MAPPING FOR CURRENT_USER SERVER sv1 OPTIONS (user 'CURRENT_USER');
+ERROR:  Postgres-XL does not support USER MAPPING yet
+DETAIL:  The feature is not currently supported
 CREATE USER MAPPING FOR "current_user" SERVER sv2 OPTIONS (user '"current_user"');
+ERROR:  Postgres-XL does not support USER MAPPING yet
+DETAIL:  The feature is not currently supported
 CREATE USER MAPPING FOR USER SERVER sv3 OPTIONS (user 'USER');
+ERROR:  Postgres-XL does not support USER MAPPING yet
+DETAIL:  The feature is not currently supported
 CREATE USER MAPPING FOR "user" SERVER sv4 OPTIONS (user '"USER"');
+ERROR:  Postgres-XL does not support USER MAPPING yet
+DETAIL:  The feature is not currently supported
 CREATE USER MAPPING FOR SESSION_USER SERVER sv5 OPTIONS (user 'SESSION_USER');
+ERROR:  Postgres-XL does not support USER MAPPING yet
+DETAIL:  The feature is not currently supported
 CREATE USER MAPPING FOR PUBLIC SERVER sv6 OPTIONS (user 'PUBLIC');
+ERROR:  Postgres-XL does not support USER MAPPING yet
+DETAIL:  The feature is not currently supported
 CREATE USER MAPPING FOR "Public" SERVER sv7 OPTIONS (user '"Public"');
+ERROR:  Postgres-XL does not support USER MAPPING yet
+DETAIL:  The feature is not currently supported
 CREATE USER MAPPING FOR testrolx SERVER sv8 OPTIONS (user 'testrolx');
+ERROR:  Postgres-XL does not support USER MAPPING yet
+DETAIL:  The feature is not currently supported
 CREATE USER MAPPING FOR CURRENT_ROLE SERVER sv9
 	    OPTIONS (user 'CURRENT_ROLE'); -- error
 ERROR:  syntax error at or near "CURRENT_ROLE"
@@ -627,37 +663,38 @@ LINE 1: CREATE USER MAPPING FOR CURRENT_ROLE SERVER sv9
                                 ^
 CREATE USER MAPPING FOR nonexistent SERVER sv9
 	    OPTIONS (user 'nonexistent'); -- error;
-ERROR:  role "nonexistent" does not exist
+ERROR:  Postgres-XL does not support USER MAPPING yet
+DETAIL:  The feature is not currently supported
 SELECT * FROM chkumapping();
-    umname    | umserver |         umoptions         
---------------+----------+---------------------------
- testrol2     | sv1      | {user=CURRENT_USER}
- current_user | sv2      | {"user=\"current_user\""}
- testrol2     | sv3      | {user=USER}
- user         | sv4      | {"user=\"USER\""}
- testrol1     | sv5      | {user=SESSION_USER}
-              | sv6      | {user=PUBLIC}
- Public       | sv7      | {"user=\"Public\""}
- testrolx     | sv8      | {user=testrolx}
-(8 rows)
+ umname | umserver | umoptions 
+--------+----------+-----------
+(0 rows)
 
 -- ALTER USER MAPPING
 ALTER USER MAPPING FOR CURRENT_USER SERVER sv1
  OPTIONS (SET user 'CURRENT_USER_alt');
+ERROR:  server "sv1" does not exist
 ALTER USER MAPPING FOR "current_user" SERVER sv2
  OPTIONS (SET user '"current_user"_alt');
+ERROR:  server "sv2" does not exist
 ALTER USER MAPPING FOR USER SERVER sv3
  OPTIONS (SET user 'USER_alt');
+ERROR:  server "sv3" does not exist
 ALTER USER MAPPING FOR "user" SERVER sv4
  OPTIONS (SET user '"user"_alt');
+ERROR:  server "sv4" does not exist
 ALTER USER MAPPING FOR SESSION_USER SERVER sv5
  OPTIONS (SET user 'SESSION_USER_alt');
+ERROR:  server "sv5" does not exist
 ALTER USER MAPPING FOR PUBLIC SERVER sv6
  OPTIONS (SET user 'public_alt');
+ERROR:  server "sv6" does not exist
 ALTER USER MAPPING FOR "Public" SERVER sv7
  OPTIONS (SET user '"Public"_alt');
+ERROR:  server "sv7" does not exist
 ALTER USER MAPPING FOR testrolx SERVER sv8
  OPTIONS (SET user 'testrolx_alt');
+ERROR:  server "sv8" does not exist
 ALTER USER MAPPING FOR CURRENT_ROLE SERVER sv9
  OPTIONS (SET user 'CURRENT_ROLE_alt');
 ERROR:  syntax error at or near "CURRENT_ROLE"
@@ -667,27 +704,27 @@ ALTER USER MAPPING FOR nonexistent SERVER sv9
  OPTIONS (SET user 'nonexistent_alt'); -- error
 ERROR:  role "nonexistent" does not exist
 SELECT * FROM chkumapping();
-    umname    | umserver |           umoptions           
---------------+----------+-------------------------------
- testrol2     | sv1      | {user=CURRENT_USER_alt}
- current_user | sv2      | {"user=\"current_user\"_alt"}
- testrol2     | sv3      | {user=USER_alt}
- user         | sv4      | {"user=\"user\"_alt"}
- testrol1     | sv5      | {user=SESSION_USER_alt}
-              | sv6      | {user=public_alt}
- Public       | sv7      | {"user=\"Public\"_alt"}
- testrolx     | sv8      | {user=testrolx_alt}
-(8 rows)
+ umname | umserver | umoptions 
+--------+----------+-----------
+(0 rows)
 
 -- DROP USER MAPPING
 DROP USER MAPPING FOR CURRENT_USER SERVER sv1;
+ERROR:  server "sv1" does not exist
 DROP USER MAPPING FOR "current_user" SERVER sv2;
+ERROR:  server "sv2" does not exist
 DROP USER MAPPING FOR USER SERVER sv3;
+ERROR:  server "sv3" does not exist
 DROP USER MAPPING FOR "user" SERVER sv4;
+ERROR:  server "sv4" does not exist
 DROP USER MAPPING FOR SESSION_USER SERVER sv5;
+ERROR:  server "sv5" does not exist
 DROP USER MAPPING FOR PUBLIC SERVER sv6;
+ERROR:  server "sv6" does not exist
 DROP USER MAPPING FOR "Public" SERVER sv7;
+ERROR:  server "sv7" does not exist
 DROP USER MAPPING FOR testrolx SERVER sv8;
+ERROR:  server "sv8" does not exist
 DROP USER MAPPING FOR CURRENT_ROLE SERVER sv9; -- error
 ERROR:  syntax error at or near "CURRENT_ROLE"
 LINE 1: DROP USER MAPPING FOR CURRENT_ROLE SERVER sv9;
@@ -700,98 +737,86 @@ SELECT * FROM chkumapping();
 (0 rows)
 
 CREATE USER MAPPING FOR CURRENT_USER SERVER sv1 OPTIONS (user 'CURRENT_USER');
+ERROR:  Postgres-XL does not support USER MAPPING yet
+DETAIL:  The feature is not currently supported
 CREATE USER MAPPING FOR "current_user" SERVER sv2 OPTIONS (user '"current_user"');
+ERROR:  Postgres-XL does not support USER MAPPING yet
+DETAIL:  The feature is not currently supported
 CREATE USER MAPPING FOR USER SERVER sv3 OPTIONS (user 'USER');
+ERROR:  Postgres-XL does not support USER MAPPING yet
+DETAIL:  The feature is not currently supported
 CREATE USER MAPPING FOR "user" SERVER sv4 OPTIONS (user '"USER"');
+ERROR:  Postgres-XL does not support USER MAPPING yet
+DETAIL:  The feature is not currently supported
 CREATE USER MAPPING FOR SESSION_USER SERVER sv5 OPTIONS (user 'SESSION_USER');
+ERROR:  Postgres-XL does not support USER MAPPING yet
+DETAIL:  The feature is not currently supported
 CREATE USER MAPPING FOR PUBLIC SERVER sv6 OPTIONS (user 'PUBLIC');
+ERROR:  Postgres-XL does not support USER MAPPING yet
+DETAIL:  The feature is not currently supported
 CREATE USER MAPPING FOR "Public" SERVER sv7 OPTIONS (user '"Public"');
+ERROR:  Postgres-XL does not support USER MAPPING yet
+DETAIL:  The feature is not currently supported
 CREATE USER MAPPING FOR testrolx SERVER sv8 OPTIONS (user 'testrolx');
+ERROR:  Postgres-XL does not support USER MAPPING yet
+DETAIL:  The feature is not currently supported
 SELECT * FROM chkumapping();
-    umname    | umserver |         umoptions         
---------------+----------+---------------------------
- testrol2     | sv1      | {user=CURRENT_USER}
- current_user | sv2      | {"user=\"current_user\""}
- testrol2     | sv3      | {user=USER}
- user         | sv4      | {"user=\"USER\""}
- testrol1     | sv5      | {user=SESSION_USER}
-              | sv6      | {user=PUBLIC}
- Public       | sv7      | {"user=\"Public\""}
- testrolx     | sv8      | {user=testrolx}
-(8 rows)
+ umname | umserver | umoptions 
+--------+----------+-----------
+(0 rows)
 
 -- DROP USER MAPPING IF EXISTS
 DROP USER MAPPING IF EXISTS FOR CURRENT_USER SERVER sv1;
+NOTICE:  server does not exist, skipping
 SELECT * FROM chkumapping();
-    umname    | umserver |         umoptions         
---------------+----------+---------------------------
- current_user | sv2      | {"user=\"current_user\""}
- testrol2     | sv3      | {user=USER}
- user         | sv4      | {"user=\"USER\""}
- testrol1     | sv5      | {user=SESSION_USER}
-              | sv6      | {user=PUBLIC}
- Public       | sv7      | {"user=\"Public\""}
- testrolx     | sv8      | {user=testrolx}
-(7 rows)
+ umname | umserver | umoptions 
+--------+----------+-----------
+(0 rows)
 
 DROP USER MAPPING IF EXISTS FOR "current_user" SERVER sv2;
+NOTICE:  server does not exist, skipping
 SELECT * FROM chkumapping();
-  umname  | umserver |      umoptions      
-----------+----------+---------------------
- testrol2 | sv3      | {user=USER}
- user     | sv4      | {"user=\"USER\""}
- testrol1 | sv5      | {user=SESSION_USER}
-          | sv6      | {user=PUBLIC}
- Public   | sv7      | {"user=\"Public\""}
- testrolx | sv8      | {user=testrolx}
-(6 rows)
+ umname | umserver | umoptions 
+--------+----------+-----------
+(0 rows)
 
 DROP USER MAPPING IF EXISTS FOR USER SERVER sv3;
+NOTICE:  server does not exist, skipping
 SELECT * FROM chkumapping();
-  umname  | umserver |      umoptions      
-----------+----------+---------------------
- user     | sv4      | {"user=\"USER\""}
- testrol1 | sv5      | {user=SESSION_USER}
-          | sv6      | {user=PUBLIC}
- Public   | sv7      | {"user=\"Public\""}
- testrolx | sv8      | {user=testrolx}
-(5 rows)
+ umname | umserver | umoptions 
+--------+----------+-----------
+(0 rows)
 
 DROP USER MAPPING IF EXISTS FOR "user" SERVER sv4;
+NOTICE:  server does not exist, skipping
 SELECT * FROM chkumapping();
-  umname  | umserver |      umoptions      
-----------+----------+---------------------
- testrol1 | sv5      | {user=SESSION_USER}
-          | sv6      | {user=PUBLIC}
- Public   | sv7      | {"user=\"Public\""}
- testrolx | sv8      | {user=testrolx}
-(4 rows)
+ umname | umserver | umoptions 
+--------+----------+-----------
+(0 rows)
 
 DROP USER MAPPING IF EXISTS FOR SESSION_USER SERVER sv5;
+NOTICE:  server does not exist, skipping
 SELECT * FROM chkumapping();
-  umname  | umserver |      umoptions      
-----------+----------+---------------------
-          | sv6      | {user=PUBLIC}
- Public   | sv7      | {"user=\"Public\""}
- testrolx | sv8      | {user=testrolx}
-(3 rows)
+ umname | umserver | umoptions 
+--------+----------+-----------
+(0 rows)
 
 DROP USER MAPPING IF EXISTS FOR PUBLIC SERVER sv6;
+NOTICE:  server does not exist, skipping
 SELECT * FROM chkumapping();
-  umname  | umserver |      umoptions      
-----------+----------+---------------------
- Public   | sv7      | {"user=\"Public\""}
- testrolx | sv8      | {user=testrolx}
-(2 rows)
+ umname | umserver | umoptions 
+--------+----------+-----------
+(0 rows)
 
 DROP USER MAPPING IF EXISTS FOR "Public" SERVER sv7;
+NOTICE:  server does not exist, skipping
 SELECT * FROM chkumapping();
-  umname  | umserver |    umoptions    
-----------+----------+-----------------
- testrolx | sv8      | {user=testrolx}
-(1 row)
+ umname | umserver | umoptions 
+--------+----------+-----------
+(0 rows)
 
 DROP USER MAPPING IF EXISTS FOR testrolx SERVER sv8;
+NOTICE:  server does not exist, skipping
 SELECT * FROM chkumapping();
  umname | umserver | umoptions 
 --------+----------+-----------