duckdb 0.6.2-dev2115.0 → 0.6.2-dev2226.0

package/src/duckdb/ub_src_main.cpp

@@ -34,8 +34,6 @@
 
 #include "src/main/relation.cpp"
 
-#include "src/main/extension_prefix_opener.cpp"
-
 #include "src/main/query_profiler.cpp"
 
 #include "src/main/query_result.cpp"

package/src/duckdb/ub_src_main_relation.cpp

@@ -42,5 +42,7 @@
 
 #include "src/main/relation/view_relation.cpp"
 
+#include "src/main/relation/write_parquet_relation.cpp"
+
 #include "src/main/relation/write_csv_relation.cpp"
 

package/src/duckdb/src/include/duckdb/function/replacement_open.hpp

@@ -1,54 +0,0 @@
-//===----------------------------------------------------------------------===//
-//                         DuckDB
-//
-// duckdb/function/replacement_scan.hpp
-//
-//
-//===----------------------------------------------------------------------===//
-
-#pragma once
-
-#include "duckdb/common/common.hpp"
-#include "duckdb/storage/storage_extension.hpp"
-
-namespace duckdb {
-
-class DatabaseInstance;
-class StorageExtension;
-struct DBConfig;
-
-struct ReplacementOpenData {
-	virtual ~ReplacementOpenData() {
-	}
-
-	virtual bool HasStorageExtension() {
-		return false;
-	}
-	virtual unique_ptr<StorageExtension> GetStorageExtension(AttachInfo &info) {
-		return nullptr;
-	}
-};
-
-struct ReplacementOpenStaticData {
-	virtual ~ReplacementOpenStaticData() {
-	}
-};
-
-typedef unique_ptr<ReplacementOpenData> (*replacement_open_pre_t)(DBConfig &config,
-                                                                  ReplacementOpenStaticData *static_data);
-typedef void (*replacement_open_post_t)(DatabaseInstance &instance, ReplacementOpenData *open_data);
-
-struct ReplacementOpen {
-	explicit ReplacementOpen(replacement_open_pre_t pre_func, replacement_open_post_t post_func)
-	    : pre_func(pre_func), post_func(post_func), data(nullptr) {
-	}
-
-	replacement_open_pre_t pre_func;
-	replacement_open_post_t post_func;
-
-	unique_ptr<ReplacementOpenData> data;
-
-	shared_ptr<ReplacementOpenStaticData> static_data;
-};
-
-} // namespace duckdb

package/src/duckdb/src/include/duckdb/main/replacement_opens.hpp

@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//                         DuckDB
-//
-// duckdb/main/extension_helper.hpp
-//
-//
-//===----------------------------------------------------------------------===//
-
-#pragma once
-
-#include "duckdb/function/replacement_open.hpp"
-
-namespace duckdb {
-
-class ExtensionPrefixReplacementOpen : public ReplacementOpen {
-public:
-	ExtensionPrefixReplacementOpen();
-};
-
-} // namespace duckdb

package/src/duckdb/src/main/extension_prefix_opener.cpp

@@ -1,55 +0,0 @@
-#include "duckdb/main/replacement_opens.hpp"
-#include "duckdb.hpp"
-#include "duckdb/common/virtual_file_system.hpp"
-#include "duckdb/main/extension_helper.hpp"
-
-namespace duckdb {
-
-struct ExtensionPrefixOpenData : public ReplacementOpenData {
-	ExtensionPrefixOpenData(string extension, string path, unique_ptr<ReplacementOpenData> data)
-	    : extension(std::move(extension)), path(std::move(path)), data(std::move(data)) {
-	}
-	string extension;
-	string path;
-	unique_ptr<ReplacementOpenData> data;
-
-	bool HasStorageExtension() override {
-		return data->HasStorageExtension();
-	}
-	unique_ptr<StorageExtension> GetStorageExtension(AttachInfo &info) override {
-		return data->GetStorageExtension(info);
-	}
-};
-
-static unique_ptr<ReplacementOpenData> ExtensionPrefixPreOpen(DBConfig &config, ReplacementOpenStaticData *) {
-	auto path = config.options.database_path;
-	string extension = ExtensionHelper::ExtractExtensionPrefixFromPath(path);
-	if (extension.empty()) {
-		return nullptr;
-	}
-	auto extension_data = ExtensionHelper::ReplacementOpenPre(extension, config);
-	if (extension_data) {
-		config.options.database_path = StringUtil::Replace(config.options.database_path, extension + ":", "");
-		return make_unique<ExtensionPrefixOpenData>(extension, path, std::move(extension_data));
-	}
-	return nullptr;
-}
-
-static void ExtensionPrefixPostOpen(DatabaseInstance &instance, ReplacementOpenData *open_data) {
-	if (!open_data) {
-		return;
-	}
-	D_ASSERT(open_data);
-	auto prefix_open_data = (ExtensionPrefixOpenData *)open_data;
-
-	Connection con(instance);
-	ExtensionHelper::LoadExternalExtension(*con.context, prefix_open_data->extension);
-	ExtensionHelper::ReplacementOpenPost(*con.context, prefix_open_data->extension, instance,
-	                                     prefix_open_data->data.get());
-}
-
-ExtensionPrefixReplacementOpen::ExtensionPrefixReplacementOpen()
-    : ReplacementOpen(ExtensionPrefixPreOpen, ExtensionPrefixPostOpen) {
-}
-
-} // namespace duckdb