summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Paquier2019-01-18 01:51:39 +0000
committerMichael Paquier2019-01-18 01:51:39 +0000
commit396676b0ec4bd45969b9089ffcabde3b4331c1c3 (patch)
treea9b8220d1879bb1369a6454583dec6960678075d
parent251f57460f123f28089ff23a7e43990618dd05a8 (diff)
Enforce non-parallel plan when calling current_schema() in newly-added test
current_schema() gets called in the recently-added regression test from c5660e0, and can be used in a parallel context, causing its call to fail when creating a temporary schema. Per buildfarm members crake and lapwing. Discussion: https://postgr.es/m/20190118005949.GD1883@paquier.xyz
-rw-r--r--src/test/regress/expected/temp.out5
-rw-r--r--src/test/regress/sql/temp.sql5
2 files changed, 8 insertions, 2 deletions
diff --git a/src/test/regress/expected/temp.out b/src/test/regress/expected/temp.out
index 860f58a3bf4..d6d8f25141e 100644
--- a/src/test/regress/expected/temp.out
+++ b/src/test/regress/expected/temp.out
@@ -360,8 +360,11 @@ prepare transaction 'twophase_tab';
ERROR: cannot PREPARE a transaction that has operated on temporary tables
-- Corner case: current_schema may create a temporary schema if namespace
-- creation is pending, so check after that. First reset the connection
--- to remove the temporary namespace.
+-- to remove the temporary namespace, and make sure that non-parallel plans
+-- are used.
\c -
+SET max_parallel_workers = 0;
+SET max_parallel_workers_per_gather = 0;
SET search_path TO 'pg_temp';
BEGIN;
SELECT current_schema() ~ 'pg_temp' AS is_temp_schema;
diff --git a/src/test/regress/sql/temp.sql b/src/test/regress/sql/temp.sql
index e634ddb9ca4..17366a33a91 100644
--- a/src/test/regress/sql/temp.sql
+++ b/src/test/regress/sql/temp.sql
@@ -274,8 +274,11 @@ prepare transaction 'twophase_tab';
-- Corner case: current_schema may create a temporary schema if namespace
-- creation is pending, so check after that. First reset the connection
--- to remove the temporary namespace.
+-- to remove the temporary namespace, and make sure that non-parallel plans
+-- are used.
\c -
+SET max_parallel_workers = 0;
+SET max_parallel_workers_per_gather = 0;
SET search_path TO 'pg_temp';
BEGIN;
SELECT current_schema() ~ 'pg_temp' AS is_temp_schema;