Apply patch from duckdb/duckdb#18107

carlopi · carlopi · commit a971a7638b23 · 2025-07-01T22:25:28.000+02:00
diff --git a/duckdb b/duckdb
@@ -1 +1 @@
-Subproject commit 2063dda3e6bd955c364ce8e61939c6248a907be6
+Subproject commit 03a2ddf09ed827ad7a95b43d296dd0dd63b1e462
diff --git a/extension/httpfs/httpfs.cpp b/extension/httpfs/httpfs.cpp
@@ -23,13 +23,9 @@ namespace duckdb {
 
 shared_ptr<HTTPUtil> HTTPFSUtil::GetHTTPUtil(optional_ptr<FileOpener> opener) {
 	if (opener) {
-		auto db = opener->TryGetDatabase();
-		if (db) {
-			auto &config = DBConfig::GetConfig(*db);
-			return config.http_util;
-		}
+		return opener->GetHTTPUtil();
 	}
-	return make_shared_ptr<HTTPFSUtil>();
+	throw InternalException("FileOpener not provided, can't get HTTPUtil");
 }
 
 unique_ptr<HTTPParams> HTTPFSUtil::InitializeParameters(optional_ptr<FileOpener> opener,

Original file line number	Diff line number	Diff line change
`@@ -23,13 +23,9 @@ namespace duckdb {`
`23`	`23`
`24`	`24`	`shared_ptr<HTTPUtil> HTTPFSUtil::GetHTTPUtil(optional_ptr<FileOpener> opener) {`
`25`	`25`	`if (opener) {`
`26`		`- auto db = opener->TryGetDatabase();`
`27`		`- if (db) {`
`28`		`- auto &config = DBConfig::GetConfig(*db);`
`29`		`- return config.http_util;`
`30`		`- }`
	`26`	`+ return opener->GetHTTPUtil();`
`31`	`27`	`}`
`32`		`- return make_shared_ptr<HTTPFSUtil>();`
	`28`	`+ throw InternalException("FileOpener not provided, can't get HTTPUtil");`
`33`	`29`	`}`
`34`	`30`
`35`	`31`	`unique_ptr<HTTPParams> HTTPFSUtil::InitializeParameters(optional_ptr<FileOpener> opener,`