Skip to content

Commit

Permalink
chore: Update vendored sources to duckdb/duckdb@e2e2897
Browse files Browse the repository at this point in the history
Merge pull request duckdb/duckdb#9817 from samansmink/add-s3a-s3n
  • Loading branch information
krlmlr committed Dec 14, 2023
1 parent 4345fa8 commit 0f153df
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 9 deletions.
2 changes: 1 addition & 1 deletion src/duckdb/src/common/file_system.cpp
Expand Up @@ -544,7 +544,7 @@ FileType FileHandle::GetType() {
}

bool FileSystem::IsRemoteFile(const string &path) {
const string prefixes[] = {"http://", "https://", "s3://", "gcs://", "r2://"};
const string prefixes[] = {"http://", "https://", "s3://", "s3a://", "s3n://", "gcs://", "r2://"};
for (auto &prefix : prefixes) {
if (StringUtil::StartsWith(path, prefix)) {
return true;
Expand Down
4 changes: 2 additions & 2 deletions src/duckdb/src/function/table/version/pragma_version.cpp
@@ -1,8 +1,8 @@
#ifndef DUCKDB_VERSION
#define DUCKDB_VERSION "v0.9.3-dev920"
#define DUCKDB_VERSION "v0.9.3-dev923"
#endif
#ifndef DUCKDB_SOURCE_ID
#define DUCKDB_SOURCE_ID "2d710dec0c"
#define DUCKDB_SOURCE_ID "e2e2897cbd"
#endif
#include "duckdb/function/table/system_functions.hpp"
#include "duckdb/main/database.hpp"
Expand Down
9 changes: 3 additions & 6 deletions src/duckdb/src/include/duckdb/main/extension_entries.hpp
Expand Up @@ -275,12 +275,9 @@ static constexpr ExtensionEntry EXTENSION_COLLATIONS[] = {
// Note: these are currently hardcoded in scripts/generate_extensions_function.py
// TODO: automate by passing though to script via duckdb
static constexpr ExtensionEntry EXTENSION_FILE_PREFIXES[] = {
{"http://", "httpfs"},
{"https://", "httpfs"},
{"s3://", "httpfs"},
{"gcs://", "httpfs"},
{"r2://", "httpfs"} // , {"azure://", "azure"}
}; // END_OF_EXTENSION_FILE_PREFIXES
{"http://", "httpfs"}, {"https://", "httpfs"}, {"s3://", "httpfs"}, {"s3a://", "httpfs"},
{"s3n://", "httpfs"}, {"gcs://", "httpfs"}, {"r2://", "httpfs"} // , {"azure://", "azure"}
}; // END_OF_EXTENSION_FILE_PREFIXES

// Note: these are currently hardcoded in scripts/generate_extensions_function.py
// TODO: automate by passing though to script via duckdb
Expand Down

0 comments on commit 0f153df

Please sign in to comment.