cleanup changes to extension updating

duckdb · Mytherin · May 21, 2024 · Jan 2, 2024 · Feb 2, 2024 · Feb 2, 2024
commit 4bcc31e5cf6816700d2d734d4cfd7cb9463709b1
diff --git a/src/include/duckdb/main/database.hpp b/src/include/duckdb/main/database.hpp
@@ -28,7 +28,7 @@ class ObjectCache;
 struct AttachInfo;
 class DatabaseFileSystem;
 
-class DatabaseInstance : public std::enable_shared_from_this<DatabaseInstance> {
+class DatabaseInstance : public enable_shared_from_this<DatabaseInstance> {
 	friend class DuckDB;
 
 public:

diff --git a/src/main/extension/extension_install.cpp b/src/main/extension/extension_install.cpp
@@ -366,24 +366,20 @@ static unique_ptr<ExtensionInstallInfo> InstallFromHttpUrl(DBConfig &config, con
 }
 
 // Install an extension using a hand-rolled http request
-static unique_ptr<ExtensionInstallInfo> InstallFromHttpRepository(DBConfig &config, const string &url,
-                                                                  const string &extension_name,
-                                                                  const string &repository_url, const string &temp_path,
-                                                                  const string &local_extension_path,
-                                                                  const string &version, bool force_install,
-                                                                  optional_ptr<HTTPLogger> http_logger) {
+static unique_ptr<ExtensionInstallInfo>
+InstallFromHttpRepository(DBConfig &config, const string &url, const string &extension_name,
+                          const string &repository_url, const string &temp_path, const string &local_extension_path,
+                          const string &version, bool force_install, optional_ptr<HTTPLogger> http_logger) {
 	string url_template = ExtensionHelper::ExtensionUrlTemplate(&config, repository_url, version);
 	string generated_url = ExtensionHelper::ExtensionFinalizeUrlTemplate(url_template, extension_name);
 	return InstallFromHttpUrl(config, generated_url, extension_name, repository_url, temp_path, local_extension_path,
 	                          force_install, http_logger);
 }
 
-unique_ptr<ExtensionInstallInfo> ExtensionHelper::InstallExtensionInternal(DBConfig &config, FileSystem &fs,
-                                                                           const string &local_path,
-                                                                           const string &extension, bool force_install,
-                                                                           const string &repository,
-                                                                           const string &version,
-                                                                           optional_ptr<HTTPLogger> http_logger) {
+unique_ptr<ExtensionInstallInfo>
+ExtensionHelper::InstallExtensionInternal(DBConfig &config, FileSystem &fs, const string &local_path,
+                                          const string &extension, bool force_install, const string &repository,
+                                          const string &version, optional_ptr<HTTPLogger> http_logger) {
 #ifdef DUCKDB_DISABLE_EXTENSION_LOAD
 	throw PermissionException("Installing external extensions is disabled through a compile time flag");
 #else
@@ -434,8 +430,8 @@ unique_ptr<ExtensionInstallInfo> ExtensionHelper::InstallExtensionInternal(DBCon
 
 	if (StringUtil::StartsWith(extension, "http://")) {
 		// Extension is a full http:// path
-		return InstallFromHttpUrl(config, extension, extension_name, "", temp_path, local_extension_path,
-		                          force_install, http_logger);
+		return InstallFromHttpUrl(config, extension, extension_name, "", temp_path, local_extension_path, force_install,
+		                          http_logger);
 	} else {
 		// Extension is a regular remote repository
 		return InstallFromHttpRepository(config, extension, extension_name, repository_url, temp_path,

diff --git a/src/main/extension/extension_load.cpp b/src/main/extension/extension_load.cpp
@@ -284,13 +284,14 @@ bool ExtensionHelper::TryInitialLoad(DBConfig &config, FileSystem &fs, const str
 
 	auto lowercase_extension_name = StringUtil::Lower(filebase);
 
+	// Initialize the ExtensionInitResult
+	result.filebase = lowercase_extension_name;
+	result.filename = filename;
+	result.lib_hdl = lib_hdl;
+
 	if (!direct_load) {
 		auto info_file_name = filename + ".info";
 
-		result.filebase = lowercase_extension_name;
-		result.filename = filename;
-		result.lib_hdl = lib_hdl;
-
 		// If there's an info file, we parse that for some more metadata
 		if (fs.FileExists(info_file_name)) {
 			auto file_reader = BufferedFileReader(fs, info_file_name.c_str());
@@ -307,6 +308,7 @@ bool ExtensionHelper::TryInitialLoad(DBConfig &config, FileSystem &fs, const str
 		result.install_info = make_uniq<ExtensionInstallInfo>();
 		result.install_info->mode = ExtensionInstallMode::NOT_INSTALLED;
 		result.install_info->full_path = filename;
+		result.install_info->version = parsed_metadata.extension_version;
 	}
 
 	return true;

diff --git a/test/extension/update_extensions_ci.test b/test/extension/update_extensions_ci.test
@@ -38,7 +38,7 @@ query IIII rowsort
 SELECT extension_name, install_mode, installed_from, extension_version FROM duckdb_extensions() where installed and extension_name != 'jemalloc'
 ----
 json	REPOSITORY	./build/extension_metadata_test_data/repository	v0.0.1
-parquet	(empty)	(empty)	(empty)
+parquet	STATICALLY_LINKED	(empty)	(empty)
 tpcds	CUSTOM_PATH	./build/extension_metadata_test_data/direct_install/tpcds.duckdb_extension	v0.0.1
 tpch	REPOSITORY	./build/extension_metadata_test_data/repository	v0.0.1
 
@@ -55,7 +55,7 @@ query IIII rowsort
 SELECT extension_name, install_mode, installed_from, extension_version FROM duckdb_extensions() where installed and extension_name != 'jemalloc'
 ----
 json	REPOSITORY	./build/extension_metadata_test_data/repository	v0.0.1
-parquet	(empty)	(empty)	(empty)
+parquet	STATICALLY_LINKED	(empty)	(empty)
 tpcds	CUSTOM_PATH	./build/extension_metadata_test_data/direct_install/tpcds.duckdb_extension	v0.0.1
 tpch	REPOSITORY	./build/extension_metadata_test_data/repository	v0.0.2
 
@@ -81,7 +81,7 @@ query IIII rowsort
 SELECT extension_name, install_mode, installed_from, extension_version FROM duckdb_extensions() where installed and extension_name != 'jemalloc'
 ----
 json	REPOSITORY	./build/extension_metadata_test_data/repository	v0.0.1
-parquet	(empty)	(empty)	(empty)
+parquet	STATICALLY_LINKED	(empty)	(empty)
 tpcds	CUSTOM_PATH	./build/extension_metadata_test_data/direct_install/tpcds.duckdb_extension	v0.0.1
 tpch	REPOSITORY	./build/extension_metadata_test_data/repository	v0.0.2
 
@@ -165,4 +165,4 @@ FORCE INSTALL '${DIRECT_INSTALL_DIR}/json.duckdb_extension';
 statement error
 LOAD json;
 ----
- Also, the file was built for the platform 'test_platform', but we can only load extensions built for platform
+ Also, the file was built for the platform 'test_platform', but we can only load extensions built for platform
diff --git a/test/tmp.test b/test/tmp.test