add modification for pg16 compatibility

adjust · Mar 12, 2024 · bd6817e · bd6817e
1 parent 443e5af
commit bd6817e
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 5 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -11,7 +11,8 @@ jobs:
   test:
     strategy:
       matrix:
-        pg: [15, 14, 13, 12, 11, 10]
+        pg: [16]
+        #pg: [15, 14, 13, 12, 11, 10]
     name: 🐘 PostgreSQL ${{ matrix.pg }}
     runs-on: ubuntu-latest
     container: pgxn/pgxn-tools

diff --git a/test/expected/parallel_test.out b/test/expected/parallel_test.out
@@ -1,7 +1,14 @@
 BEGIN;
 create extension country;
 SET max_parallel_workers_per_gather=4;
-SET force_parallel_mode=on;
+DO $$
+BEGIN
+    IF current_setting('server_version_num')::int >= 160000 THEN
+        EXECUTE 'SET debug_parallel_query = on';
+    ELSE
+        EXECUTE 'SET force_parallel_mode = on';
+    END IF;
+END $$;
 CREATE TABLE parallel_test(i int, c country) WITH (parallel_workers = 4);
 INSERT INTO parallel_test (i, c)
 SELECT i, c.country

diff --git a/test/expected/parallel_test_0.out b/test/expected/parallel_test_0.out
@@ -1,7 +1,14 @@
 BEGIN;
 create extension country;
 SET max_parallel_workers_per_gather=4;
-SET force_parallel_mode=on;
+DO $$
+BEGIN
+    IF current_setting('server_version_num')::int >= 160000 THEN
+        EXECUTE 'SET debug_parallel_query = on';
+    ELSE
+        EXECUTE 'SET force_parallel_mode = on';
+    END IF;
+END $$;
 CREATE TABLE parallel_test(i int, c country) WITH (parallel_workers = 4);
 INSERT INTO parallel_test (i, c)
 SELECT i, c.country

diff --git a/test/expected/parallel_test_1.out b/test/expected/parallel_test_1.out
@@ -1,7 +1,14 @@
 BEGIN;
 create extension country;
 SET max_parallel_workers_per_gather=4;
-SET force_parallel_mode=on;
+DO $$
+BEGIN
+    IF current_setting('server_version_num')::int >= 160000 THEN
+        EXECUTE 'SET debug_parallel_query = on';
+    ELSE
+        EXECUTE 'SET force_parallel_mode = on';
+    END IF;
+END $$;
 CREATE TABLE parallel_test(i int, c country) WITH (parallel_workers = 4);
 INSERT INTO parallel_test (i, c)
 SELECT i, c.country

diff --git a/test/sql/parallel_test.sql b/test/sql/parallel_test.sql
@@ -1,7 +1,14 @@
 BEGIN;
 create extension country;
 SET max_parallel_workers_per_gather=4;
-SET force_parallel_mode=on;
+DO $$
+BEGIN
+    IF current_setting('server_version_num')::int >= 160000 THEN
+        EXECUTE 'SET debug_parallel_query = on';
+    ELSE
+        EXECUTE 'SET force_parallel_mode = on';
+    END IF;
+END $$;
 
 CREATE TABLE parallel_test(i int, c country) WITH (parallel_workers = 4);
 INSERT INTO parallel_test (i, c)