Merge pull request #89 from evidence-dev/88-changes-required-for-upcoming-duckdb-v14-release

chore(duckdb): fully move over to new extension APIs for DuckDB v1.4-andium

Author: mharrisb1

.github/workflows/MainDistributionPipeline.yml

@@ -23,9 +23,9 @@ jobs:
 
   duckdb-stable-build:
     name: Build extension binaries
-    uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v1.3.2
+    uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
     with:
-      duckdb_version: v1.3.2
-      ci_tools_version: v1.3.2
+      duckdb_version: v1.4-andium
+      ci_tools_version: main
       extension_name: gsheets
       exclude_archs: "windows_amd64_rtools"

.gitmodules

@@ -1,7 +1,7 @@
 [submodule "duckdb"]
 	path = duckdb
 	url = https://github.com/duckdb/duckdb
-	branch = main
+	branch = v1.4-andium
 [submodule "extension-ci-tools"]
 	path = extension-ci-tools
 	url = https://github.com/duckdb/extension-ci-tools

docs/pages/index.md

@@ -24,7 +24,7 @@ INSTALL gsheets FROM community;
 LOAD gsheets;
 ```
 
-The latest version of [DuckDB](https://duckdb.org/docs/installation) (currently 1.3.2) is supported.
+The latest version of [DuckDB](https://duckdb.org/docs/installation) (currently 1.4.0) is supported.
 
 ## Usage 
 

duckdb

@@ -1,9 +1,5 @@
 #include "duckdb.hpp"
 
-#ifndef DUCKDB_CPP_EXTENSION_ENTRY
-#include "duckdb/main/extension_util.hpp"
-#endif
-
 #include "gsheets_auth.hpp"
 #include "gsheets_utils.hpp"
 #include "gsheets_get_token.hpp"
@@ -117,12 +113,7 @@ static unique_ptr<BaseSecret> CreateGsheetSecretFromKeyFile(ClientContext &conte
 	return std::move(result);
 }
 
-#ifdef DUCKDB_CPP_EXTENSION_ENTRY
-void CreateGsheetSecretFunctions::Register(ExtensionLoader &loader)
-#else
-void CreateGsheetSecretFunctions::Register(DatabaseInstance &db)
-#endif
-{
+void CreateGsheetSecretFunctions::Register(ExtensionLoader &loader) {
 	string type = "gsheet";
 
 	// Register the new type
@@ -146,17 +137,10 @@ void CreateGsheetSecretFunctions::Register(DatabaseInstance &db)
 	key_file_function.named_parameters["filepath"] = LogicalType::VARCHAR;
 	RegisterCommonSecretParameters(key_file_function);
 
-#ifdef DUCKDB_CPP_EXTENSION_ENTRY
 	loader.RegisterSecretType(secret_type);
 	loader.RegisterFunction(access_token_function);
 	loader.RegisterFunction(oauth_function);
 	loader.RegisterFunction(key_file_function);
-#else
-	ExtensionUtil::RegisterSecretType(db, secret_type);
-	ExtensionUtil::RegisterFunction(db, access_token_function);
-	ExtensionUtil::RegisterFunction(db, oauth_function);
-	ExtensionUtil::RegisterFunction(db, key_file_function);
-#endif
 }
 
 std::string InitiateOAuthFlow() {

extension-ci-tools

@@ -2,10 +2,6 @@
 
 #include "duckdb.hpp"
 
-#ifndef DUCKDB_CPP_EXTENSION_ENTRY
-#include "duckdb/main/extension_util.hpp"
-#endif
-
 #include "duckdb/parser/expression/constant_expression.hpp"
 #include "duckdb/parser/expression/function_expression.hpp"
 #include "duckdb/parser/tableref/table_function_ref.hpp"
@@ -51,11 +47,7 @@ unique_ptr<TableRef> ReadSheetReplacement(ClientContext &context, ReplacementSca
 	return std::move(table_function);
 }
 
-#ifdef DUCKDB_CPP_EXTENSION_ENTRY
 static void LoadInternal(ExtensionLoader &loader) {
-#else
-static void LoadInternal(DatabaseInstance &db) {
-#endif
 	// Initialize OpenSSL
 	SSL_library_init();
 	SSL_load_error_strings();
@@ -70,30 +62,17 @@ static void LoadInternal(DatabaseInstance &db) {
 
 	GSheetCopyFunction gsheet_copy_function;
 
-#ifdef DUCKDB_CPP_EXTENSION_ENTRY
 	loader.RegisterFunction(read_gsheet_function);
 	loader.RegisterFunction(gsheet_copy_function);
 	CreateGsheetSecretFunctions::Register(loader);
 	auto &config = DBConfig::GetConfig(loader.GetDatabaseInstance());
-#else
-	ExtensionUtil::RegisterFunction(db, read_gsheet_function);
-	ExtensionUtil::RegisterFunction(db, gsheet_copy_function);
-	CreateGsheetSecretFunctions::Register(db);
-	auto &config = DBConfig::GetConfig(db);
-#endif
 
 	config.replacement_scans.emplace_back(ReadSheetReplacement);
 }
 
-#ifdef DUCKDB_CPP_EXTENSION_ENTRY
 void GsheetsExtension::Load(ExtensionLoader &loader) {
 	LoadInternal(loader);
 }
-#else
-void GsheetsExtension::Load(DuckDB &db) {
-	LoadInternal(*db.instance);
-}
-#endif
 
 std::string GsheetsExtension::Name() {
 	return "gsheets";
@@ -111,20 +90,9 @@ std::string GsheetsExtension::Version() const {
 
 extern "C" {
 
-#ifdef DUCKDB_CPP_EXTENSION_ENTRY
 DUCKDB_CPP_EXTENSION_ENTRY(gsheets, loader) {
 	duckdb::LoadInternal(loader);
 }
-#else
-DUCKDB_EXTENSION_API void gsheets_init(duckdb::DatabaseInstance &db) {
-	duckdb::DuckDB db_wrapper(db);
-	db_wrapper.LoadExtension<duckdb::GsheetsExtension>();
-}
-
-DUCKDB_EXTENSION_API const char *gsheets_version() {
-	return duckdb::DuckDB::LibraryVersion();
-}
-#endif
 }
 
 #ifndef DUCKDB_EXTENSION_MAIN

src/gsheets_auth.cpp

@@ -267,7 +267,7 @@ unique_ptr<FunctionData> ReadSheetBind(ClientContext &context, TableFunctionBind
 	bind_data->names = names;
 	bind_data->return_types = return_types;
 
-	return bind_data;
+	return std::move(bind_data);
 }
 
 } // namespace duckdb

src/gsheets_extension.cpp

@@ -1,8 +1,9 @@
 #pragma once
 
-#include <string>
 #include "duckdb.hpp"
 
+#include <string>
+
 namespace duckdb {
 
 std::string read_token_from_file(const std::string &file_path);
@@ -11,12 +12,7 @@ std::string InitiateOAuthFlow();
 
 struct CreateGsheetSecretFunctions {
 public:
-	//! Register all CreateSecretFunctions
-#ifdef DUCKDB_CPP_EXTENSION_ENTRY
 	static void Register(ExtensionLoader &loader);
-#else
-	static void Register(DatabaseInstance &db);
-#endif
 };
 
 } // namespace duckdb

src/gsheets_read.cpp

@@ -6,11 +6,7 @@ namespace duckdb {
 
 class GsheetsExtension : public Extension {
 public:
-#ifdef DUCKDB_CPP_EXTENSION_ENTRY
 	void Load(ExtensionLoader &loader) override;
-#else
-	void Load(DuckDB &db) override;
-#endif
 	std::string Name() override;
 	std::string Version() const override;
 };