Skip to content
Open
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
10 changes: 5 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ jobs:
strategy:
matrix:
PGVERSION: # TODO: build with master branch
- "17.2"
- "16.6"
- "15.10"
- "14.15"
- "13.18"
- "18.0"
- "17.5"
- "16.9"
- "15.13"
- "14.18"

env:
CACHE_VERSION: 20221222 # to identify cache version
Expand Down
25 changes: 18 additions & 7 deletions bin/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ 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/init-18.sql:
cp sql/init-extension-v3.sql sql/init-18.sql

sql/load_bin.sql: sql/load_bin-$(MAJORVERSION).sql
cp sql/load_bin-$(MAJORVERSION).sql sql/load_bin.sql
Expand Down Expand Up @@ -97,6 +99,8 @@ 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_bin-18.sql:
cp sql/load_bin-v2.sql sql/load_bin-18.sql

sql/load_csv.sql: sql/load_csv-$(MAJORVERSION).sql
cp sql/load_csv-$(MAJORVERSION).sql sql/load_csv.sql
Expand Down Expand Up @@ -124,6 +128,8 @@ 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_csv-18.sql:
cp sql/load_csv-v3.sql sql/load_csv-18.sql

sql/load_filter.sql: sql/load_filter-$(MAJORVERSION).sql
cp sql/load_filter-$(MAJORVERSION).sql sql/load_filter.sql
Expand Down Expand Up @@ -151,7 +157,8 @@ 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_filter-18.sql:
cp sql/load_filter-v3.sql sql/load_filter-18.sql

sql/load_function.sql: sql/load_function-$(MAJORVERSION).sql
cp sql/load_function-$(MAJORVERSION).sql sql/load_function.sql
Expand Down Expand Up @@ -179,6 +186,8 @@ 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/load_function-18.sql:
cp sql/load_function-v3.sql sql/load_function-18.sql

sql/write_bin.sql: sql/write_bin-$(MAJORVERSION).sql
cp sql/write_bin-$(MAJORVERSION).sql sql/write_bin.sql
Expand Down Expand Up @@ -206,17 +215,19 @@ 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
sql/write_bin-18.sql:
cp sql/write_bin-v2.sql sql/write_bin-18.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,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
rm -f sql/init.sql sql/init-{9.3,9.4,9.5,9.6,10,11,12,13,14,15,16,17,18}.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,18}.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,18}.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,18}.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,18}.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,18}.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
2 changes: 1 addition & 1 deletion include/pg_bulkload.h
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ typedef Parser *(*ParserCreate)(void);
#endif
#endif

#ifdef HAVE_LONG_INT_64
#if SIZEOF_LONG == 8
#define int64_FMT "%ld"
#else
#define int64_FMT "%lld"
Expand Down
Loading
Loading