Merge pull request #12 from Hugoberry/upgrade-1.4.0

upgrade API call

Author: Hugoberry

duckdb

@@ -9,16 +9,14 @@
 using namespace duckdb;
 
 
-class PbixExtension : public Extension {
+class PbixExtension{
 public:
-	std::string Name() override {
+	static void Load(ExtensionLoader &loader);
+	static std::string Name() {
 		return "pbix";
 	}
-	void Load(DuckDB &db) override;
+	static std::string Version() {
+		return DuckDB::LibraryVersion();
+	}
 };
 
-extern "C" {
-DUCKDB_EXTENSION_API void pbix_init(duckdb::DatabaseInstance &db);
-DUCKDB_EXTENSION_API const char *pbix_version();
-
-}

extension-ci-tools

@@ -8,7 +8,6 @@
 #include "pbix_extension.hpp"
 
 #include "duckdb/catalog/catalog.hpp"
-#include "duckdb/main/extension_util.hpp"
 #include "duckdb/parser/parsed_data/create_table_function_info.hpp"
 
 using namespace duckdb;
@@ -17,24 +16,25 @@ using namespace duckdb;
 extern "C"
 {
 
-    static void LoadInternal(DatabaseInstance &db)
+    static void LoadInternal(ExtensionLoader &loader)
     {
         PbixScanFunction pbix_fun;
-        ExtensionUtil::RegisterFunction(db, pbix_fun);
+        loader.RegisterFunction(pbix_fun);
         PbixReadFunction pbix_read_fun;
-        ExtensionUtil::RegisterFunction(db, pbix_read_fun);
+        loader.RegisterFunction(pbix_read_fun);
+        auto &db = loader.GetDatabaseInstance();
         auto &config = DBConfig::GetConfig(db);
 	    config.AddExtensionOption("pbix_magic_number", "A magic number to accelerate file parsing", LogicalType::INTEGER);
     }
 
-    void PbixExtension::Load(DuckDB &db)
+    void PbixExtension::Load(ExtensionLoader &loader)
     {
-        LoadInternal(*db.instance);
+        LoadInternal(loader);
     }
 
-    DUCKDB_EXTENSION_API void pbix_init(duckdb::DatabaseInstance &db)
+    DUCKDB_CPP_EXTENSION_ENTRY(pbix,loader)
     {
-        LoadInternal(db);
+        LoadInternal(loader);
     }
 
     DUCKDB_EXTENSION_API const char *pbix_version()