database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-03 09:13:20 +03:00
Code Activity

Properly quote SQL/MED generic options in pg_dump output.

Browse Source 
Shigeru Hanada
This commit is contained in:
Robert Haas
2011-08-25 12:37:32 -04:00
parent e1f0820b0d
commit de632180ed
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/bin/pg_dump/pg_dump.c
View File

@@ -6369,7 +6369,8 @@ getForeignDataWrappers(int *numForeignDataWrappers)
"fdwhandler::pg_catalog.regproc, " "fdwhandler::pg_catalog.regproc, "
"fdwvalidator::pg_catalog.regproc, fdwacl, " "fdwvalidator::pg_catalog.regproc, fdwacl, "
"array_to_string(ARRAY(" "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_options_to_table(fdwoptions)), ', ') AS fdwoptions "
"FROM pg_foreign_data_wrapper", "FROM pg_foreign_data_wrapper",
username_subquery); username_subquery);
@@ -6381,7 +6382,8 @@ getForeignDataWrappers(int *numForeignDataWrappers)
"'-' AS fdwhandler, " "'-' AS fdwhandler, "
"fdwvalidator::pg_catalog.regproc, fdwacl, " "fdwvalidator::pg_catalog.regproc, fdwacl, "
"array_to_string(ARRAY(" "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_options_to_table(fdwoptions)), ', ') AS fdwoptions "
"FROM pg_foreign_data_wrapper", "FROM pg_foreign_data_wrapper",
username_subquery); username_subquery);
@@ -6468,7 +6470,8 @@ getForeignServers(int *numForeignServers)
"(%s srvowner) AS rolname, " "(%s srvowner) AS rolname, "
"srvfdw, srvtype, srvversion, srvacl," "srvfdw, srvtype, srvversion, srvacl,"
"array_to_string(ARRAY(" "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_options_to_table(srvoptions)), ', ') AS srvoptions "
"FROM pg_foreign_server", "FROM pg_foreign_server",
username_subquery); username_subquery);
@@ -11395,7 +11398,7 @@ dumpUserMappings(Archive *fout,
appendPQExpBuffer(query, appendPQExpBuffer(query,
"SELECT usename, " "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 " "FROM pg_user_mappings "
"WHERE srvid = %u", "WHERE srvid = %u",
catalogId.oid); catalogId.oid);
@@ -12043,7 +12046,8 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
/* retrieve name of foreign server and generic options */ /* retrieve name of foreign server and generic options */
appendPQExpBuffer(query, appendPQExpBuffer(query,
"SELECT fs.srvname, array_to_string(ARRAY(" "SELECT fs.srvname, 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(ftoptions)), ', ') AS ftoptions " " FROM pg_options_to_table(ftoptions)), ', ') AS ftoptions "
"FROM pg_foreign_table ft JOIN pg_foreign_server fs " "FROM pg_foreign_table ft JOIN pg_foreign_server fs "
" ON (fs.oid = ft.ftserver) " " ON (fs.oid = ft.ftserver) "