avoid fallback for s3 urls

Author: samansmink

extension/httpfs/httpfs.cpp

@@ -254,7 +254,7 @@ unique_ptr<HTTPResponse> HTTPFileSystem::GetRangeRequest(FileHandle &handle, str
 		    return true;
 	    });
 
-	get_request.try_request = true;
+	get_request.try_request = hfh.auto_fallback_to_full_file_download;
 
 	auto response = http_util.Request(get_request, http_client);
 
@@ -360,8 +360,8 @@ bool HTTPFileSystem::TryRangeRequest(FileHandle &handle, string url, HTTPHeaders
 					return false;
 				}
 
-				error.Throw();
 			}
+			error.Throw();
 		}
 		throw HTTPException(*res, "Request returned HTTP %d for HTTP %s to '%s'",
 									static_cast<int>(res->status), EnumUtil::ToString(RequestType::GET_REQUEST), res->url);

extension/httpfs/include/s3fs.hpp

@@ -116,6 +116,7 @@ class S3FileHandle : public HTTPFileHandle {
 	    : HTTPFileHandle(fs, file, flags, std::move(http_params_p)), auth_params(auth_params_p),
 	      config_params(config_params_p), uploads_in_progress(0), parts_uploaded(0), upload_finalized(false),
 	      uploader_has_error(false), upload_exception(nullptr) {
+		auto_fallback_to_full_file_download = false;
 		if (flags.OpenForReading() && flags.OpenForWriting()) {
 			throw NotImplementedException("Cannot open an HTTP file for both reading and writing");
 		} else if (flags.OpenForAppending()) {

test/sql/secret/secret_refresh.test

@@ -84,7 +84,7 @@ CREATE SECRET s1 (
 statement error
 FROM "s3://test-bucket/test-file.parquet"
 ----
-403
+HTTP Error: HTTP GET error on 'http://test-bucket.duckdb-minio.com:9000/test-file.parquet' (HTTP 403)
 
 query I
 SELECT message[0:46] FROM duckdb_logs WHERE message like '%Successfully refreshed secret%'
@@ -125,7 +125,7 @@ set s3_access_key_id='bogus'
 statement error
 FROM "s3://test-bucket/test-file.parquet"
 ----
-403
+HTTP Error: HTTP GET error on 'http://test-bucket.duckdb-minio.com:9000/test-file.parquet' (HTTP 403)
 
 # -> log empty
 query II