From 82544331cf3839c9b337b2d240890578beb8f2e4 Mon Sep 17 00:00:00 2001
From: David Li
Date: Fri, 29 Sep 2023 14:01:04 -0400
Subject: [PATCH] chore(c/integration/duckdb): update to DuckDB 0.9.0
Fixes #973.
---
c/integration/duckdb/CMakeLists.txt | 2 +-
c/integration/duckdb/duckdb_test.cc | 11 ++++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/c/integration/duckdb/CMakeLists.txt b/c/integration/duckdb/CMakeLists.txt
index 8e4acbed01..589d9842cd 100644
--- a/c/integration/duckdb/CMakeLists.txt
+++ b/c/integration/duckdb/CMakeLists.txt
@@ -20,7 +20,7 @@ include(FetchContent)
if(ADBC_BUILD_TESTS)
fetchcontent_declare(duckdb
GIT_REPOSITORY https://github.com/duckdb/duckdb.git
- GIT_TAG e8e4cea5ec9d1a84c1f516d0f0674f8785a3e786 # v0.8.0
+ GIT_TAG 0d84ccf478578278b2d1168675b8b93c60f78a5e # v0.9.0
GIT_PROGRESS TRUE
USES_TERMINAL_DOWNLOAD TRUE)
set(BUILD_JEMALLOC_EXTENSION
diff --git a/c/integration/duckdb/duckdb_test.cc b/c/integration/duckdb/duckdb_test.cc
index a6bded030c..b6503fa2ce 100644
--- a/c/integration/duckdb/duckdb_test.cc
+++ b/c/integration/duckdb/duckdb_test.cc
@@ -19,16 +19,17 @@
#include
#include
-#include
#include "validation/adbc_validation.h"
#include "validation/adbc_validation_util.h"
-// Convert between our definitions and DuckDB's
+// Convert between our definitions and DuckDB's. Cannot include DuckDB's
+// header because they redefine some ADBC symbols differently, so forward
+// declare it ourselves.
+AdbcStatusCode duckdb_adbc_init(int version, void* driver, struct AdbcError* error);
+
AdbcStatusCode DuckDbDriverInitFunc(int version, void* driver, struct AdbcError* error) {
- return duckdb_adbc_init(static_cast(version),
- reinterpret_cast(driver),
- reinterpret_cast(error));
+ return duckdb_adbc_init(version, driver, error);
}
class DuckDbQuirks : public adbc_validation::DriverQuirks {