Skip to content

P
Postgres FD Implementation
Commit 07123dff authored by Peter Eisentraut's avatar Peter Eisentraut
Browse files
Options

pg_dump: Dump foreign options in sorted order

parent 89b3c6cc
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 6 deletions
src/bin/pg_dump/pg_dump.c
View file @ 07123dff
...@@ -5733,7 +5733,8 @@ getTableAttrs(TableInfo *tblinfo, int numTables) ...@@ -5733,7 +5733,8 @@ getTableAttrs(TableInfo *tblinfo, int numTables)
"pg_catalog.array_to_string(ARRAY(" "pg_catalog.array_to_string(ARRAY("
"SELECT pg_catalog.quote_ident(option_name) || " "SELECT pg_catalog.quote_ident(option_name) || "
"' ' || pg_catalog.quote_literal(option_value) " "' ' || pg_catalog.quote_literal(option_value) "
"FROM pg_catalog.pg_options_to_table(attfdwoptions)" "FROM pg_catalog.pg_options_to_table(attfdwoptions) "
"ORDER BY option_name"
"), E',\n ') AS attfdwoptions " "), E',\n ') AS attfdwoptions "
"FROM pg_catalog.pg_attribute a LEFT JOIN pg_catalog.pg_type t " "FROM pg_catalog.pg_attribute a LEFT JOIN pg_catalog.pg_type t "
"ON a.atttypid = t.oid " "ON a.atttypid = t.oid "
...@@ -6564,7 +6565,8 @@ getForeignDataWrappers(int *numForeignDataWrappers) ...@@ -6564,7 +6565,8 @@ getForeignDataWrappers(int *numForeignDataWrappers)
"array_to_string(ARRAY(" "array_to_string(ARRAY("
"SELECT quote_ident(option_name) || ' ' || " "SELECT quote_ident(option_name) || ' ' || "
"quote_literal(option_value) " "quote_literal(option_value) "
"FROM pg_options_to_table(fdwoptions)" "FROM pg_options_to_table(fdwoptions) "
"ORDER BY option_name"
"), E',\n ') AS fdwoptions " "), E',\n ') AS fdwoptions "
"FROM pg_foreign_data_wrapper", "FROM pg_foreign_data_wrapper",
username_subquery); username_subquery);
...@@ -6578,7 +6580,8 @@ getForeignDataWrappers(int *numForeignDataWrappers) ...@@ -6578,7 +6580,8 @@ getForeignDataWrappers(int *numForeignDataWrappers)
"array_to_string(ARRAY(" "array_to_string(ARRAY("
"SELECT quote_ident(option_name) || ' ' || " "SELECT quote_ident(option_name) || ' ' || "
"quote_literal(option_value) " "quote_literal(option_value) "
"FROM pg_options_to_table(fdwoptions)" "FROM pg_options_to_table(fdwoptions) "
"ORDER BY option_name"
"), E',\n ') AS fdwoptions " "), E',\n ') AS fdwoptions "
"FROM pg_foreign_data_wrapper", "FROM pg_foreign_data_wrapper",
username_subquery); username_subquery);
...@@ -6667,7 +6670,8 @@ getForeignServers(int *numForeignServers) ...@@ -6667,7 +6670,8 @@ getForeignServers(int *numForeignServers)
"array_to_string(ARRAY(" "array_to_string(ARRAY("
"SELECT quote_ident(option_name) || ' ' || " "SELECT quote_ident(option_name) || ' ' || "
"quote_literal(option_value) " "quote_literal(option_value) "
"FROM pg_options_to_table(srvoptions)" "FROM pg_options_to_table(srvoptions) "
"ORDER BY option_name"
"), E',\n ') AS srvoptions " "), E',\n ') AS srvoptions "
"FROM pg_foreign_server", "FROM pg_foreign_server",
username_subquery); username_subquery);
...@@ -11777,7 +11781,8 @@ dumpUserMappings(Archive *fout, ...@@ -11777,7 +11781,8 @@ dumpUserMappings(Archive *fout,
"array_to_string(ARRAY(" "array_to_string(ARRAY("
"SELECT quote_ident(option_name) || ' ' || " "SELECT quote_ident(option_name) || ' ' || "
"quote_literal(option_value) " "quote_literal(option_value) "
"FROM pg_options_to_table(umoptions)" "FROM pg_options_to_table(umoptions) "
"ORDER BY option_name"
"), E',\n ') AS umoptions " "), E',\n ') AS umoptions "
"FROM pg_user_mappings " "FROM pg_user_mappings "
"WHERE srvid = '%u' " "WHERE srvid = '%u' "
...@@ -12438,7 +12443,8 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo) ...@@ -12438,7 +12443,8 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
"pg_catalog.array_to_string(ARRAY(" "pg_catalog.array_to_string(ARRAY("
"SELECT pg_catalog.quote_ident(option_name) || " "SELECT pg_catalog.quote_ident(option_name) || "
"' ' || pg_catalog.quote_literal(option_value) " "' ' || pg_catalog.quote_literal(option_value) "
"FROM pg_catalog.pg_options_to_table(ftoptions)" "FROM pg_catalog.pg_options_to_table(ftoptions) "
"ORDER BY option_name"
"), E',\n ') AS ftoptions " "), E',\n ') AS ftoptions "
"FROM pg_catalog.pg_foreign_table ft " "FROM pg_catalog.pg_foreign_table ft "
"JOIN pg_catalog.pg_foreign_server fs " "JOIN pg_catalog.pg_foreign_server fs "
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment