To support PostgreSQL v17 (#169)

ossc-db · Jan 27, 2025 · 22509d3 · 22509d3
1 parent 2964f19
commit 22509d3
Show file tree

Hide file tree

Showing 7 changed files with 2,033 additions and 23 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,12 +15,11 @@ jobs:
     strategy:
       matrix:
         PGVERSION:                # TODO: build with master branch
+          - "17"
           - "16"
           - "15"
           - "14"
           - "13"
-          - "12"
-          - "11"
 
     env:
       CACHE_VERSION: 20221222  # to identify cache version

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -15,12 +15,12 @@ jobs:
     strategy:
       matrix:
         PGVERSION:                # TODO: build with master branch
-          - "16.1"
-          - "15.5"
-          - "14.10"
-          - "13.13"
-          - "12.17"
-          - "11.22"
+          - "17.2"
+          - "16.6"
+          - "15.10"
+          - "14.15"
+          - "13.18"
+
     env:
       CACHE_VERSION: 20221222  # to identify cache version
 

diff --git a/bin/Makefile b/bin/Makefile
@@ -68,6 +68,8 @@ sql/init-15.sql:
 	cp sql/init-extension-v3.sql sql/init-15.sql
 sql/init-16.sql:
 	cp sql/init-extension-v3.sql sql/init-16.sql
+sql/init-17.sql:
+	cp sql/init-extension-v3.sql sql/init-17.sql
 
 sql/load_bin.sql: sql/load_bin-$(MAJORVERSION).sql
 	cp sql/load_bin-$(MAJORVERSION).sql sql/load_bin.sql
@@ -93,6 +95,8 @@ sql/load_bin-15.sql:
 	cp sql/load_bin-v2.sql sql/load_bin-15.sql
 sql/load_bin-16.sql:
 	cp sql/load_bin-v2.sql sql/load_bin-16.sql
+sql/load_bin-17.sql:
+	cp sql/load_bin-v2.sql sql/load_bin-17.sql
 
 sql/load_csv.sql: sql/load_csv-$(MAJORVERSION).sql
 	cp sql/load_csv-$(MAJORVERSION).sql sql/load_csv.sql
@@ -118,6 +122,8 @@ sql/load_csv-15.sql:
 	cp sql/load_csv-v3.sql sql/load_csv-15.sql
 sql/load_csv-16.sql:
 	cp sql/load_csv-v3.sql sql/load_csv-16.sql
+sql/load_csv-17.sql:
+	cp sql/load_csv-v3.sql sql/load_csv-17.sql
 
 sql/load_filter.sql: sql/load_filter-$(MAJORVERSION).sql
 	cp sql/load_filter-$(MAJORVERSION).sql sql/load_filter.sql
@@ -143,6 +149,9 @@ sql/load_filter-15.sql:
 	cp sql/load_filter-v3.sql sql/load_filter-15.sql
 sql/load_filter-16.sql:
 	cp sql/load_filter-v3.sql sql/load_filter-16.sql
+sql/load_filter-17.sql:
+	cp sql/load_filter-v3.sql sql/load_filter-17.sql
+
 
 sql/load_function.sql: sql/load_function-$(MAJORVERSION).sql
 	cp sql/load_function-$(MAJORVERSION).sql sql/load_function.sql
@@ -168,6 +177,8 @@ sql/load_function-15.sql:
 	cp sql/load_function-v3.sql sql/load_function-15.sql
 sql/load_function-16.sql:
 	cp sql/load_function-v3.sql sql/load_function-16.sql
+sql/load_function-17.sql:
+	cp sql/load_function-v3.sql sql/load_function-17.sql
 
 sql/write_bin.sql: sql/write_bin-$(MAJORVERSION).sql
 	cp sql/write_bin-$(MAJORVERSION).sql sql/write_bin.sql
@@ -193,17 +204,19 @@ sql/write_bin-15.sql:
 	cp sql/write_bin-v2.sql sql/write_bin-15.sql
 sql/write_bin-16.sql:
 	cp sql/write_bin-v2.sql sql/write_bin-16.sql
+sql/write_bin-17.sql:
+	cp sql/write_bin-v2.sql sql/write_bin-17.sql
 
 .PHONY: subclean
 clean: subclean
 
 subclean:
-	rm -f sql/init.sql sql/init-{9.3,9.4,9.5,9.6,10,11,12,13,14,15,16}.sql
-	rm -f sql/load_bin.sql sql/load_bin-{9.3,9.4,9.5,9.6,10,11,12,13,14,15,16}.sql
-	rm -f sql/load_csv.sql sql/load_csv-{9.3,9.4,9.5,9.6,10,11,12,13,14,15,16}.sql
-	rm -f sql/load_filter.sql sql/load_filter-{9.3,9.4,9.5,9.6,10,11,12,13,14,15,16}.sql
-	rm -f sql/load_function.sql sql/load_function-{9.3,9.4,9.5,9.6,10,11,12,13,14,15,16}.sql
-	rm -f sql/write_bin.sql sql/write_bin-{9.3,9.4,9.5,9.6,10,11,12,13,14,15,16}.sql
+	rm -f sql/init.sql sql/init-{9.3,9.4,9.5,9.6,10,11,12,13,14,15,16,17}.sql
+	rm -f sql/load_bin.sql sql/load_bin-{9.3,9.4,9.5,9.6,10,11,12,13,14,15,16,17}.sql
+	rm -f sql/load_csv.sql sql/load_csv-{9.3,9.4,9.5,9.6,10,11,12,13,14,15,16,17}.sql
+	rm -f sql/load_filter.sql sql/load_filter-{9.3,9.4,9.5,9.6,10,11,12,13,14,15,16,17}.sql
+	rm -f sql/load_function.sql sql/load_function-{9.3,9.4,9.5,9.6,10,11,12,13,14,15,16,17}.sql
+	rm -f sql/write_bin.sql sql/write_bin-{9.3,9.4,9.5,9.6,10,11,12,13,14,15,16,17}.sql
 
 installcheck: sql/init.sql sql/load_bin.sql sql/load_csv.sql sql/load_function.sql sql/load_filter.sql sql/write_bin.sql
 

diff --git a/bin/pgut/pgut-list.h b/bin/pgut/pgut-list.h
@@ -10,6 +10,9 @@
 #ifndef PGUT_LIST_H
 #define PGUT_LIST_H
 
+#if PG_VERSION_NUM >= 170000
+#include "utils/palloc.h"
+#endif
 #include "nodes/pg_list.h"
 
 /*
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,12 +15,11 @@ jobs: @@
         strategy:
           matrix:
             PGVERSION:                # TODO: build with master branch
+              - "17"
               - "16"
               - "15"
               - "14"
               - "13"
-              - "12"
-              - "11"
         env:
           CACHE_VERSION: 20221222  # to identify cache version
@@ Expand Down @@