@@ -5884,7 +5884,8 @@ getForeignDataWrappers(int *numForeignDataWrappers)
58845884appendPQExpBuffer (query ,"SELECT tableoid, oid, fdwname, "
58855885"(%s fdwowner) AS rolname, fdwvalidator::pg_catalog.regproc, fdwacl,"
58865886"array_to_string(ARRAY("
5887- "SELECT option_name || ' ' || quote_literal(option_value) "
5887+ "SELECT quote_ident(option_name) || ' ' || "
5888+ " quote_literal(option_value) "
58885889"FROM pg_options_to_table(fdwoptions)), ', ') AS fdwoptions "
58895890"FROM pg_foreign_data_wrapper" ,
58905891username_subquery );
@@ -5969,7 +5970,8 @@ getForeignServers(int *numForeignServers)
59695970"(%s srvowner) AS rolname, "
59705971"srvfdw, srvtype, srvversion, srvacl,"
59715972"array_to_string(ARRAY("
5972- "SELECT option_name || ' ' || quote_literal(option_value) "
5973+ "SELECT quote_ident(option_name) || ' ' || "
5974+ " quote_literal(option_value) "
59735975"FROM pg_options_to_table(srvoptions)), ', ') AS srvoptions "
59745976"FROM pg_foreign_server" ,
59755977username_subquery );
@@ -10275,7 +10277,7 @@ dumpUserMappings(Archive *fout,
1027510277
1027610278appendPQExpBuffer (query ,
1027710279"SELECT usename, "
10278- "array_to_string(ARRAY(SELECT option_name || ' ' || quote_literal(option_value) FROM pg_options_to_table(umoptions)), ', ') AS umoptions\n"
10280+ "array_to_string(ARRAY(SELECTquote_ident( option_name) || ' ' || quote_literal(option_value) FROM pg_options_to_table(umoptions)), ', ') AS umoptions\n"
1027910281"FROM pg_user_mappings "
1028010282"WHERE srvid = %u" ,
1028110283catalogId .oid );