Merge pull request #12 from carlopi/bumpandpatch

Bump DuckDB and make so aws (and httpfs) can be autoloaded
duckdb · Sep 13, 2023 · 348ae26 · 348ae26
2 parents a1f6541 + 16bb575
commit 348ae26
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/duckdb b/duckdb
diff --git a/src/aws_extension.cpp b/src/aws_extension.cpp
@@ -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>
@@ -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");
 	}
 

diff --git a/test/sql/aws_errors.test b/test/sql/aws_errors.test
@@ -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();