Properly quote SQL/MED generic options in pg_dump output.

Shigeru Hanada

diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index ccbc1d8b9e344b1858b7d099f8a80d415139e26f..b00e19b8b6f1902e44faeb9c496427840fb35d96 100644 (file)
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -5473,7 +5473,8 @@ getForeignDataWrappers(int *numForeignDataWrappers)
        appendPQExpBuffer(query, "SELECT tableoid, oid, fdwname, "
                "(%s fdwowner) AS rolname, fdwvalidator::pg_catalog.regproc, fdwacl,"
                                          "array_to_string(ARRAY("
-                "              SELECT option_name || ' ' || quote_literal(option_value) "
+                "              SELECT quote_ident(option_name) || ' ' || "
+                "             quote_literal(option_value) "
           "            FROM pg_options_to_table(fdwoptions)), ', ') AS fdwoptions "
                                          "FROM pg_foreign_data_wrapper",
                                          username_subquery);
@@ -5558,7 +5559,8 @@ getForeignServers(int *numForeignServers)
                                          "(%s srvowner) AS rolname, "
                                          "srvfdw, srvtype, srvversion, srvacl,"
                                          "array_to_string(ARRAY("
-                "              SELECT option_name || ' ' || quote_literal(option_value) "
+                "              SELECT quote_ident(option_name) || ' ' || "
+                "             quote_literal(option_value) "
           "            FROM pg_options_to_table(srvoptions)), ', ') AS srvoptions "
                                          "FROM pg_foreign_server",
                                          username_subquery);
@@ -9576,7 +9578,7 @@ dumpUserMappings(Archive *fout,
 
        appendPQExpBuffer(query,
                                          "SELECT usename, "
-                                         "array_to_string(ARRAY(SELECT option_name || ' ' || quote_literal(option_value) FROM pg_options_to_table(umoptions)), ', ') AS umoptions\n"
+                                         "array_to_string(ARRAY(SELECT quote_ident(option_name) || ' ' || quote_literal(option_value) FROM pg_options_to_table(umoptions)), ', ') AS umoptions\n"
                                          "FROM pg_user_mappings "
                                          "WHERE srvid = %u",
                                          catalogId.oid);