diff options
| -rw-r--r-- | contrib/postgres_fdw/expected/postgres_fdw.out | 10 | ||||
| -rw-r--r-- | contrib/postgres_fdw/sql/postgres_fdw.sql | 10 | ||||
| -rw-r--r-- | src/bin/psql/describe.c | 3 |
3 files changed, 12 insertions, 11 deletions
diff --git a/contrib/postgres_fdw/expected/postgres_fdw.out b/contrib/postgres_fdw/expected/postgres_fdw.out index b471c674af6..2390e61c2c4 100644 --- a/contrib/postgres_fdw/expected/postgres_fdw.out +++ b/contrib/postgres_fdw/expected/postgres_fdw.out @@ -3734,7 +3734,7 @@ CREATE TABLE import_source."x 5" (c1 float8); ALTER TABLE import_source."x 5" DROP COLUMN c1; CREATE SCHEMA import_dest1; IMPORT FOREIGN SCHEMA import_source FROM SERVER loopback INTO import_dest1; -\det+ import_dest1 +\det+ import_dest1.* List of foreign tables Schema | Table | Server | FDW Options | Description --------------+-------+----------+-------------------------------------------------+------------- @@ -3790,7 +3790,7 @@ FDW Options: (schema_name 'import_source', table_name 'x 5') CREATE SCHEMA import_dest2; IMPORT FOREIGN SCHEMA import_source FROM SERVER loopback INTO import_dest2 OPTIONS (import_default 'true'); -\det+ import_dest2 +\det+ import_dest2.* List of foreign tables Schema | Table | Server | FDW Options | Description --------------+-------+----------+-------------------------------------------------+------------- @@ -3845,7 +3845,7 @@ FDW Options: (schema_name 'import_source', table_name 'x 5') CREATE SCHEMA import_dest3; IMPORT FOREIGN SCHEMA import_source FROM SERVER loopback INTO import_dest3 OPTIONS (import_collate 'false', import_not_null 'false'); -\det+ import_dest3 +\det+ import_dest3.* List of foreign tables Schema | Table | Server | FDW Options | Description --------------+-------+----------+-------------------------------------------------+------------- @@ -3901,7 +3901,7 @@ FDW Options: (schema_name 'import_source', table_name 'x 5') CREATE SCHEMA import_dest4; IMPORT FOREIGN SCHEMA import_source LIMIT TO (t1, nonesuch) FROM SERVER loopback INTO import_dest4; -\det+ import_dest4 +\det+ import_dest4.* List of foreign tables Schema | Table | Server | FDW Options | Description --------------+-------+----------+------------------------------------------------+------------- @@ -3910,7 +3910,7 @@ IMPORT FOREIGN SCHEMA import_source LIMIT TO (t1, nonesuch) IMPORT FOREIGN SCHEMA import_source EXCEPT (t1, "x 4", nonesuch) FROM SERVER loopback INTO import_dest4; -\det+ import_dest4 +\det+ import_dest4.* List of foreign tables Schema | Table | Server | FDW Options | Description --------------+-------+----------+-------------------------------------------------+------------- diff --git a/contrib/postgres_fdw/sql/postgres_fdw.sql b/contrib/postgres_fdw/sql/postgres_fdw.sql index 73fa9f6de09..5c6ead1967d 100644 --- a/contrib/postgres_fdw/sql/postgres_fdw.sql +++ b/contrib/postgres_fdw/sql/postgres_fdw.sql @@ -879,29 +879,29 @@ ALTER TABLE import_source."x 5" DROP COLUMN c1; CREATE SCHEMA import_dest1; IMPORT FOREIGN SCHEMA import_source FROM SERVER loopback INTO import_dest1; -\det+ import_dest1 +\det+ import_dest1.* \d import_dest1.* -- Options CREATE SCHEMA import_dest2; IMPORT FOREIGN SCHEMA import_source FROM SERVER loopback INTO import_dest2 OPTIONS (import_default 'true'); -\det+ import_dest2 +\det+ import_dest2.* \d import_dest2.* CREATE SCHEMA import_dest3; IMPORT FOREIGN SCHEMA import_source FROM SERVER loopback INTO import_dest3 OPTIONS (import_collate 'false', import_not_null 'false'); -\det+ import_dest3 +\det+ import_dest3.* \d import_dest3.* -- Check LIMIT TO and EXCEPT CREATE SCHEMA import_dest4; IMPORT FOREIGN SCHEMA import_source LIMIT TO (t1, nonesuch) FROM SERVER loopback INTO import_dest4; -\det+ import_dest4 +\det+ import_dest4.* IMPORT FOREIGN SCHEMA import_source EXCEPT (t1, "x 4", nonesuch) FROM SERVER loopback INTO import_dest4; -\det+ import_dest4 +\det+ import_dest4.* -- Assorted error cases IMPORT FOREIGN SCHEMA import_source FROM SERVER loopback INTO import_dest4; diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c index 85e3aa5dddd..fd8dc9122d4 100644 --- a/src/bin/psql/describe.c +++ b/src/bin/psql/describe.c @@ -4412,7 +4412,8 @@ listForeignTables(const char *pattern, bool verbose) "d.objoid = c.oid AND d.objsubid = 0\n"); processSQLNamePattern(pset.db, &buf, pattern, false, false, - NULL, "n.nspname", "c.relname", NULL); + "n.nspname", "c.relname", NULL, + "pg_catalog.pg_table_is_visible(c.oid)"); appendPQExpBufferStr(&buf, "ORDER BY 1, 2;"); |