diff options
| -rw-r--r-- | contrib/postgres_fdw/expected/postgres_fdw.out | 5 | ||||
| -rw-r--r-- | contrib/postgres_fdw/sql/postgres_fdw.sql | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/contrib/postgres_fdw/expected/postgres_fdw.out b/contrib/postgres_fdw/expected/postgres_fdw.out index b7af86d3511..078b8a966f8 100644 --- a/contrib/postgres_fdw/expected/postgres_fdw.out +++ b/contrib/postgres_fdw/expected/postgres_fdw.out @@ -2750,10 +2750,11 @@ EXPLAIN (VERBOSE, COSTS OFF) SELECT count(*) FROM ft1 CROSS JOIN ft2 CROSS JOIN (4 rows) -- Make sure query cancellation works -SET statement_timeout = '10ms'; +BEGIN; +SET LOCAL statement_timeout = '10ms'; select count(*) from ft1 CROSS JOIN ft2 CROSS JOIN ft4 CROSS JOIN ft5; -- this takes very long ERROR: canceling statement due to statement timeout -RESET statement_timeout; +COMMIT; -- ==================================================================== -- Check that userid to use when querying the remote table is correctly -- propagated into foreign rels present in subqueries under an UNION ALL diff --git a/contrib/postgres_fdw/sql/postgres_fdw.sql b/contrib/postgres_fdw/sql/postgres_fdw.sql index 6e1c819159c..09ba234e43d 100644 --- a/contrib/postgres_fdw/sql/postgres_fdw.sql +++ b/contrib/postgres_fdw/sql/postgres_fdw.sql @@ -740,9 +740,10 @@ ALTER VIEW v4 OWNER TO regress_view_owner; -- Make sure this big CROSS JOIN query is pushed down EXPLAIN (VERBOSE, COSTS OFF) SELECT count(*) FROM ft1 CROSS JOIN ft2 CROSS JOIN ft4 CROSS JOIN ft5; -- Make sure query cancellation works -SET statement_timeout = '10ms'; +BEGIN; +SET LOCAL statement_timeout = '10ms'; select count(*) from ft1 CROSS JOIN ft2 CROSS JOIN ft4 CROSS JOIN ft5; -- this takes very long -RESET statement_timeout; +COMMIT; -- ==================================================================== -- Check that userid to use when querying the remote table is correctly |