Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert PR #1672 on avoid httpfs errors #1686

Merged
merged 2 commits into from
Apr 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 0 additions & 36 deletions duckdb.patch
Original file line number Diff line number Diff line change
Expand Up @@ -33,42 +33,6 @@ index aebc060c3b..12611048b0 100644
)
endif()
endfunction()
diff --git a/src/include/duckdb/main/extension_entries.hpp b/src/include/duckdb/main/extension_entries.hpp
index 3b84b1544e..c1037aa7b6 100644
--- a/src/include/duckdb/main/extension_entries.hpp
+++ b/src/include/duckdb/main/extension_entries.hpp
@@ -243,6 +243,7 @@ static constexpr ExtensionEntry EXTENSION_SETTINGS[] = {
{"binary_as_string", "parquet"},
{"ca_cert_file", "httpfs"},
{"calendar", "icu"},
+#ifndef EMSCRIPTEN
{"enable_server_cert_verification", "httpfs"},
{"force_download", "httpfs"},
{"http_keep_alive", "httpfs"},
@@ -250,6 +251,7 @@ static constexpr ExtensionEntry EXTENSION_SETTINGS[] = {
{"http_retry_backoff", "httpfs"},
{"http_retry_wait_ms", "httpfs"},
{"http_timeout", "httpfs"},
+#endif
{"pg_array_as_varchar", "postgres_scanner"},
{"pg_connection_cache", "postgres_scanner"},
{"pg_connection_limit", "postgres_scanner"},
@@ -257,6 +259,7 @@ static constexpr ExtensionEntry EXTENSION_SETTINGS[] = {
{"pg_experimental_filter_pushdown", "postgres_scanner"},
{"pg_pages_per_task", "postgres_scanner"},
{"pg_use_binary_copy", "postgres_scanner"},
+#ifndef EMSCRIPTEN
{"s3_access_key_id", "httpfs"},
{"s3_endpoint", "httpfs"},
{"s3_region", "httpfs"},
@@ -268,6 +271,7 @@ static constexpr ExtensionEntry EXTENSION_SETTINGS[] = {
{"s3_url_compatibility_mode", "httpfs"},
{"s3_url_style", "httpfs"},
{"s3_use_ssl", "httpfs"},
+#endif
{"sqlite_all_varchar", "sqlite_scanner"},
{"timezone", "icu"},
}; // END_OF_EXTENSION_SETTINGS
diff --git a/src/main/extension/extension_load.cpp b/src/main/extension/extension_load.cpp
index a001f2b997..c532db1b2d 100644
--- a/src/main/extension/extension_load.cpp
Expand Down
9 changes: 0 additions & 9 deletions packages/duckdb-wasm/test/httpfs_test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -312,14 +312,5 @@ export function testHTTPFSAsync(
),
).toBeRejectedWithError('Invalid Error: File is not opened in write mode');
});

it('avoid autoloading on not supported httpfs settings', async () => {
await setAwsConfig(conn!);
await expectAsync(
conn!.query(
`set s3_url_style = 'path';`,
),
).toBeRejectedWithError(/Catalog Error: unrecognized configuration parameter "s3_url_style"/);
});
});
}