Merge pull request #132 from samansmink/v1.4-andium-prep

Create v1.4-andium branch for upcoming v1.4.0 release

Author: samansmink

.github/workflows/MainDistributionPipeline.yml

@@ -4,7 +4,6 @@
 name: Main Extension Distribution Pipeline
 on:
   push:
-    branches: [main]
   pull_request:
   workflow_dispatch:
 
@@ -16,15 +15,15 @@ jobs:
   duckdb-next-build:
     name: Build extension binaries
     uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
-    if: false   # extension-template is currently not compatible with main
-    with:
-      duckdb_version: main
-      ci_tools_version: main
+    with:`
+      duckdb_version: v1.4-andium
       extension_name: quack
+      ci_tools_version: main
 
   duckdb-stable-build:
     name: Build extension binaries
     uses: duckdb/extension-ci-tools/.github/workflows/[email protected]
+    if: false # This branch is not compatible with latest stable, TODO: remove when merging this branch back into main
     with:
       duckdb_version: v1.3.2
       ci_tools_version: v1.3.2
@@ -34,7 +33,7 @@ jobs:
     name: Code Quality Check
     uses: duckdb/extension-ci-tools/.github/workflows/_extension_code_quality.yml@main
     with:
-      duckdb_version: v1.3.2
+      duckdb_version: main # TODO: revert to latest stable probably
       ci_tools_version: main
       extension_name: quack
       format_checks: 'format;tidy'

duckdb

@@ -6,7 +6,7 @@ namespace duckdb {
 
 class QuackExtension : public Extension {
 public:
-	void Load(DuckDB &db) override;
+	void Load(ExtensionLoader &db) override;
 	std::string Name() override;
 	std::string Version() const override;
 };

extension-ci-tools

@@ -3,9 +3,7 @@
 #include "quack_extension.hpp"
 #include "duckdb.hpp"
 #include "duckdb/common/exception.hpp"
-#include "duckdb/common/string_util.hpp"
 #include "duckdb/function/scalar_function.hpp"
-#include "duckdb/main/extension_util.hpp"
 #include <duckdb/parser/parsed_data/create_scalar_function_info.hpp>
 
 // OpenSSL linked through vcpkg
@@ -28,19 +26,19 @@ inline void QuackOpenSSLVersionScalarFun(DataChunk &args, ExpressionState &state
 	});
 }
 
-static void LoadInternal(DatabaseInstance &instance) {
+static void LoadInternal(ExtensionLoader &loader) {
 	// Register a scalar function
 	auto quack_scalar_function = ScalarFunction("quack", {LogicalType::VARCHAR}, LogicalType::VARCHAR, QuackScalarFun);
-	ExtensionUtil::RegisterFunction(instance, quack_scalar_function);
+	loader.RegisterFunction(quack_scalar_function);
 
 	// Register another scalar function
 	auto quack_openssl_version_scalar_function = ScalarFunction("quack_openssl_version", {LogicalType::VARCHAR},
 	                                                            LogicalType::VARCHAR, QuackOpenSSLVersionScalarFun);
-	ExtensionUtil::RegisterFunction(instance, quack_openssl_version_scalar_function);
+	loader.RegisterFunction(quack_openssl_version_scalar_function);
 }
 
-void QuackExtension::Load(DuckDB &db) {
-	LoadInternal(*db.instance);
+void QuackExtension::Load(ExtensionLoader &loader) {
+	LoadInternal(loader);
 }
 std::string QuackExtension::Name() {
 	return "quack";
@@ -58,16 +56,7 @@ std::string QuackExtension::Version() const {
 
 extern "C" {
 
-DUCKDB_EXTENSION_API void quack_init(duckdb::DatabaseInstance &db) {
-	duckdb::DuckDB db_wrapper(db);
-	db_wrapper.LoadExtension<duckdb::QuackExtension>();
-}
-
-DUCKDB_EXTENSION_API const char *quack_version() {
-	return duckdb::DuckDB::LibraryVersion();
+DUCKDB_CPP_EXTENSION_ENTRY(quack, loader) {
+	duckdb::LoadInternal(loader);
 }
 }
-
-#ifndef DUCKDB_EXTENSION_MAIN
-#error DUCKDB_EXTENSION_MAIN not defined
-#endif

src/include/quack_extension.hpp

@@ -5,6 +5,9 @@
         "vcpkg-configuration": {
                 "overlay-ports": [
                         "./extension-ci-tools/vcpkg_ports"
+                ],
+                "overlay-triplets": [
+                        "./extension-ci-tools/toolchains"
                 ]
         }
 }