fix: changes for 1.4

Author: rustyconover

duckdb

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

src/include/textplot_extension.hpp

@@ -1,6 +1,5 @@
 #include "textplot_bar.hpp"
 #include "duckdb/common/string_util.hpp"
-#include "duckdb/main/extension_util.hpp"
 #include "duckdb/function/scalar_function.hpp"
 #include "duckdb/common/vector_operations/unary_executor.hpp"
 #include "duckdb/planner/expression/bound_function_expression.hpp"

src/textplot_bar.cpp

@@ -1,6 +1,5 @@
 #include "textplot_density.hpp"
 #include "duckdb/common/string_util.hpp"
-#include "duckdb/main/extension_util.hpp"
 #include "duckdb/function/scalar_function.hpp"
 #include "duckdb/common/vector_operations/unary_executor.hpp"
 #include "duckdb/planner/expression/bound_function_expression.hpp"

src/textplot_density.cpp

@@ -4,36 +4,33 @@
 #include "textplot_sparkline.hpp"
 #include "textplot_qr.hpp"
 #include "duckdb.hpp"
-#include "duckdb/main/extension_util.hpp"
 #include "duckdb/function/scalar_function.hpp"
 
 namespace duckdb {
 
-static void LoadInternal(DatabaseInstance &instance) {
+static void LoadInternal(ExtensionLoader &loader) {
 	auto bar_function = ScalarFunction("tp_bar", {LogicalType::DOUBLE}, LogicalType::VARCHAR, TextplotBar,
 	                                   TextplotBarBind, nullptr, nullptr, nullptr, LogicalType(LogicalTypeId::ANY));
-	ExtensionUtil::RegisterFunction(instance, bar_function);
+	loader.RegisterFunction(bar_function);
 
 	auto qr_function = ScalarFunction("tp_qr", {LogicalType::VARCHAR}, LogicalType::VARCHAR, TextplotQR, TextplotQRBind,
 	                                  nullptr, nullptr, nullptr, LogicalType(LogicalTypeId::ANY));
-	ExtensionUtil::RegisterFunction(instance, qr_function);
+	loader.RegisterFunction(qr_function);
 
 	// Lets register a density function.
 	auto density_function =
 	    ScalarFunction("tp_density", {LogicalType::LIST(LogicalType::DOUBLE)}, LogicalType::VARCHAR, TextplotDensity,
 	                   TextplotDensityBind, nullptr, nullptr, nullptr, LogicalType(LogicalTypeId::ANY));
-	ExtensionUtil::RegisterFunction(instance, density_function);
+	loader.RegisterFunction(density_function);
 
 	auto sparkline_function = ScalarFunction("tp_sparkline", {LogicalType::LIST(LogicalType::DOUBLE)},
 	                                         LogicalType::VARCHAR, TextplotSparkline, TextplotSparklineBind, nullptr,
 	                                         nullptr, nullptr, LogicalType(LogicalTypeId::ANY));
-	ExtensionUtil::RegisterFunction(instance, sparkline_function);
-
-	// Now lets register some macros to make tp_bar easier to use.
+	loader.RegisterFunction(sparkline_function);
 }
 
-void TextplotExtension::Load(DuckDB &db) {
-	LoadInternal(*db.instance);
+void TextplotExtension::Load(ExtensionLoader &loader) {
+	LoadInternal(loader);
 }
 
 std::string TextplotExtension::Name() {
@@ -51,13 +48,7 @@ std::string TextplotExtension::Version() const {
 } // namespace duckdb
 
 extern "C" {
-
-DUCKDB_EXTENSION_API void textplot_init(duckdb::DatabaseInstance &db) {
-	duckdb::DuckDB db_wrapper(db);
-	db_wrapper.LoadExtension<duckdb::TextplotExtension>();
-}
-
-DUCKDB_EXTENSION_API const char *textplot_version() {
-	return duckdb::DuckDB::LibraryVersion();
+DUCKDB_CPP_EXTENSION_ENTRY(textplot, loader) {
+	duckdb::LoadInternal(loader);
 }
 }

src/textplot_extension.cpp

@@ -1,6 +1,5 @@
 #include "textplot_bar.hpp"
 #include "duckdb/common/string_util.hpp"
-#include "duckdb/main/extension_util.hpp"
 #include "duckdb/function/scalar_function.hpp"
 #include "duckdb/common/vector_operations/unary_executor.hpp"
 #include "duckdb/planner/expression/bound_function_expression.hpp"

src/textplot_qr.cpp

@@ -1,6 +1,5 @@
 #include "textplot_sparkline.hpp"
 #include "duckdb/common/string_util.hpp"
-#include "duckdb/main/extension_util.hpp"
 #include "duckdb/function/scalar_function.hpp"
 #include "duckdb/common/vector_operations/unary_executor.hpp"
 #include "duckdb/planner/expression/bound_function_expression.hpp"