Update Makefile

Makefile

@@ -1,59 +1,60 @@
 DUCKDB_VERSION=0.9.2
+# includes changes from https://github.com/duckdb/duckdb/pull/9770 to include support for BIGDECIMAL
+# remove this when the changes are present in next duckdb release
+DUCKDB_CHERRYPICK_COMMIT=cafbcfb3c66634e6c5d7e9b8eb692791b93139d1
+# includes changes from https://github.com/duckdb/duckdb/pull/9898
+DUCKDB_DEADLOCK_PATCH_CHERRYPICK_COMMIT=4c3100210441099a4d302ab915437f8db2945629
 
 .PHONY: install
 install:
 	go install .
-
 .PHONY: examples
 examples:
 	go run examples/simple.go
-
 .PHONY: test
 test:
 	go test -v -race -count=1 .
-
 SRC_DIR := duckdb/src/amalgamation
 FILES := $(wildcard $(SRC_DIR)/*)
-
 .PHONY: deps.header
 deps.header:
 	git clone -b v${DUCKDB_VERSION} --depth 1 https://github.com/duckdb/duckdb.git
 	cp duckdb/src/include/duckdb.h duckdb.h
-
 .PHONY: deps.darwin.amd64
 deps.darwin.amd64:
 	if [ "$(shell uname -s | tr '[:upper:]' '[:lower:]')" != "darwin" ]; then echo "Error: must run build on darwin"; false; fi
-
 	git clone -b v${DUCKDB_VERSION} --depth 1 https://github.com/duckdb/duckdb.git
 	cd duckdb && \
+	if [ ! -z "${DUCKDB_CHERRYPICK_COMMIT}" ]; then git fetch origin main; git cherry-pick -n -m 1 ${DUCKDB_CHERRYPICK_COMMIT}; fi && \
+	if [ ! -z "${DUCKDB_DEADLOCK_PATCH_CHERRYPICK_COMMIT}" ]; then git cherry-pick -n -m 1 ${DUCKDB_DEADLOCK_PATCH_CHERRYPICK_COMMIT}; fi && \
 	CFLAGS="-target x86_64-apple-macos11 -O3" CXXFLAGS="-target x86_64-apple-macos11 -O3" BUILD_SHELL=0 BUILD_UNITTESTS=0 make -j 2 && \
 	mkdir -p lib && \
 	for f in `find . -name '*.o'`; do cp $$f lib; done && \
 	cd lib && \
 	ar rvs ../libduckdb.a *.o && \
 	cd .. && \
 	mv libduckdb.a ../deps/darwin_amd64/libduckdb.a
-
 .PHONY: deps.darwin.arm64
 deps.darwin.arm64:
 	if [ "$(shell uname -s | tr '[:upper:]' '[:lower:]')" != "darwin" ]; then echo "Error: must run build on darwin"; false; fi
-
 	git clone -b v${DUCKDB_VERSION} --depth 1 https://github.com/duckdb/duckdb.git
 	cd duckdb && \
+	if [ ! -z "${DUCKDB_CHERRYPICK_COMMIT}" ]; then git fetch origin main; git cherry-pick -n -m 1 ${DUCKDB_CHERRYPICK_COMMIT}; fi && \
+	if [ ! -z "${DUCKDB_DEADLOCK_PATCH_CHERRYPICK_COMMIT}" ]; then git cherry-pick -n -m 1 ${DUCKDB_DEADLOCK_PATCH_CHERRYPICK_COMMIT}; fi && \
 	CFLAGS="-target arm64-apple-macos11 -O3" CXXFLAGS="-target arm64-apple-macos11 -O3" BUILD_SHELL=0 BUILD_UNITTESTS=0 make -j 2 && \
 	mkdir -p lib && \
 	for f in `find . -name '*.o'`; do cp $$f lib; done && \
 	cd lib && \
 	ar rvs ../libduckdb.a *.o && \
 	cd .. && \
 	mv libduckdb.a ../deps/darwin_arm64/libduckdb.a
-
 .PHONY: deps.linux.amd64
 deps.linux.amd64:
 	if [ "$(shell uname -s | tr '[:upper:]' '[:lower:]')" != "linux" ]; then echo "Error: must run build on linux"; false; fi
-
 	git clone -b v${DUCKDB_VERSION} --depth 1 https://github.com/duckdb/duckdb.git
 	cd duckdb && \
+	if [ ! -z "${DUCKDB_CHERRYPICK_COMMIT}" ]; then git fetch origin main; git cherry-pick -n -m 1 ${DUCKDB_CHERRYPICK_COMMIT}; fi && \
+	if [ ! -z "${DUCKDB_DEADLOCK_PATCH_CHERRYPICK_COMMIT}" ]; then git cherry-pick -n -m 1 ${DUCKDB_DEADLOCK_PATCH_CHERRYPICK_COMMIT}; fi && \
 	CFLAGS="-O3" CXXFLAGS="-O3" make -j 2 && \
 	BUILD_SHELL=0 BUILD_UNITTESTS=0 make -j 2 && \
 	mkdir -p lib && \
@@ -62,13 +63,13 @@ deps.linux.amd64:
 	ar rvs ../libduckdb.a *.o && \
 	cd .. && \
 	mv libduckdb.a ../deps/linux_amd64/libduckdb.a
-
 .PHONY: deps.linux.arm64
 deps.linux.arm64:
 	if [ "$(shell uname -s | tr '[:upper:]' '[:lower:]')" != "linux" ]; then echo "Error: must run build on linux"; false; fi
-
 	git clone -b v${DUCKDB_VERSION} --depth 1 https://github.com/duckdb/duckdb.git
 	cd duckdb && \
+	if [ ! -z "${DUCKDB_CHERRYPICK_COMMIT}" ]; then git fetch origin main; git cherry-pick -n -m 1 ${DUCKDB_CHERRYPICK_COMMIT}; fi && \
+	if [ ! -z "${DUCKDB_DEADLOCK_PATCH_CHERRYPICK_COMMIT}" ]; then git cherry-pick -n -m 1 ${DUCKDB_DEADLOCK_PATCH_CHERRYPICK_COMMIT}; fi && \
 	CC="aarch64-linux-gnu-gcc" CXX="aarch64-linux-gnu-g++" CFLAGS="-O3" CXXFLAGS="-O3" BUILD_SHELL=0 BUILD_UNITTESTS=0 make -j 2 && \
 	mkdir -p lib && \
 	for f in `find . -name '*.o'`; do cp $$f lib; done && \