duckdb 0.9.3-dev0.0 → 0.9.3-dev14.0

package/src/duckdb/src/common/adbc/driver_manager.cpp

@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////
+// THIS FILE IS GENERATED BY apache/arrow, DO NOT EDIT MANUALLY //
+////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////
+
 // Licensed to the Apache Software Foundation (ASF) under one
 // or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information
@@ -20,6 +26,8 @@
 #include "duckdb/common/adbc/adbc.hpp"
 
 #include <algorithm>
+#include <array>
+#include <cctype>
 #include <cstring>
 #include <string>
 #include <unordered_map>
@@ -34,8 +42,6 @@
 #include <dlfcn.h>
 #endif // defined(_WIN32)
 
-namespace duckdb_adbc {
-
 // Platform-specific helpers
 
 #if defined(_WIN32)
@@ -57,31 +63,20 @@ void GetWinError(std::string *buffer) {
 
 #endif // defined(_WIN32)
 
-// Temporary state while the database is being configured.
-struct TempDatabase {
-	std::unordered_map<std::string, std::string> options;
-	std::string driver;
-	// Default name (see adbc.h)
-	std::string entrypoint = "AdbcDriverInit";
-	AdbcDriverInitFunc init_func = nullptr;
-};
-
 // Error handling
 
 void ReleaseError(struct AdbcError *error) {
 	if (error) {
-		if (error->message) {
+		if (error->message)
 			delete[] error->message;
-		}
 		error->message = nullptr;
 		error->release = nullptr;
 	}
 }
 
 void SetError(struct AdbcError *error, const std::string &message) {
-	if (!error) {
+	if (!error)
 		return;
-	}
 	if (error->message) {
 		// Append
 		std::string buffer = error->message;
@@ -101,61 +96,556 @@ void SetError(struct AdbcError *error, const std::string &message) {
 	error->release = ReleaseError;
 }
 
-void SetError(struct AdbcError *error, const char *message_p) {
-	if (!message_p) {
-		message_p = "";
+// Driver state
+
+/// A driver DLL.
+struct ManagedLibrary {
+	ManagedLibrary() : handle(nullptr) {
+	}
+	ManagedLibrary(ManagedLibrary &&other) : handle(other.handle) {
+		other.handle = nullptr;
+	}
+	ManagedLibrary(const ManagedLibrary &) = delete;
+	ManagedLibrary &operator=(const ManagedLibrary &) = delete;
+	ManagedLibrary &operator=(ManagedLibrary &&other) noexcept {
+		this->handle = other.handle;
+		other.handle = nullptr;
+		return *this;
 	}
-	std::string message(message_p);
-	SetError(error, message);
-}
 
-// Driver state
+	~ManagedLibrary() {
+		Release();
+	}
 
-/// Hold the driver DLL and the driver release callback in the driver struct.
-struct ManagerDriverState {
-	// The original release callback
-	AdbcStatusCode (*driver_release)(struct AdbcDriver *driver, struct AdbcError *error);
+	void Release() {
+		// TODO(apache/arrow-adbc#204): causes tests to segfault
+		// Need to refcount the driver DLL; also, errors may retain a reference to
+		// release() from the DLL - how to handle this?
+	}
+
+	AdbcStatusCode Load(const char *library, struct AdbcError *error) {
+		std::string error_message;
+#if defined(_WIN32)
+		HMODULE handle = LoadLibraryExA(library, NULL, 0);
+		if (!handle) {
+			error_message += library;
+			error_message += ": LoadLibraryExA() failed: ";
+			GetWinError(&error_message);
+
+			std::string full_driver_name = library;
+			full_driver_name += ".dll";
+			handle = LoadLibraryExA(full_driver_name.c_str(), NULL, 0);
+			if (!handle) {
+				error_message += '\n';
+				error_message += full_driver_name;
+				error_message += ": LoadLibraryExA() failed: ";
+				GetWinError(&error_message);
+			}
+		}
+		if (!handle) {
+			SetError(error, error_message);
+			return ADBC_STATUS_INTERNAL;
+		} else {
+			this->handle = handle;
+		}
+#else
+		const std::string kPlatformLibraryPrefix = "lib";
+#if defined(__APPLE__)
+		const std::string kPlatformLibrarySuffix = ".dylib";
+#else
+		static const std::string kPlatformLibrarySuffix = ".so";
+#endif // defined(__APPLE__)
+
+		void *handle = dlopen(library, RTLD_NOW | RTLD_LOCAL);
+		if (!handle) {
+			error_message = "dlopen() failed: ";
+			error_message += dlerror();
+
+			// If applicable, append the shared library prefix/extension and
+			// try again (this way you don't have to hardcode driver names by
+			// platform in the application)
+			const std::string driver_str = library;
+
+			std::string full_driver_name;
+			if (driver_str.size() < kPlatformLibraryPrefix.size() ||
+			    driver_str.compare(0, kPlatformLibraryPrefix.size(), kPlatformLibraryPrefix) != 0) {
+				full_driver_name += kPlatformLibraryPrefix;
+			}
+			full_driver_name += library;
+			if (driver_str.size() < kPlatformLibrarySuffix.size() ||
+			    driver_str.compare(full_driver_name.size() - kPlatformLibrarySuffix.size(),
+			                       kPlatformLibrarySuffix.size(), kPlatformLibrarySuffix) != 0) {
+				full_driver_name += kPlatformLibrarySuffix;
+			}
+			handle = dlopen(full_driver_name.c_str(), RTLD_NOW | RTLD_LOCAL);
+			if (!handle) {
+				error_message += "\ndlopen() failed: ";
+				error_message += dlerror();
+			}
+		}
+		if (handle) {
+			this->handle = handle;
+		} else {
+			return ADBC_STATUS_INTERNAL;
+		}
+#endif // defined(_WIN32)
+		return ADBC_STATUS_OK;
+	}
+
+	AdbcStatusCode Lookup(const char *name, void **func, struct AdbcError *error) {
+#if defined(_WIN32)
+		void *load_handle = reinterpret_cast<void *>(GetProcAddress(handle, name));
+		if (!load_handle) {
+			std::string message = "GetProcAddress(";
+			message += name;
+			message += ") failed: ";
+			GetWinError(&message);
+			SetError(error, message);
+			return ADBC_STATUS_INTERNAL;
+		}
+#else
+		void *load_handle = dlsym(handle, name);
+		if (!load_handle) {
+			std::string message = "dlsym(";
+			message += name;
+			message += ") failed: ";
+			message += dlerror();
+			SetError(error, message);
+			return ADBC_STATUS_INTERNAL;
+		}
+#endif // defined(_WIN32)
+		*func = load_handle;
+		return ADBC_STATUS_OK;
+	}
 
 #if defined(_WIN32)
 	// The loaded DLL
 	HMODULE handle;
+#else
+	void *handle;
 #endif // defined(_WIN32)
 };
 
+/// Hold the driver DLL and the driver release callback in the driver struct.
+struct ManagerDriverState {
+	// The original release callback
+	AdbcStatusCode (*driver_release)(struct AdbcDriver *driver, struct AdbcError *error);
+
+	ManagedLibrary handle;
+};
+
 /// Unload the driver DLL.
 static AdbcStatusCode ReleaseDriver(struct AdbcDriver *driver, struct AdbcError *error) {
 	AdbcStatusCode status = ADBC_STATUS_OK;
 
-	if (!driver->private_manager) {
+	if (!driver->private_manager)
 		return status;
-	}
 	ManagerDriverState *state = reinterpret_cast<ManagerDriverState *>(driver->private_manager);
 
 	if (state->driver_release) {
 		status = state->driver_release(driver, error);
 	}
-
-#if defined(_WIN32)
-	// TODO(apache/arrow-adbc#204): causes tests to segfault
-	// if (!FreeLibrary(state->handle)) {
-	//   std::string message = "FreeLibrary() failed: ";
-	//   GetWinError(&message);
-	//   SetError(error, message);
-	// }
-#endif // defined(_WIN32)
+	state->handle.Release();
 
 	driver->private_manager = nullptr;
 	delete state;
 	return status;
 }
 
+// ArrowArrayStream wrapper to support AdbcErrorFromArrayStream
+
+struct ErrorArrayStream {
+	struct ArrowArrayStream stream;
+	struct AdbcDriver *private_driver;
+};
+
+void ErrorArrayStreamRelease(struct ArrowArrayStream *stream) {
+	if (stream->release != ErrorArrayStreamRelease || !stream->private_data)
+		return;
+
+	auto *private_data = reinterpret_cast<struct ErrorArrayStream *>(stream->private_data);
+	private_data->stream.release(&private_data->stream);
+	delete private_data;
+	std::memset(stream, 0, sizeof(*stream));
+}
+
+const char *ErrorArrayStreamGetLastError(struct ArrowArrayStream *stream) {
+	if (stream->release != ErrorArrayStreamRelease || !stream->private_data)
+		return nullptr;
+	auto *private_data = reinterpret_cast<struct ErrorArrayStream *>(stream->private_data);
+	return private_data->stream.get_last_error(&private_data->stream);
+}
+
+int ErrorArrayStreamGetNext(struct ArrowArrayStream *stream, struct ArrowArray *array) {
+	if (stream->release != ErrorArrayStreamRelease || !stream->private_data)
+		return EINVAL;
+	auto *private_data = reinterpret_cast<struct ErrorArrayStream *>(stream->private_data);
+	return private_data->stream.get_next(&private_data->stream, array);
+}
+
+int ErrorArrayStreamGetSchema(struct ArrowArrayStream *stream, struct ArrowSchema *schema) {
+	if (stream->release != ErrorArrayStreamRelease || !stream->private_data)
+		return EINVAL;
+	auto *private_data = reinterpret_cast<struct ErrorArrayStream *>(stream->private_data);
+	return private_data->stream.get_schema(&private_data->stream, schema);
+}
+
+// Default stubs
+
+int ErrorGetDetailCount(const struct AdbcError *error) {
+	return 0;
+}
+
+struct AdbcErrorDetail ErrorGetDetail(const struct AdbcError *error, int index) {
+	return {nullptr, nullptr, 0};
+}
+
+const struct AdbcError *ErrorFromArrayStream(struct ArrowArrayStream *stream, AdbcStatusCode *status) {
+	return nullptr;
+}
+
+void ErrorArrayStreamInit(struct ArrowArrayStream *out, struct AdbcDriver *private_driver) {
+	if (!out || !out->release ||
+	    // Don't bother wrapping if driver didn't claim support
+	    private_driver->ErrorFromArrayStream == ErrorFromArrayStream) {
+		return;
+	}
+	struct ErrorArrayStream *private_data = new ErrorArrayStream;
+	private_data->stream = *out;
+	private_data->private_driver = private_driver;
+	out->get_last_error = ErrorArrayStreamGetLastError;
+	out->get_next = ErrorArrayStreamGetNext;
+	out->get_schema = ErrorArrayStreamGetSchema;
+	out->release = ErrorArrayStreamRelease;
+	out->private_data = private_data;
+}
+
+AdbcStatusCode DatabaseGetOption(struct AdbcDatabase *database, const char *key, char *value, size_t *length,
+                                 struct AdbcError *error) {
+	return ADBC_STATUS_NOT_FOUND;
+}
+
+AdbcStatusCode DatabaseGetOptionBytes(struct AdbcDatabase *database, const char *key, uint8_t *value, size_t *length,
+                                      struct AdbcError *error) {
+	return ADBC_STATUS_NOT_FOUND;
+}
+
+AdbcStatusCode DatabaseGetOptionInt(struct AdbcDatabase *database, const char *key, int64_t *value,
+                                    struct AdbcError *error) {
+	return ADBC_STATUS_NOT_FOUND;
+}
+
+AdbcStatusCode DatabaseGetOptionDouble(struct AdbcDatabase *database, const char *key, double *value,
+                                       struct AdbcError *error) {
+	return ADBC_STATUS_NOT_FOUND;
+}
+
+AdbcStatusCode DatabaseSetOptionBytes(struct AdbcDatabase *database, const char *key, const uint8_t *value,
+                                      size_t length, struct AdbcError *error) {
+	return ADBC_STATUS_NOT_IMPLEMENTED;
+}
+
+AdbcStatusCode DatabaseSetOptionInt(struct AdbcDatabase *database, const char *key, int64_t value,
+                                    struct AdbcError *error) {
+	return ADBC_STATUS_NOT_IMPLEMENTED;
+}
+
+AdbcStatusCode DatabaseSetOptionDouble(struct AdbcDatabase *database, const char *key, double value,
+                                       struct AdbcError *error) {
+	return ADBC_STATUS_NOT_IMPLEMENTED;
+}
+
+AdbcStatusCode ConnectionCancel(struct AdbcConnection *connection, struct AdbcError *error) {
+	return ADBC_STATUS_NOT_IMPLEMENTED;
+}
+
+AdbcStatusCode ConnectionGetOption(struct AdbcConnection *connection, const char *key, char *value, size_t *length,
+                                   struct AdbcError *error) {
+	return ADBC_STATUS_NOT_FOUND;
+}
+
+AdbcStatusCode ConnectionGetOptionBytes(struct AdbcConnection *connection, const char *key, uint8_t *value,
+                                        size_t *length, struct AdbcError *error) {
+	return ADBC_STATUS_NOT_FOUND;
+}
+
+AdbcStatusCode ConnectionGetOptionInt(struct AdbcConnection *connection, const char *key, int64_t *value,
+                                      struct AdbcError *error) {
+	return ADBC_STATUS_NOT_FOUND;
+}
+
+AdbcStatusCode ConnectionGetOptionDouble(struct AdbcConnection *connection, const char *key, double *value,
+                                         struct AdbcError *error) {
+	return ADBC_STATUS_NOT_FOUND;
+}
+
+AdbcStatusCode ConnectionGetStatistics(struct AdbcConnection *, const char *, const char *, const char *, char,
+                                       struct ArrowArrayStream *, struct AdbcError *) {
+	return ADBC_STATUS_NOT_IMPLEMENTED;
+}
+
+AdbcStatusCode ConnectionGetStatisticNames(struct AdbcConnection *, struct ArrowArrayStream *, struct AdbcError *) {
+	return ADBC_STATUS_NOT_IMPLEMENTED;
+}
+
+AdbcStatusCode ConnectionSetOptionBytes(struct AdbcConnection *, const char *, const uint8_t *, size_t,
+                                        struct AdbcError *error) {
+	return ADBC_STATUS_NOT_IMPLEMENTED;
+}
+
+AdbcStatusCode ConnectionSetOptionInt(struct AdbcConnection *connection, const char *key, int64_t value,
+                                      struct AdbcError *error) {
+	return ADBC_STATUS_NOT_IMPLEMENTED;
+}
+
+AdbcStatusCode ConnectionSetOptionDouble(struct AdbcConnection *connection, const char *key, double value,
+                                         struct AdbcError *error) {
+	return ADBC_STATUS_NOT_IMPLEMENTED;
+}
+
+AdbcStatusCode StatementCancel(struct AdbcStatement *statement, struct AdbcError *error) {
+	return ADBC_STATUS_NOT_IMPLEMENTED;
+}
+
+AdbcStatusCode StatementExecuteSchema(struct AdbcStatement *statement, struct ArrowSchema *schema,
+                                      struct AdbcError *error) {
+	return ADBC_STATUS_NOT_IMPLEMENTED;
+}
+
+AdbcStatusCode StatementGetOption(struct AdbcStatement *statement, const char *key, char *value, size_t *length,
+                                  struct AdbcError *error) {
+	return ADBC_STATUS_NOT_FOUND;
+}
+
+AdbcStatusCode StatementGetOptionBytes(struct AdbcStatement *statement, const char *key, uint8_t *value, size_t *length,
+                                       struct AdbcError *error) {
+	return ADBC_STATUS_NOT_FOUND;
+}
+
+AdbcStatusCode StatementGetOptionInt(struct AdbcStatement *statement, const char *key, int64_t *value,
+                                     struct AdbcError *error) {
+	return ADBC_STATUS_NOT_FOUND;
+}
+
+AdbcStatusCode StatementGetOptionDouble(struct AdbcStatement *statement, const char *key, double *value,
+                                        struct AdbcError *error) {
+	return ADBC_STATUS_NOT_FOUND;
+}
+
+AdbcStatusCode StatementSetOptionBytes(struct AdbcStatement *, const char *, const uint8_t *, size_t,
+                                       struct AdbcError *error) {
+	return ADBC_STATUS_NOT_IMPLEMENTED;
+}
+
+AdbcStatusCode StatementSetOptionInt(struct AdbcStatement *statement, const char *key, int64_t value,
+                                     struct AdbcError *error) {
+	return ADBC_STATUS_NOT_IMPLEMENTED;
+}
+
+AdbcStatusCode StatementSetOptionDouble(struct AdbcStatement *statement, const char *key, double value,
+                                        struct AdbcError *error) {
+	return ADBC_STATUS_NOT_IMPLEMENTED;
+}
+
+/// Temporary state while the database is being configured.
+struct TempDatabase {
+	std::unordered_map<std::string, std::string> options;
+	std::unordered_map<std::string, std::string> bytes_options;
+	std::unordered_map<std::string, int64_t> int_options;
+	std::unordered_map<std::string, double> double_options;
+	std::string driver;
+	std::string entrypoint;
+	AdbcDriverInitFunc init_func = nullptr;
+};
+
 /// Temporary state while the database is being configured.
 struct TempConnection {
 	std::unordered_map<std::string, std::string> options;
+	std::unordered_map<std::string, std::string> bytes_options;
+	std::unordered_map<std::string, int64_t> int_options;
+	std::unordered_map<std::string, double> double_options;
 };
 
+static const char kDefaultEntrypoint[] = "AdbcDriverInit";
+
+// Other helpers (intentionally not in an anonymous namespace so they can be tested)
+
+ADBC_EXPORT
+std::string AdbcDriverManagerDefaultEntrypoint(const std::string &driver) {
+	/// - libadbc_driver_sqlite.so.2.0.0 -> AdbcDriverSqliteInit
+	/// - adbc_driver_sqlite.dll -> AdbcDriverSqliteInit
+	/// - proprietary_driver.dll -> AdbcProprietaryDriverInit
+
+	// Potential path -> filename
+	// Treat both \ and / as directory separators on all platforms for simplicity
+	std::string filename;
+	{
+		size_t pos = driver.find_last_of("/\\");
+		if (pos != std::string::npos) {
+			filename = driver.substr(pos + 1);
+		} else {
+			filename = driver;
+		}
+	}
+
+	// Remove all extensions
+	{
+		size_t pos = filename.find('.');
+		if (pos != std::string::npos) {
+			filename = filename.substr(0, pos);
+		}
+	}
+
+	// Remove lib prefix
+	// https://stackoverflow.com/q/1878001/262727
+	if (filename.rfind("lib", 0) == 0) {
+		filename = filename.substr(3);
+	}
+
+	// Split on underscores, hyphens
+	// Capitalize and join
+	std::string entrypoint;
+	entrypoint.reserve(filename.size());
+	size_t pos = 0;
+	while (pos < filename.size()) {
+		size_t prev = pos;
+		pos = filename.find_first_of("-_", pos);
+		// if pos == npos this is the entire filename
+		std::string token = filename.substr(prev, pos - prev);
+		// capitalize first letter
+		token[0] = std::toupper(static_cast<unsigned char>(token[0]));
+
+		entrypoint += token;
+
+		if (pos != std::string::npos) {
+			pos++;
+		}
+	}
+
+	if (entrypoint.rfind("Adbc", 0) != 0) {
+		entrypoint = "Adbc" + entrypoint;
+	}
+	entrypoint += "Init";
+
+	return entrypoint;
+}
+
 // Direct implementations of API methods
 
+int AdbcErrorGetDetailCount(const struct AdbcError *error) {
+	if (error->vendor_code == ADBC_ERROR_VENDOR_CODE_PRIVATE_DATA && error->private_data && error->private_driver) {
+		return error->private_driver->ErrorGetDetailCount(error);
+	}
+	return 0;
+}
+
+struct AdbcErrorDetail AdbcErrorGetDetail(const struct AdbcError *error, int index) {
+	if (error->vendor_code == ADBC_ERROR_VENDOR_CODE_PRIVATE_DATA && error->private_data && error->private_driver) {
+		return error->private_driver->ErrorGetDetail(error, index);
+	}
+	return {nullptr, nullptr, 0};
+}
+
+const struct AdbcError *AdbcErrorFromArrayStream(struct ArrowArrayStream *stream, AdbcStatusCode *status) {
+	if (!stream->private_data || stream->release != ErrorArrayStreamRelease) {
+		return nullptr;
+	}
+	auto *private_data = reinterpret_cast<struct ErrorArrayStream *>(stream->private_data);
+	auto *error = private_data->private_driver->ErrorFromArrayStream(&private_data->stream, status);
+	if (error) {
+		const_cast<struct AdbcError *>(error)->private_driver = private_data->private_driver;
+	}
+	return error;
+}
+
+#define INIT_ERROR(ERROR, SOURCE)                                                                                      \
+	if ((ERROR) != nullptr && (ERROR)->vendor_code == ADBC_ERROR_VENDOR_CODE_PRIVATE_DATA) {                           \
+		(ERROR)->private_driver = (SOURCE)->private_driver;                                                            \
+	}
+
+#define WRAP_STREAM(EXPR, OUT, SOURCE)                                                                                 \
+	if (!(OUT)) {                                                                                                      \
+		/* Happens for ExecuteQuery where out is optional */                                                           \
+		return EXPR;                                                                                                   \
+	}                                                                                                                  \
+	AdbcStatusCode status_code = EXPR;                                                                                 \
+	ErrorArrayStreamInit(OUT, (SOURCE)->private_driver);                                                               \
+	return status_code;
+
+AdbcStatusCode DatabaseSetOption(struct AdbcDatabase *database, const char *key, const char *value,
+                                 struct AdbcError *error) {
+	return ADBC_STATUS_NOT_IMPLEMENTED;
+}
+
+AdbcStatusCode ConnectionCommit(struct AdbcConnection *, struct AdbcError *error) {
+	return ADBC_STATUS_NOT_IMPLEMENTED;
+}
+
+AdbcStatusCode ConnectionGetInfo(struct AdbcConnection *connection, const uint32_t *info_codes,
+                                 size_t info_codes_length, struct ArrowArrayStream *out, struct AdbcError *error) {
+	return ADBC_STATUS_NOT_IMPLEMENTED;
+}
+
+AdbcStatusCode ConnectionGetObjects(struct AdbcConnection *, int, const char *, const char *, const char *,
+                                    const char **, const char *, struct ArrowArrayStream *, struct AdbcError *error) {
+	return ADBC_STATUS_NOT_IMPLEMENTED;
+}
+
+AdbcStatusCode ConnectionGetTableSchema(struct AdbcConnection *, const char *, const char *, const char *,
+                                        struct ArrowSchema *, struct AdbcError *error) {
+	return ADBC_STATUS_NOT_IMPLEMENTED;
+}
+
+AdbcStatusCode ConnectionGetTableTypes(struct AdbcConnection *, struct ArrowArrayStream *, struct AdbcError *error) {
+	return ADBC_STATUS_NOT_IMPLEMENTED;
+}
+
+AdbcStatusCode ConnectionReadPartition(struct AdbcConnection *connection, const uint8_t *serialized_partition,
+                                       size_t serialized_length, struct ArrowArrayStream *out,
+                                       struct AdbcError *error) {
+	return ADBC_STATUS_NOT_IMPLEMENTED;
+}
+
+AdbcStatusCode ConnectionRollback(struct AdbcConnection *, struct AdbcError *error) {
+	return ADBC_STATUS_NOT_IMPLEMENTED;
+}
+
+AdbcStatusCode ConnectionSetOption(struct AdbcConnection *, const char *, const char *, struct AdbcError *error) {
+	return ADBC_STATUS_NOT_IMPLEMENTED;
+}
+
+AdbcStatusCode StatementBind(struct AdbcStatement *, struct ArrowArray *, struct ArrowSchema *,
+                             struct AdbcError *error) {
+	return ADBC_STATUS_NOT_IMPLEMENTED;
+}
+
+AdbcStatusCode StatementExecutePartitions(struct AdbcStatement *statement, struct ArrowSchema *schema,
+                                          struct AdbcPartitions *partitions, int64_t *rows_affected,
+                                          struct AdbcError *error) {
+	return ADBC_STATUS_NOT_IMPLEMENTED;
+}
+
+AdbcStatusCode StatementGetParameterSchema(struct AdbcStatement *statement, struct ArrowSchema *schema,
+                                           struct AdbcError *error) {
+	return ADBC_STATUS_NOT_IMPLEMENTED;
+}
+
+AdbcStatusCode StatementPrepare(struct AdbcStatement *, struct AdbcError *error) {
+	return ADBC_STATUS_NOT_IMPLEMENTED;
+}
+
+AdbcStatusCode StatementSetOption(struct AdbcStatement *, const char *, const char *, struct AdbcError *error) {
+	return ADBC_STATUS_NOT_IMPLEMENTED;
+}
+
+AdbcStatusCode StatementSetSqlQuery(struct AdbcStatement *, const char *, struct AdbcError *error) {
+	return ADBC_STATUS_NOT_IMPLEMENTED;
+}
+
+AdbcStatusCode StatementSetSubstraitPlan(struct AdbcStatement *, const uint8_t *, size_t, struct AdbcError *error) {
+	return ADBC_STATUS_NOT_IMPLEMENTED;
+}
+
 AdbcStatusCode AdbcDatabaseNew(struct AdbcDatabase *database, struct AdbcError *error) {
 	// Allocate a temporary structure to store options pre-Init
 	database->private_data = new TempDatabase();
@@ -163,12 +653,89 @@ AdbcStatusCode AdbcDatabaseNew(struct AdbcDatabase *database, struct AdbcError *
 	return ADBC_STATUS_OK;
 }
 
-AdbcStatusCode AdbcDatabaseSetOption(struct AdbcDatabase *database, const char *key, const char *value,
+AdbcStatusCode AdbcDatabaseGetOption(struct AdbcDatabase *database, const char *key, char *value, size_t *length,
                                      struct AdbcError *error) {
-	if (!database) {
-		return ADBC_STATUS_INVALID_ARGUMENT;
+	if (database->private_driver) {
+		INIT_ERROR(error, database);
+		return database->private_driver->DatabaseGetOption(database, key, value, length, error);
+	}
+	const auto *args = reinterpret_cast<const TempDatabase *>(database->private_data);
+	const std::string *result = nullptr;
+	if (std::strcmp(key, "driver") == 0) {
+		result = &args->driver;
+	} else if (std::strcmp(key, "entrypoint") == 0) {
+		result = &args->entrypoint;
+	} else {
+		const auto it = args->options.find(key);
+		if (it == args->options.end()) {
+			return ADBC_STATUS_NOT_FOUND;
+		}
+		result = &it->second;
+	}
+
+	if (*length <= result->size() + 1) {
+		// Enough space
+		std::memcpy(value, result->c_str(), result->size() + 1);
 	}
+	*length = result->size() + 1;
+	return ADBC_STATUS_OK;
+}
+
+AdbcStatusCode AdbcDatabaseGetOptionBytes(struct AdbcDatabase *database, const char *key, uint8_t *value,
+                                          size_t *length, struct AdbcError *error) {
 	if (database->private_driver) {
+		INIT_ERROR(error, database);
+		return database->private_driver->DatabaseGetOptionBytes(database, key, value, length, error);
+	}
+	const auto *args = reinterpret_cast<const TempDatabase *>(database->private_data);
+	const auto it = args->bytes_options.find(key);
+	if (it == args->options.end()) {
+		return ADBC_STATUS_NOT_FOUND;
+	}
+	const std::string &result = it->second;
+
+	if (*length <= result.size()) {
+		// Enough space
+		std::memcpy(value, result.c_str(), result.size());
+	}
+	*length = result.size();
+	return ADBC_STATUS_OK;
+}
+
+AdbcStatusCode AdbcDatabaseGetOptionInt(struct AdbcDatabase *database, const char *key, int64_t *value,
+                                        struct AdbcError *error) {
+	if (database->private_driver) {
+		INIT_ERROR(error, database);
+		return database->private_driver->DatabaseGetOptionInt(database, key, value, error);
+	}
+	const auto *args = reinterpret_cast<const TempDatabase *>(database->private_data);
+	const auto it = args->int_options.find(key);
+	if (it == args->int_options.end()) {
+		return ADBC_STATUS_NOT_FOUND;
+	}
+	*value = it->second;
+	return ADBC_STATUS_OK;
+}
+
+AdbcStatusCode AdbcDatabaseGetOptionDouble(struct AdbcDatabase *database, const char *key, double *value,
+                                           struct AdbcError *error) {
+	if (database->private_driver) {
+		INIT_ERROR(error, database);
+		return database->private_driver->DatabaseGetOptionDouble(database, key, value, error);
+	}
+	const auto *args = reinterpret_cast<const TempDatabase *>(database->private_data);
+	const auto it = args->double_options.find(key);
+	if (it == args->double_options.end()) {
+		return ADBC_STATUS_NOT_FOUND;
+	}
+	*value = it->second;
+	return ADBC_STATUS_OK;
+}
+
+AdbcStatusCode AdbcDatabaseSetOption(struct AdbcDatabase *database, const char *key, const char *value,
+                                     struct AdbcError *error) {
+	if (database->private_driver) {
+		INIT_ERROR(error, database);
 		return database->private_driver->DatabaseSetOption(database, key, value, error);
 	}
 
@@ -183,11 +750,44 @@ AdbcStatusCode AdbcDatabaseSetOption(struct AdbcDatabase *database, const char *
 	return ADBC_STATUS_OK;
 }
 
+AdbcStatusCode AdbcDatabaseSetOptionBytes(struct AdbcDatabase *database, const char *key, const uint8_t *value,
+                                          size_t length, struct AdbcError *error) {
+	if (database->private_driver) {
+		INIT_ERROR(error, database);
+		return database->private_driver->DatabaseSetOptionBytes(database, key, value, length, error);
+	}
+
+	TempDatabase *args = reinterpret_cast<TempDatabase *>(database->private_data);
+	args->bytes_options[key] = std::string(reinterpret_cast<const char *>(value), length);
+	return ADBC_STATUS_OK;
+}
+
+AdbcStatusCode AdbcDatabaseSetOptionInt(struct AdbcDatabase *database, const char *key, int64_t value,
+                                        struct AdbcError *error) {
+	if (database->private_driver) {
+		INIT_ERROR(error, database);
+		return database->private_driver->DatabaseSetOptionInt(database, key, value, error);
+	}
+
+	TempDatabase *args = reinterpret_cast<TempDatabase *>(database->private_data);
+	args->int_options[key] = value;
+	return ADBC_STATUS_OK;
+}
+
+AdbcStatusCode AdbcDatabaseSetOptionDouble(struct AdbcDatabase *database, const char *key, double value,
+                                           struct AdbcError *error) {
+	if (database->private_driver) {
+		INIT_ERROR(error, database);
+		return database->private_driver->DatabaseSetOptionDouble(database, key, value, error);
+	}
+
+	TempDatabase *args = reinterpret_cast<TempDatabase *>(database->private_data);
+	args->double_options[key] = value;
+	return ADBC_STATUS_OK;
+}
+
 AdbcStatusCode AdbcDriverManagerDatabaseSetInitFunc(struct AdbcDatabase *database, AdbcDriverInitFunc init_func,
                                                     struct AdbcError *error) {
-	if (!database) {
-		return ADBC_STATUS_INVALID_ARGUMENT;
-	}
 	if (database->private_driver) {
 		return ADBC_STATUS_INVALID_STATE;
 	}
@@ -216,10 +816,12 @@ AdbcStatusCode AdbcDatabaseInit(struct AdbcDatabase *database, struct AdbcError
 	// So we don't confuse a driver into thinking it's initialized already
 	database->private_data = nullptr;
 	if (args->init_func) {
-		status = AdbcLoadDriverFromInitFunc(args->init_func, ADBC_VERSION_1_0_0, database->private_driver, error);
-	} else {
-		status = AdbcLoadDriver(args->driver.c_str(), args->entrypoint.c_str(), ADBC_VERSION_1_0_0,
+		status = AdbcLoadDriverFromInitFunc(args->init_func, ADBC_VERSION_1_1_0, database->private_driver, error);
+	} else if (!args->entrypoint.empty()) {
+		status = AdbcLoadDriver(args->driver.c_str(), args->entrypoint.c_str(), ADBC_VERSION_1_1_0,
 		                        database->private_driver, error);
+	} else {
+		status = AdbcLoadDriver(args->driver.c_str(), nullptr, ADBC_VERSION_1_1_0, database->private_driver, error);
 	}
 	if (status != ADBC_STATUS_OK) {
 		// Restore private_data so it will be released by AdbcDatabaseRelease
@@ -240,25 +842,51 @@ AdbcStatusCode AdbcDatabaseInit(struct AdbcDatabase *database, struct AdbcError
 		database->private_driver = nullptr;
 		return status;
 	}
-	for (const auto &option : args->options) {
+	auto options = std::move(args->options);
+	auto bytes_options = std::move(args->bytes_options);
+	auto int_options = std::move(args->int_options);
+	auto double_options = std::move(args->double_options);
+	delete args;
+
+	INIT_ERROR(error, database);
+	for (const auto &option : options) {
 		status =
 		    database->private_driver->DatabaseSetOption(database, option.first.c_str(), option.second.c_str(), error);
-		if (status != ADBC_STATUS_OK) {
-			delete args;
-			// Release the database
-			std::ignore = database->private_driver->DatabaseRelease(database, error);
-			if (database->private_driver->release) {
-				database->private_driver->release(database->private_driver, error);
-			}
-			delete database->private_driver;
-			database->private_driver = nullptr;
-			// Should be redundant, but ensure that AdbcDatabaseRelease
-			// below doesn't think that it contains a TempDatabase
-			database->private_data = nullptr;
-			return status;
+		if (status != ADBC_STATUS_OK)
+			break;
+	}
+	for (const auto &option : bytes_options) {
+		status = database->private_driver->DatabaseSetOptionBytes(
+		    database, option.first.c_str(), reinterpret_cast<const uint8_t *>(option.second.data()),
+		    option.second.size(), error);
+		if (status != ADBC_STATUS_OK)
+			break;
+	}
+	for (const auto &option : int_options) {
+		status = database->private_driver->DatabaseSetOptionInt(database, option.first.c_str(), option.second, error);
+		if (status != ADBC_STATUS_OK)
+			break;
+	}
+	for (const auto &option : double_options) {
+		status =
+		    database->private_driver->DatabaseSetOptionDouble(database, option.first.c_str(), option.second, error);
+		if (status != ADBC_STATUS_OK)
+			break;
+	}
+
+	if (status != ADBC_STATUS_OK) {
+		// Release the database
+		std::ignore = database->private_driver->DatabaseRelease(database, error);
+		if (database->private_driver->release) {
+			database->private_driver->release(database->private_driver, error);
 		}
+		delete database->private_driver;
+		database->private_driver = nullptr;
+		// Should be redundant, but ensure that AdbcDatabaseRelease
+		// below doesn't think that it contains a TempDatabase
+		database->private_data = nullptr;
+		return status;
 	}
-	delete args;
 	return database->private_driver->DatabaseInit(database, error);
 }
 
@@ -272,6 +900,7 @@ AdbcStatusCode AdbcDatabaseRelease(struct AdbcDatabase *database, struct AdbcErr
 		}
 		return ADBC_STATUS_INVALID_STATE;
 	}
+	INIT_ERROR(error, database);
 	auto status = database->private_driver->DatabaseRelease(database, error);
 	if (database->private_driver->release) {
 		database->private_driver->release(database->private_driver, error);
@@ -282,72 +911,174 @@ AdbcStatusCode AdbcDatabaseRelease(struct AdbcDatabase *database, struct AdbcErr
 	return status;
 }
 
-AdbcStatusCode AdbcConnectionCommit(struct AdbcConnection *connection, struct AdbcError *error) {
-	if (!connection) {
-		return ADBC_STATUS_INVALID_ARGUMENT;
+AdbcStatusCode AdbcConnectionCancel(struct AdbcConnection *connection, struct AdbcError *error) {
+	if (!connection->private_driver) {
+		return ADBC_STATUS_INVALID_STATE;
 	}
+	INIT_ERROR(error, connection);
+	return connection->private_driver->ConnectionCancel(connection, error);
+}
+
+AdbcStatusCode AdbcConnectionCommit(struct AdbcConnection *connection, struct AdbcError *error) {
 	if (!connection->private_driver) {
 		return ADBC_STATUS_INVALID_STATE;
 	}
+	INIT_ERROR(error, connection);
 	return connection->private_driver->ConnectionCommit(connection, error);
 }
 
-AdbcStatusCode AdbcConnectionGetInfo(struct AdbcConnection *connection, uint32_t *info_codes, size_t info_codes_length,
-                                     struct ArrowArrayStream *out, struct AdbcError *error) {
-	if (!connection) {
-		return ADBC_STATUS_INVALID_ARGUMENT;
-	}
+AdbcStatusCode AdbcConnectionGetInfo(struct AdbcConnection *connection, const uint32_t *info_codes,
+                                     size_t info_codes_length, struct ArrowArrayStream *out, struct AdbcError *error) {
 	if (!connection->private_driver) {
 		return ADBC_STATUS_INVALID_STATE;
 	}
-	return connection->private_driver->ConnectionGetInfo(connection, info_codes, info_codes_length, out, error);
+	INIT_ERROR(error, connection);
+	WRAP_STREAM(connection->private_driver->ConnectionGetInfo(connection, info_codes, info_codes_length, out, error),
+	            out, connection);
 }
 
 AdbcStatusCode AdbcConnectionGetObjects(struct AdbcConnection *connection, int depth, const char *catalog,
                                         const char *db_schema, const char *table_name, const char **table_types,
                                         const char *column_name, struct ArrowArrayStream *stream,
                                         struct AdbcError *error) {
-	if (!connection) {
-		SetError(error, "connection can't be null");
+	if (!connection->private_driver) {
+		return ADBC_STATUS_INVALID_STATE;
+	}
+	INIT_ERROR(error, connection);
+	WRAP_STREAM(connection->private_driver->ConnectionGetObjects(connection, depth, catalog, db_schema, table_name,
+	                                                             table_types, column_name, stream, error),
+	            stream, connection);
+}
+
+AdbcStatusCode AdbcConnectionGetOption(struct AdbcConnection *connection, const char *key, char *value, size_t *length,
+                                       struct AdbcError *error) {
+	if (!connection->private_data) {
+		SetError(error, "AdbcConnectionGetOption: must AdbcConnectionNew first");
+		return ADBC_STATUS_INVALID_STATE;
+	}
+	if (!connection->private_driver) {
+		// Init not yet called, get the saved option
+		const auto *args = reinterpret_cast<const TempConnection *>(connection->private_data);
+		const auto it = args->options.find(key);
+		if (it == args->options.end()) {
+			return ADBC_STATUS_NOT_FOUND;
+		}
+		if (*length >= it->second.size() + 1) {
+			std::memcpy(value, it->second.c_str(), it->second.size() + 1);
+		}
+		*length = it->second.size() + 1;
+		return ADBC_STATUS_OK;
+	}
+	INIT_ERROR(error, connection);
+	return connection->private_driver->ConnectionGetOption(connection, key, value, length, error);
+}
+
+AdbcStatusCode AdbcConnectionGetOptionBytes(struct AdbcConnection *connection, const char *key, uint8_t *value,
+                                            size_t *length, struct AdbcError *error) {
+	if (!connection->private_data) {
+		SetError(error, "AdbcConnectionGetOption: must AdbcConnectionNew first");
+		return ADBC_STATUS_INVALID_STATE;
+	}
+	if (!connection->private_driver) {
+		// Init not yet called, get the saved option
+		const auto *args = reinterpret_cast<const TempConnection *>(connection->private_data);
+		const auto it = args->bytes_options.find(key);
+		if (it == args->options.end()) {
+			return ADBC_STATUS_NOT_FOUND;
+		}
+		if (*length >= it->second.size() + 1) {
+			std::memcpy(value, it->second.data(), it->second.size() + 1);
+		}
+		*length = it->second.size() + 1;
+		return ADBC_STATUS_OK;
+	}
+	INIT_ERROR(error, connection);
+	return connection->private_driver->ConnectionGetOptionBytes(connection, key, value, length, error);
+}
+
+AdbcStatusCode AdbcConnectionGetOptionInt(struct AdbcConnection *connection, const char *key, int64_t *value,
+                                          struct AdbcError *error) {
+	if (!connection->private_data) {
+		SetError(error, "AdbcConnectionGetOption: must AdbcConnectionNew first");
 		return ADBC_STATUS_INVALID_STATE;
 	}
+	if (!connection->private_driver) {
+		// Init not yet called, get the saved option
+		const auto *args = reinterpret_cast<const TempConnection *>(connection->private_data);
+		const auto it = args->int_options.find(key);
+		if (it == args->int_options.end()) {
+			return ADBC_STATUS_NOT_FOUND;
+		}
+		*value = it->second;
+		return ADBC_STATUS_OK;
+	}
+	INIT_ERROR(error, connection);
+	return connection->private_driver->ConnectionGetOptionInt(connection, key, value, error);
+}
+
+AdbcStatusCode AdbcConnectionGetOptionDouble(struct AdbcConnection *connection, const char *key, double *value,
+                                             struct AdbcError *error) {
 	if (!connection->private_data) {
-		SetError(error, "connection must be initialized");
+		SetError(error, "AdbcConnectionGetOption: must AdbcConnectionNew first");
+		return ADBC_STATUS_INVALID_STATE;
+	}
+	if (!connection->private_driver) {
+		// Init not yet called, get the saved option
+		const auto *args = reinterpret_cast<const TempConnection *>(connection->private_data);
+		const auto it = args->double_options.find(key);
+		if (it == args->double_options.end()) {
+			return ADBC_STATUS_NOT_FOUND;
+		}
+		*value = it->second;
+		return ADBC_STATUS_OK;
+	}
+	INIT_ERROR(error, connection);
+	return connection->private_driver->ConnectionGetOptionDouble(connection, key, value, error);
+}
+
+AdbcStatusCode AdbcConnectionGetStatistics(struct AdbcConnection *connection, const char *catalog,
+                                           const char *db_schema, const char *table_name, char approximate,
+                                           struct ArrowArrayStream *out, struct AdbcError *error) {
+	if (!connection->private_driver) {
+		return ADBC_STATUS_INVALID_STATE;
+	}
+	INIT_ERROR(error, connection);
+	WRAP_STREAM(connection->private_driver->ConnectionGetStatistics(connection, catalog, db_schema, table_name,
+	                                                                approximate == 1, out, error),
+	            out, connection);
+}
+
+AdbcStatusCode AdbcConnectionGetStatisticNames(struct AdbcConnection *connection, struct ArrowArrayStream *out,
+                                               struct AdbcError *error) {
+	if (!connection->private_driver) {
 		return ADBC_STATUS_INVALID_STATE;
 	}
-	return connection->private_driver->ConnectionGetObjects(connection, depth, catalog, db_schema, table_name,
-	                                                        table_types, column_name, stream, error);
+	INIT_ERROR(error, connection);
+	WRAP_STREAM(connection->private_driver->ConnectionGetStatisticNames(connection, out, error), out, connection);
 }
 
 AdbcStatusCode AdbcConnectionGetTableSchema(struct AdbcConnection *connection, const char *catalog,
                                             const char *db_schema, const char *table_name, struct ArrowSchema *schema,
                                             struct AdbcError *error) {
-	if (!connection) {
-		return ADBC_STATUS_INVALID_ARGUMENT;
-	}
 	if (!connection->private_driver) {
 		return ADBC_STATUS_INVALID_STATE;
 	}
+	INIT_ERROR(error, connection);
 	return connection->private_driver->ConnectionGetTableSchema(connection, catalog, db_schema, table_name, schema,
 	                                                            error);
 }
 
 AdbcStatusCode AdbcConnectionGetTableTypes(struct AdbcConnection *connection, struct ArrowArrayStream *stream,
                                            struct AdbcError *error) {
-	if (!connection) {
-		return ADBC_STATUS_INVALID_ARGUMENT;
-	}
 	if (!connection->private_driver) {
 		return ADBC_STATUS_INVALID_STATE;
 	}
-	return connection->private_driver->ConnectionGetTableTypes(connection, stream, error);
+	INIT_ERROR(error, connection);
+	WRAP_STREAM(connection->private_driver->ConnectionGetTableTypes(connection, stream, error), stream, connection);
 }
 
 AdbcStatusCode AdbcConnectionInit(struct AdbcConnection *connection, struct AdbcDatabase *database,
                                   struct AdbcError *error) {
-	if (!connection) {
-		return ADBC_STATUS_INVALID_ARGUMENT;
-	}
 	if (!connection->private_data) {
 		SetError(error, "Must call AdbcConnectionNew first");
 		return ADBC_STATUS_INVALID_STATE;
@@ -358,21 +1089,42 @@ AdbcStatusCode AdbcConnectionInit(struct AdbcConnection *connection, struct Adbc
 	TempConnection *args = reinterpret_cast<TempConnection *>(connection->private_data);
 	connection->private_data = nullptr;
 	std::unordered_map<std::string, std::string> options = std::move(args->options);
+	std::unordered_map<std::string, std::string> bytes_options = std::move(args->bytes_options);
+	std::unordered_map<std::string, int64_t> int_options = std::move(args->int_options);
+	std::unordered_map<std::string, double> double_options = std::move(args->double_options);
 	delete args;
 
 	auto status = database->private_driver->ConnectionNew(connection, error);
-	if (status != ADBC_STATUS_OK) {
+	if (status != ADBC_STATUS_OK)
 		return status;
-	}
 	connection->private_driver = database->private_driver;
 
 	for (const auto &option : options) {
 		status = database->private_driver->ConnectionSetOption(connection, option.first.c_str(), option.second.c_str(),
 		                                                       error);
-		if (status != ADBC_STATUS_OK) {
+		if (status != ADBC_STATUS_OK)
+			return status;
+	}
+	for (const auto &option : bytes_options) {
+		status = database->private_driver->ConnectionSetOptionBytes(
+		    connection, option.first.c_str(), reinterpret_cast<const uint8_t *>(option.second.data()),
+		    option.second.size(), error);
+		if (status != ADBC_STATUS_OK)
+			return status;
+	}
+	for (const auto &option : int_options) {
+		status =
+		    database->private_driver->ConnectionSetOptionInt(connection, option.first.c_str(), option.second, error);
+		if (status != ADBC_STATUS_OK)
+			return status;
+	}
+	for (const auto &option : double_options) {
+		status =
+		    database->private_driver->ConnectionSetOptionDouble(connection, option.first.c_str(), option.second, error);
+		if (status != ADBC_STATUS_OK)
 			return status;
-		}
 	}
+	INIT_ERROR(error, connection);
 	return connection->private_driver->ConnectionInit(connection, database, error);
 }
 
@@ -388,20 +1140,16 @@ AdbcStatusCode AdbcConnectionNew(struct AdbcConnection *connection, struct AdbcE
 AdbcStatusCode AdbcConnectionReadPartition(struct AdbcConnection *connection, const uint8_t *serialized_partition,
                                            size_t serialized_length, struct ArrowArrayStream *out,
                                            struct AdbcError *error) {
-	if (!connection) {
-		return ADBC_STATUS_INVALID_ARGUMENT;
-	}
 	if (!connection->private_driver) {
 		return ADBC_STATUS_INVALID_STATE;
 	}
-	return connection->private_driver->ConnectionReadPartition(connection, serialized_partition, serialized_length, out,
-	                                                           error);
+	INIT_ERROR(error, connection);
+	WRAP_STREAM(connection->private_driver->ConnectionReadPartition(connection, serialized_partition, serialized_length,
+	                                                                out, error),
+	            out, connection);
 }
 
 AdbcStatusCode AdbcConnectionRelease(struct AdbcConnection *connection, struct AdbcError *error) {
-	if (!connection) {
-		return ADBC_STATUS_INVALID_ARGUMENT;
-	}
 	if (!connection->private_driver) {
 		if (connection->private_data) {
 			TempConnection *args = reinterpret_cast<TempConnection *>(connection->private_data);
@@ -411,26 +1159,22 @@ AdbcStatusCode AdbcConnectionRelease(struct AdbcConnection *connection, struct A
 		}
 		return ADBC_STATUS_INVALID_STATE;
 	}
+	INIT_ERROR(error, connection);
 	auto status = connection->private_driver->ConnectionRelease(connection, error);
 	connection->private_driver = nullptr;
 	return status;
 }
 
 AdbcStatusCode AdbcConnectionRollback(struct AdbcConnection *connection, struct AdbcError *error) {
-	if (!connection) {
-		return ADBC_STATUS_INVALID_ARGUMENT;
-	}
 	if (!connection->private_driver) {
 		return ADBC_STATUS_INVALID_STATE;
 	}
+	INIT_ERROR(error, connection);
 	return connection->private_driver->ConnectionRollback(connection, error);
 }
 
 AdbcStatusCode AdbcConnectionSetOption(struct AdbcConnection *connection, const char *key, const char *value,
                                        struct AdbcError *error) {
-	if (!connection) {
-		return ADBC_STATUS_INVALID_ARGUMENT;
-	}
 	if (!connection->private_data) {
 		SetError(error, "AdbcConnectionSetOption: must AdbcConnectionNew first");
 		return ADBC_STATUS_INVALID_STATE;
@@ -441,98 +1185,182 @@ AdbcStatusCode AdbcConnectionSetOption(struct AdbcConnection *connection, const
 		args->options[key] = value;
 		return ADBC_STATUS_OK;
 	}
+	INIT_ERROR(error, connection);
 	return connection->private_driver->ConnectionSetOption(connection, key, value, error);
 }
 
+AdbcStatusCode AdbcConnectionSetOptionBytes(struct AdbcConnection *connection, const char *key, const uint8_t *value,
+                                            size_t length, struct AdbcError *error) {
+	if (!connection->private_data) {
+		SetError(error, "AdbcConnectionSetOptionInt: must AdbcConnectionNew first");
+		return ADBC_STATUS_INVALID_STATE;
+	}
+	if (!connection->private_driver) {
+		// Init not yet called, save the option
+		TempConnection *args = reinterpret_cast<TempConnection *>(connection->private_data);
+		args->bytes_options[key] = std::string(reinterpret_cast<const char *>(value), length);
+		return ADBC_STATUS_OK;
+	}
+	INIT_ERROR(error, connection);
+	return connection->private_driver->ConnectionSetOptionBytes(connection, key, value, length, error);
+}
+
+AdbcStatusCode AdbcConnectionSetOptionInt(struct AdbcConnection *connection, const char *key, int64_t value,
+                                          struct AdbcError *error) {
+	if (!connection->private_data) {
+		SetError(error, "AdbcConnectionSetOptionInt: must AdbcConnectionNew first");
+		return ADBC_STATUS_INVALID_STATE;
+	}
+	if (!connection->private_driver) {
+		// Init not yet called, save the option
+		TempConnection *args = reinterpret_cast<TempConnection *>(connection->private_data);
+		args->int_options[key] = value;
+		return ADBC_STATUS_OK;
+	}
+	INIT_ERROR(error, connection);
+	return connection->private_driver->ConnectionSetOptionInt(connection, key, value, error);
+}
+
+AdbcStatusCode AdbcConnectionSetOptionDouble(struct AdbcConnection *connection, const char *key, double value,
+                                             struct AdbcError *error) {
+	if (!connection->private_data) {
+		SetError(error, "AdbcConnectionSetOptionDouble: must AdbcConnectionNew first");
+		return ADBC_STATUS_INVALID_STATE;
+	}
+	if (!connection->private_driver) {
+		// Init not yet called, save the option
+		TempConnection *args = reinterpret_cast<TempConnection *>(connection->private_data);
+		args->double_options[key] = value;
+		return ADBC_STATUS_OK;
+	}
+	INIT_ERROR(error, connection);
+	return connection->private_driver->ConnectionSetOptionDouble(connection, key, value, error);
+}
+
 AdbcStatusCode AdbcStatementBind(struct AdbcStatement *statement, struct ArrowArray *values, struct ArrowSchema *schema,
                                  struct AdbcError *error) {
-	if (!statement) {
-		return ADBC_STATUS_INVALID_ARGUMENT;
-	}
 	if (!statement->private_driver) {
 		return ADBC_STATUS_INVALID_STATE;
 	}
+	INIT_ERROR(error, statement);
 	return statement->private_driver->StatementBind(statement, values, schema, error);
 }
 
 AdbcStatusCode AdbcStatementBindStream(struct AdbcStatement *statement, struct ArrowArrayStream *stream,
                                        struct AdbcError *error) {
-	if (!statement) {
-		return ADBC_STATUS_INVALID_ARGUMENT;
-	}
 	if (!statement->private_driver) {
 		return ADBC_STATUS_INVALID_STATE;
 	}
+	INIT_ERROR(error, statement);
 	return statement->private_driver->StatementBindStream(statement, stream, error);
 }
 
+AdbcStatusCode AdbcStatementCancel(struct AdbcStatement *statement, struct AdbcError *error) {
+	if (!statement->private_driver) {
+		return ADBC_STATUS_INVALID_STATE;
+	}
+	INIT_ERROR(error, statement);
+	return statement->private_driver->StatementCancel(statement, error);
+}
+
 // XXX: cpplint gets confused here if declared as 'struct ArrowSchema* schema'
 AdbcStatusCode AdbcStatementExecutePartitions(struct AdbcStatement *statement, ArrowSchema *schema,
                                               struct AdbcPartitions *partitions, int64_t *rows_affected,
                                               struct AdbcError *error) {
-	if (!statement) {
-		return ADBC_STATUS_INVALID_ARGUMENT;
-	}
 	if (!statement->private_driver) {
 		return ADBC_STATUS_INVALID_STATE;
 	}
+	INIT_ERROR(error, statement);
 	return statement->private_driver->StatementExecutePartitions(statement, schema, partitions, rows_affected, error);
 }
 
 AdbcStatusCode AdbcStatementExecuteQuery(struct AdbcStatement *statement, struct ArrowArrayStream *out,
                                          int64_t *rows_affected, struct AdbcError *error) {
-	if (!statement) {
-		return ADBC_STATUS_INVALID_ARGUMENT;
+	if (!statement->private_driver) {
+		return ADBC_STATUS_INVALID_STATE;
+	}
+	INIT_ERROR(error, statement);
+	WRAP_STREAM(statement->private_driver->StatementExecuteQuery(statement, out, rows_affected, error), out, statement);
+}
+
+AdbcStatusCode AdbcStatementExecuteSchema(struct AdbcStatement *statement, struct ArrowSchema *schema,
+                                          struct AdbcError *error) {
+	if (!statement->private_driver) {
+		return ADBC_STATUS_INVALID_STATE;
+	}
+	INIT_ERROR(error, statement);
+	return statement->private_driver->StatementExecuteSchema(statement, schema, error);
+}
+
+AdbcStatusCode AdbcStatementGetOption(struct AdbcStatement *statement, const char *key, char *value, size_t *length,
+                                      struct AdbcError *error) {
+	if (!statement->private_driver) {
+		return ADBC_STATUS_INVALID_STATE;
+	}
+	INIT_ERROR(error, statement);
+	return statement->private_driver->StatementGetOption(statement, key, value, length, error);
+}
+
+AdbcStatusCode AdbcStatementGetOptionBytes(struct AdbcStatement *statement, const char *key, uint8_t *value,
+                                           size_t *length, struct AdbcError *error) {
+	if (!statement->private_driver) {
+		return ADBC_STATUS_INVALID_STATE;
+	}
+	INIT_ERROR(error, statement);
+	return statement->private_driver->StatementGetOptionBytes(statement, key, value, length, error);
+}
+
+AdbcStatusCode AdbcStatementGetOptionInt(struct AdbcStatement *statement, const char *key, int64_t *value,
+                                         struct AdbcError *error) {
+	if (!statement->private_driver) {
+		return ADBC_STATUS_INVALID_STATE;
 	}
+	INIT_ERROR(error, statement);
+	return statement->private_driver->StatementGetOptionInt(statement, key, value, error);
+}
+
+AdbcStatusCode AdbcStatementGetOptionDouble(struct AdbcStatement *statement, const char *key, double *value,
+                                            struct AdbcError *error) {
 	if (!statement->private_driver) {
 		return ADBC_STATUS_INVALID_STATE;
 	}
-	return statement->private_driver->StatementExecuteQuery(statement, out, rows_affected, error);
+	INIT_ERROR(error, statement);
+	return statement->private_driver->StatementGetOptionDouble(statement, key, value, error);
 }
 
 AdbcStatusCode AdbcStatementGetParameterSchema(struct AdbcStatement *statement, struct ArrowSchema *schema,
                                                struct AdbcError *error) {
-	if (!statement) {
-		return ADBC_STATUS_INVALID_ARGUMENT;
-	}
 	if (!statement->private_driver) {
 		return ADBC_STATUS_INVALID_STATE;
 	}
+	INIT_ERROR(error, statement);
 	return statement->private_driver->StatementGetParameterSchema(statement, schema, error);
 }
 
 AdbcStatusCode AdbcStatementNew(struct AdbcConnection *connection, struct AdbcStatement *statement,
                                 struct AdbcError *error) {
-	if (!connection) {
-		return ADBC_STATUS_INVALID_ARGUMENT;
-	}
 	if (!connection->private_driver) {
 		return ADBC_STATUS_INVALID_STATE;
 	}
+	INIT_ERROR(error, connection);
 	auto status = connection->private_driver->StatementNew(connection, statement, error);
 	statement->private_driver = connection->private_driver;
 	return status;
 }
 
 AdbcStatusCode AdbcStatementPrepare(struct AdbcStatement *statement, struct AdbcError *error) {
-	if (!statement) {
-		SetError(error, "Missing statement object");
-		return ADBC_STATUS_INVALID_ARGUMENT;
-	}
-	if (!statement->private_data) {
-		SetError(error, "Invalid statement object");
+	if (!statement->private_driver) {
 		return ADBC_STATUS_INVALID_STATE;
 	}
+	INIT_ERROR(error, statement);
 	return statement->private_driver->StatementPrepare(statement, error);
 }
 
 AdbcStatusCode AdbcStatementRelease(struct AdbcStatement *statement, struct AdbcError *error) {
-	if (!statement) {
-		return ADBC_STATUS_INVALID_ARGUMENT;
-	}
 	if (!statement->private_driver) {
 		return ADBC_STATUS_INVALID_STATE;
 	}
+	INIT_ERROR(error, statement);
 	auto status = statement->private_driver->StatementRelease(statement, error);
 	statement->private_driver = nullptr;
 	return status;
@@ -540,65 +1368,82 @@ AdbcStatusCode AdbcStatementRelease(struct AdbcStatement *statement, struct Adbc
 
 AdbcStatusCode AdbcStatementSetOption(struct AdbcStatement *statement, const char *key, const char *value,
                                       struct AdbcError *error) {
-	if (!statement) {
-		return ADBC_STATUS_INVALID_ARGUMENT;
-	}
 	if (!statement->private_driver) {
 		return ADBC_STATUS_INVALID_STATE;
 	}
+	INIT_ERROR(error, statement);
 	return statement->private_driver->StatementSetOption(statement, key, value, error);
 }
 
-AdbcStatusCode AdbcStatementSetSqlQuery(struct AdbcStatement *statement, const char *query, struct AdbcError *error) {
-	if (!statement) {
-		return ADBC_STATUS_INVALID_ARGUMENT;
+AdbcStatusCode AdbcStatementSetOptionBytes(struct AdbcStatement *statement, const char *key, const uint8_t *value,
+                                           size_t length, struct AdbcError *error) {
+	if (!statement->private_driver) {
+		return ADBC_STATUS_INVALID_STATE;
+	}
+	INIT_ERROR(error, statement);
+	return statement->private_driver->StatementSetOptionBytes(statement, key, value, length, error);
+}
+
+AdbcStatusCode AdbcStatementSetOptionInt(struct AdbcStatement *statement, const char *key, int64_t value,
+                                         struct AdbcError *error) {
+	if (!statement->private_driver) {
+		return ADBC_STATUS_INVALID_STATE;
 	}
+	INIT_ERROR(error, statement);
+	return statement->private_driver->StatementSetOptionInt(statement, key, value, error);
+}
+
+AdbcStatusCode AdbcStatementSetOptionDouble(struct AdbcStatement *statement, const char *key, double value,
+                                            struct AdbcError *error) {
+	if (!statement->private_driver) {
+		return ADBC_STATUS_INVALID_STATE;
+	}
+	INIT_ERROR(error, statement);
+	return statement->private_driver->StatementSetOptionDouble(statement, key, value, error);
+}
+
+AdbcStatusCode AdbcStatementSetSqlQuery(struct AdbcStatement *statement, const char *query, struct AdbcError *error) {
 	if (!statement->private_driver) {
 		return ADBC_STATUS_INVALID_STATE;
 	}
+	INIT_ERROR(error, statement);
 	return statement->private_driver->StatementSetSqlQuery(statement, query, error);
 }
 
 AdbcStatusCode AdbcStatementSetSubstraitPlan(struct AdbcStatement *statement, const uint8_t *plan, size_t length,
                                              struct AdbcError *error) {
-	if (!statement) {
-		return ADBC_STATUS_INVALID_ARGUMENT;
-	}
 	if (!statement->private_driver) {
 		return ADBC_STATUS_INVALID_STATE;
 	}
+	INIT_ERROR(error, statement);
 	return statement->private_driver->StatementSetSubstraitPlan(statement, plan, length, error);
 }
 
 const char *AdbcStatusCodeMessage(AdbcStatusCode code) {
-#define STRINGIFY(s)       #s
-#define STRINGIFY_VALUE(s) STRINGIFY(s)
 #define CASE(CONSTANT)                                                                                                 \
-	case CONSTANT:                                                                                                     \
-		return #CONSTANT " (" STRINGIFY_VALUE(CONSTANT) ")";
+	case ADBC_STATUS_##CONSTANT:                                                                                       \
+		return #CONSTANT;
 
 	switch (code) {
-		CASE(ADBC_STATUS_OK);
-		CASE(ADBC_STATUS_UNKNOWN);
-		CASE(ADBC_STATUS_NOT_IMPLEMENTED);
-		CASE(ADBC_STATUS_NOT_FOUND);
-		CASE(ADBC_STATUS_ALREADY_EXISTS);
-		CASE(ADBC_STATUS_INVALID_ARGUMENT);
-		CASE(ADBC_STATUS_INVALID_STATE);
-		CASE(ADBC_STATUS_INVALID_DATA);
-		CASE(ADBC_STATUS_INTEGRITY);
-		CASE(ADBC_STATUS_INTERNAL);
-		CASE(ADBC_STATUS_IO);
-		CASE(ADBC_STATUS_CANCELLED);
-		CASE(ADBC_STATUS_TIMEOUT);
-		CASE(ADBC_STATUS_UNAUTHENTICATED);
-		CASE(ADBC_STATUS_UNAUTHORIZED);
+		CASE(OK);
+		CASE(UNKNOWN);
+		CASE(NOT_IMPLEMENTED);
+		CASE(NOT_FOUND);
+		CASE(ALREADY_EXISTS);
+		CASE(INVALID_ARGUMENT);
+		CASE(INVALID_STATE);
+		CASE(INVALID_DATA);
+		CASE(INTEGRITY);
+		CASE(INTERNAL);
+		CASE(IO);
+		CASE(CANCELLED);
+		CASE(TIMEOUT);
+		CASE(UNAUTHENTICATED);
+		CASE(UNAUTHORIZED);
 	default:
 		return "(invalid code)";
 	}
 #undef CASE
-#undef STRINGIFY_VALUE
-#undef STRINGIFY
 }
 
 AdbcStatusCode AdbcLoadDriver(const char *driver_name, const char *entrypoint, int version, void *raw_driver,
@@ -606,136 +1451,80 @@ AdbcStatusCode AdbcLoadDriver(const char *driver_name, const char *entrypoint, i
 	AdbcDriverInitFunc init_func;
 	std::string error_message;
 
-	if (version != ADBC_VERSION_1_0_0) {
-		SetError(error, "Only ADBC 1.0.0 is supported");
+	switch (version) {
+	case ADBC_VERSION_1_0_0:
+	case ADBC_VERSION_1_1_0:
+		break;
+	default:
+		SetError(error, "Only ADBC 1.0.0 and 1.1.0 are supported");
 		return ADBC_STATUS_NOT_IMPLEMENTED;
 	}
 
-	auto *driver = reinterpret_cast<struct AdbcDriver *>(raw_driver);
-
-	if (!entrypoint) {
-		// Default entrypoint (see adbc.h)
-		entrypoint = "AdbcDriverInit";
-	}
-
-#if defined(_WIN32)
-
-	HMODULE handle = LoadLibraryExA(driver_name, NULL, 0);
-	if (!handle) {
-		error_message += driver_name;
-		error_message += ": LoadLibraryExA() failed: ";
-		GetWinError(&error_message);
-
-		std::string full_driver_name = driver_name;
-		full_driver_name += ".lib";
-		handle = LoadLibraryExA(full_driver_name.c_str(), NULL, 0);
-		if (!handle) {
-			error_message += '\n';
-			error_message += full_driver_name;
-			error_message += ": LoadLibraryExA() failed: ";
-			GetWinError(&error_message);
-		}
-	}
-	if (!handle) {
-		SetError(error, error_message);
-		return ADBC_STATUS_INTERNAL;
+	if (!raw_driver) {
+		SetError(error, "Must provide non-NULL raw_driver");
+		return ADBC_STATUS_INVALID_ARGUMENT;
 	}
+	auto *driver = reinterpret_cast<struct AdbcDriver *>(raw_driver);
 
-	void *load_handle = reinterpret_cast<void *>(GetProcAddress(handle, entrypoint));
-	init_func = reinterpret_cast<AdbcDriverInitFunc>(load_handle);
-	if (!init_func) {
-		std::string message = "GetProcAddress(";
-		message += entrypoint;
-		message += ") failed: ";
-		GetWinError(&message);
-		if (!FreeLibrary(handle)) {
-			message += "\nFreeLibrary() failed: ";
-			GetWinError(&message);
-		}
-		SetError(error, message);
-		return ADBC_STATUS_INTERNAL;
+	ManagedLibrary library;
+	AdbcStatusCode status = library.Load(driver_name, error);
+	if (status != ADBC_STATUS_OK) {
+		// AdbcDatabaseInit tries to call this if set
+		driver->release = nullptr;
+		return status;
 	}
 
-#else
-
-#if defined(__APPLE__)
-	const std::string kPlatformLibraryPrefix = "lib";
-	const std::string kPlatformLibrarySuffix = ".dylib";
-#else
-	const std::string kPlatformLibraryPrefix = "lib";
-	const std::string kPlatformLibrarySuffix = ".so";
-#endif // defined(__APPLE__)
-
-	void *handle = dlopen(driver_name, RTLD_NOW | RTLD_LOCAL);
-	if (!handle) {
-		error_message = "dlopen() failed: ";
-		error_message += dlerror();
-
-		// If applicable, append the shared library prefix/extension and
-		// try again (this way you don't have to hardcode driver names by
-		// platform in the application)
-		const std::string driver_str = driver_name;
-
-		std::string full_driver_name;
-		if (driver_str.size() < kPlatformLibraryPrefix.size() ||
-		    driver_str.compare(0, kPlatformLibraryPrefix.size(), kPlatformLibraryPrefix) != 0) {
-			full_driver_name += kPlatformLibraryPrefix;
-		}
-		full_driver_name += driver_name;
-		if (driver_str.size() < kPlatformLibrarySuffix.size() ||
-		    driver_str.compare(full_driver_name.size() - kPlatformLibrarySuffix.size(), kPlatformLibrarySuffix.size(),
-		                       kPlatformLibrarySuffix) != 0) {
-			full_driver_name += kPlatformLibrarySuffix;
-		}
-		handle = dlopen(full_driver_name.c_str(), RTLD_NOW | RTLD_LOCAL);
-		if (!handle) {
-			error_message += "\ndlopen() failed: ";
-			error_message += dlerror();
+	void *load_handle = nullptr;
+	if (entrypoint) {
+		status = library.Lookup(entrypoint, &load_handle, error);
+	} else {
+		auto name = AdbcDriverManagerDefaultEntrypoint(driver_name);
+		status = library.Lookup(name.c_str(), &load_handle, error);
+		if (status != ADBC_STATUS_OK) {
+			status = library.Lookup(kDefaultEntrypoint, &load_handle, error);
 		}
 	}
-	if (!handle) {
-		SetError(error, error_message);
-		// AdbcDatabaseInit tries to call this if set
-		driver->release = nullptr;
-		return ADBC_STATUS_INTERNAL;
-	}
 
-	void *load_handle = dlsym(handle, entrypoint);
-	if (!load_handle) {
-		std::string message = "dlsym(";
-		message += entrypoint;
-		message += ") failed: ";
-		message += dlerror();
-		SetError(error, message);
-		return ADBC_STATUS_INTERNAL;
+	if (status != ADBC_STATUS_OK) {
+		library.Release();
+		return status;
 	}
 	init_func = reinterpret_cast<AdbcDriverInitFunc>(load_handle);
 
-#endif // defined(_WIN32)
-
-	AdbcStatusCode status = AdbcLoadDriverFromInitFunc(init_func, version, driver, error);
+	status = AdbcLoadDriverFromInitFunc(init_func, version, driver, error);
 	if (status == ADBC_STATUS_OK) {
 		ManagerDriverState *state = new ManagerDriverState;
 		state->driver_release = driver->release;
-#if defined(_WIN32)
-		state->handle = handle;
-#endif // defined(_WIN32)
+		state->handle = std::move(library);
 		driver->release = &ReleaseDriver;
 		driver->private_manager = state;
 	} else {
-#if defined(_WIN32)
-		if (!FreeLibrary(handle)) {
-			std::string message = "FreeLibrary() failed: ";
-			GetWinError(&message);
-			SetError(error, message);
-		}
-#endif // defined(_WIN32)
+		library.Release();
 	}
 	return status;
 }
 
 AdbcStatusCode AdbcLoadDriverFromInitFunc(AdbcDriverInitFunc init_func, int version, void *raw_driver,
                                           struct AdbcError *error) {
+	constexpr std::array<int, 2> kSupportedVersions = {
+	    ADBC_VERSION_1_1_0,
+	    ADBC_VERSION_1_0_0,
+	};
+
+	if (!raw_driver) {
+		SetError(error, "Must provide non-NULL raw_driver");
+		return ADBC_STATUS_INVALID_ARGUMENT;
+	}
+
+	switch (version) {
+	case ADBC_VERSION_1_0_0:
+	case ADBC_VERSION_1_1_0:
+		break;
+	default:
+		SetError(error, "Only ADBC 1.0.0 and 1.1.0 are supported");
+		return ADBC_STATUS_NOT_IMPLEMENTED;
+	}
+
 #define FILL_DEFAULT(DRIVER, STUB)                                                                                     \
 	if (!DRIVER->STUB) {                                                                                               \
 		DRIVER->STUB = &STUB;                                                                                          \
@@ -746,12 +1535,22 @@ AdbcStatusCode AdbcLoadDriverFromInitFunc(AdbcDriverInitFunc init_func, int vers
 		return ADBC_STATUS_INTERNAL;                                                                                   \
 	}
 
-	auto result = init_func(version, raw_driver, error);
+	// Starting from the passed version, try each (older) version in
+	// succession with the underlying driver until we find one that's
+	// accepted.
+	AdbcStatusCode result = ADBC_STATUS_NOT_IMPLEMENTED;
+	for (const int try_version : kSupportedVersions) {
+		if (try_version > version)
+			continue;
+		result = init_func(try_version, raw_driver, error);
+		if (result != ADBC_STATUS_NOT_IMPLEMENTED)
+			break;
+	}
 	if (result != ADBC_STATUS_OK) {
 		return result;
 	}
 
-	if (version == ADBC_VERSION_1_0_0) {
+	if (version >= ADBC_VERSION_1_0_0) {
 		auto *driver = reinterpret_cast<struct AdbcDriver *>(raw_driver);
 		CHECK_REQUIRED(driver, DatabaseNew);
 		CHECK_REQUIRED(driver, DatabaseInit);
@@ -781,10 +1580,44 @@ AdbcStatusCode AdbcLoadDriverFromInitFunc(AdbcDriverInitFunc init_func, int vers
 		FILL_DEFAULT(driver, StatementSetSqlQuery);
 		FILL_DEFAULT(driver, StatementSetSubstraitPlan);
 	}
+	if (version >= ADBC_VERSION_1_1_0) {
+		auto *driver = reinterpret_cast<struct AdbcDriver *>(raw_driver);
+		FILL_DEFAULT(driver, ErrorGetDetailCount);
+		FILL_DEFAULT(driver, ErrorGetDetail);
+		FILL_DEFAULT(driver, ErrorFromArrayStream);
+
+		FILL_DEFAULT(driver, DatabaseGetOption);
+		FILL_DEFAULT(driver, DatabaseGetOptionBytes);
+		FILL_DEFAULT(driver, DatabaseGetOptionDouble);
+		FILL_DEFAULT(driver, DatabaseGetOptionInt);
+		FILL_DEFAULT(driver, DatabaseSetOptionBytes);
+		FILL_DEFAULT(driver, DatabaseSetOptionDouble);
+		FILL_DEFAULT(driver, DatabaseSetOptionInt);
+
+		FILL_DEFAULT(driver, ConnectionCancel);
+		FILL_DEFAULT(driver, ConnectionGetOption);
+		FILL_DEFAULT(driver, ConnectionGetOptionBytes);
+		FILL_DEFAULT(driver, ConnectionGetOptionDouble);
+		FILL_DEFAULT(driver, ConnectionGetOptionInt);
+		FILL_DEFAULT(driver, ConnectionGetStatistics);
+		FILL_DEFAULT(driver, ConnectionGetStatisticNames);
+		FILL_DEFAULT(driver, ConnectionSetOptionBytes);
+		FILL_DEFAULT(driver, ConnectionSetOptionDouble);
+		FILL_DEFAULT(driver, ConnectionSetOptionInt);
+
+		FILL_DEFAULT(driver, StatementCancel);
+		FILL_DEFAULT(driver, StatementExecuteSchema);
+		FILL_DEFAULT(driver, StatementGetOption);
+		FILL_DEFAULT(driver, StatementGetOptionBytes);
+		FILL_DEFAULT(driver, StatementGetOptionDouble);
+		FILL_DEFAULT(driver, StatementGetOptionInt);
+		FILL_DEFAULT(driver, StatementSetOptionBytes);
+		FILL_DEFAULT(driver, StatementSetOptionDouble);
+		FILL_DEFAULT(driver, StatementSetOptionInt);
+	}
 
 	return ADBC_STATUS_OK;
 
 #undef FILL_DEFAULT
 #undef CHECK_REQUIRED
 }
-} // namespace duckdb_adbc