Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions expected/server_options.out
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ DECLARE
sopts TEXT;
uopts TEXT;
BEGIN
SELECT e.fdwname, srvname, array_to_string(s.srvoptions, ','), array_to_string(u.umoptions, ',')
SELECT e.fdwname, s.srvname, array_to_string(s.srvoptions, ','), array_to_string(u.umoptions, ',')
INTO ext, srv, sopts, uopts
FROM pg_foreign_data_wrapper e LEFT JOIN pg_foreign_server s ON e.oid = s.srvfdw LEFT JOIN pg_user_mapping u ON s.oid = u.umserver
FROM pg_foreign_data_wrapper e LEFT JOIN pg_foreign_server s ON e.oid = s.srvfdw LEFT JOIN pg_user_mappings u ON s.oid = u.srvid
WHERE e.fdwname = 'mysql_fdw'
ORDER BY 1, 2, 3, 4;

Expand Down
4 changes: 2 additions & 2 deletions sql/server_options.sql
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ DECLARE
sopts TEXT;
uopts TEXT;
BEGIN
SELECT e.fdwname, srvname, array_to_string(s.srvoptions, ','), array_to_string(u.umoptions, ',')
SELECT e.fdwname, s.srvname, array_to_string(s.srvoptions, ','), array_to_string(u.umoptions, ',')
INTO ext, srv, sopts, uopts
FROM pg_foreign_data_wrapper e LEFT JOIN pg_foreign_server s ON e.oid = s.srvfdw LEFT JOIN pg_user_mapping u ON s.oid = u.umserver
FROM pg_foreign_data_wrapper e LEFT JOIN pg_foreign_server s ON e.oid = s.srvfdw LEFT JOIN pg_user_mappings u ON s.oid = u.srvid
WHERE e.fdwname = 'mysql_fdw'
ORDER BY 1, 2, 3, 4;

Expand Down