Merge pull request #72 from carlopi/apply_patches

carlopi · web-flow · commit 64f3bfa2743c · 2025-07-02T11:15:51.000+02:00
Apply patch from duckdb/duckdb#18107
diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml
@@ -17,7 +17,7 @@ jobs:
     uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
     with:
       extension_name: httpfs
-      duckdb_version: v1.3.1
+      duckdb_version: v1.3-ossivalis
       ci_tools_version: main
       exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads'
 
@@ -29,7 +29,7 @@ jobs:
     secrets: inherit
     with:
       extension_name: httpfs
-      duckdb_version: v1.3.1
+      duckdb_version: v1.3-ossivalis
       ci_tools_version: main
       deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}
       exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads'
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,`