Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

To support PostgreSQL v17 #169

Merged
merged 1 commit into from
Jan 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,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
12 changes: 6 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,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

Expand Down
25 changes: 19 additions & 6 deletions bin/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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

Expand Down
3 changes: 3 additions & 0 deletions bin/pgut/pgut-list.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"

/*
Expand Down
Loading
Loading