fix: changes for 1.4

Author: rustyconover

src/include/shellfs_extension.hpp

@@ -2,12 +2,14 @@
 
 #include "duckdb.hpp"
 
-namespace duckdb {
-
-class ShellfsExtension : public Extension {
-public:
-	void Load(DuckDB &db) override;
-	std::string Name() override;
-};
+namespace duckdb
+{
+
+	class ShellfsExtension : public Extension
+	{
+	public:
+		void Load(ExtensionLoader &loader) override;
+		std::string Name() override;
+	};
 
 } // namespace duckdb

src/shellfs_extension.cpp

@@ -6,43 +6,41 @@
 #include "duckdb/common/exception.hpp"
 #include "duckdb/common/string_util.hpp"
 #include "duckdb/function/scalar_function.hpp"
-#include "duckdb/main/extension_util.hpp"
 
-namespace duckdb {
+namespace duckdb
+{
 
-static void LoadInternal(DatabaseInstance &instance) {
-    // Register a scalar function
-	auto &fs = instance.GetFileSystem();
+	static void LoadInternal(ExtensionLoader &loader)
+	{
+		// Register a scalar function
+		auto &instance = loader.GetDatabaseInstance();
+		auto &fs = instance.GetFileSystem();
 
-	fs.RegisterSubSystem(make_uniq<ShellFileSystem>());
+		fs.RegisterSubSystem(make_uniq<ShellFileSystem>());
 
-	auto &config = DBConfig::GetConfig(instance);
+		auto &config = DBConfig::GetConfig(instance);
 
-    // When writing to a PIPE ignore the SIGPIPE error and consider that the write succeeded.
-	config.AddExtensionOption("ignore_sigpipe", "Ignore SIGPIPE", LogicalType::BOOLEAN, Value(false));
+		// When writing to a PIPE ignore the SIGPIPE error and consider that the write succeeded.
+		config.AddExtensionOption("ignore_sigpipe", "Ignore SIGPIPE", LogicalType::BOOLEAN, Value(false));
+	}
 
-}
-void ShellfsExtension::Load(DuckDB &db) {
-	LoadInternal(*db.instance);
-}
-std::string ShellfsExtension::Name() {
-	return "shellfs";
-}
+	void ShellfsExtension::Load(ExtensionLoader &loader)
+	{
+		LoadInternal(loader);
+	}
 
-} // namespace duckdb
+	std::string ShellfsExtension::Name()
+	{
+		return "shellfs";
+	}
 
-extern "C" {
+} // namespace duckdb
 
-DUCKDB_EXTENSION_API void shellfs_init(duckdb::DatabaseInstance &db) {
-    duckdb::DuckDB db_wrapper(db);
-    db_wrapper.LoadExtension<duckdb::ShellfsExtension>();
-}
+extern "C"
+{
 
-DUCKDB_EXTENSION_API const char *shellfs_version() {
-	return duckdb::DuckDB::LibraryVersion();
+	DUCKDB_CPP_EXTENSION_ENTRY(shellfs, loader)
+	{
+		duckdb::LoadInternal(loader);
+	}
 }
-}
-
-#ifndef DUCKDB_EXTENSION_MAIN
-#error DUCKDB_EXTENSION_MAIN not defined
-#endif