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

Bump DuckDB and make so aws (and httpfs) can be autoloaded #12

Merged
merged 3 commits into from
Sep 13, 2023
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
2 changes: 1 addition & 1 deletion duckdb
Submodule duckdb updated 649 files
3 changes: 2 additions & 1 deletion src/aws_extension.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include "aws_extension.hpp"
#include "duckdb.hpp"
#include "duckdb/common/exception.hpp"
#include "duckdb/catalog/catalog.hpp"
#include "duckdb/main/extension_util.hpp"
#include <duckdb/parser/parsed_data/create_scalar_function_info.hpp>
#include <aws/core/Aws.h>
Expand Down Expand Up @@ -104,7 +105,7 @@ static void LoadAWSCredentialsFun(ClientContext &context, TableFunctionInput &da
return;
}

if (!context.db->ExtensionIsLoaded("httpfs")) {
if (!Catalog::TryAutoLoad(context, "httpfs")) {
throw MissingExtensionException("httpfs extension is required for load_aws_credentials");
}

Expand Down
2 changes: 2 additions & 0 deletions test/sql/aws_errors.test
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
# description: test aws extension
# group: [aws]

require no_extension_autoloading

# Before we load the extension, this will fail
statement error
CALL load_aws_credentials();
Expand Down
Loading