Skip to content

Update vendored DuckDB sources to 46f1c14caa #885

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.

Sign up for GitHub

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

Merged
github-actions merged 1 commit into from
Sep 26, 2026
Merged

Update vendored DuckDB sources to 46f1c14caa #885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/duckdb/src/function/table/version/pragma_version.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef DUCKDB_PATCH_VERSION
#define DUCKDB_PATCH_VERSION "6-dev202"
#define DUCKDB_PATCH_VERSION "6-dev212"
#endif
#ifndef DUCKDB_MINOR_VERSION
#define DUCKDB_MINOR_VERSION 5
Expand All @@ -8,10 +8,10 @@
#define DUCKDB_MAJOR_VERSION 1
#endif
#ifndef DUCKDB_VERSION
#define DUCKDB_VERSION "v1.5.6-dev202"
#define DUCKDB_VERSION "v1.5.6-dev212"
#endif
#ifndef DUCKDB_SOURCE_ID
#define DUCKDB_SOURCE_ID "24a2504a38"
#define DUCKDB_SOURCE_ID "46f1c14caa"
#endif
#include "duckdb/function/table/system_functions.hpp"
#include "duckdb/main/database.hpp"
Expand Down
13 changes: 11 additions & 2 deletions src/duckdb/src/storage/single_file_block_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,15 @@ void SingleFileBlockManager::CheckAndAddEncryptionKey(MainHeader &main_header) {
return CheckAndAddEncryptionKey(main_header, *options.encryption_options.user_key);
}

//! Open through the client file system when available, so session settings and logger apply
static FileSystem &GetDatabaseFileSystem(QueryContext context, AttachedDatabase &db) {
auto client_context = context.GetClientContext();
if (client_context) {
return FileSystem::GetFileSystem(*client_context);
}
return FileSystem::Get(db);
}

void SingleFileBlockManager::CreateNewDatabase(QueryContext context) {
auto flags = GetFileFlags(true);

Expand All @@ -471,7 +480,7 @@ void SingleFileBlockManager::CreateNewDatabase(QueryContext context) {
}

// open the RDBMS handle
auto &fs = FileSystem::Get(db);
auto &fs = GetDatabaseFileSystem(context, db);
handle = fs.OpenFile(path, flags);
header_buffer.Clear();

Expand Down Expand Up @@ -573,7 +582,7 @@ void SingleFileBlockManager::LoadExistingDatabase(QueryContext context) {
auto flags = GetFileFlags(false);

// open the RDBMS handle
auto &fs = FileSystem::Get(db);
auto &fs = GetDatabaseFileSystem(context, db);
handle = fs.OpenFile(path, flags);
if (!handle) {
// this can only happen in read-only mode - as that is when we set FILE_FLAGS_NULL_IF_NOT_EXISTS
Expand Down
12 changes: 6 additions & 6 deletions src/duckdb/ub_extension_icu_third_party_icu_i18n.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,17 +348,17 @@

#include "extension/icu/third_party/icu/i18n/wintzimpl.cpp"

#include "extension/icu/third_party/icu/i18n/double-conversion-double-to-string.cpp"

#include "extension/icu/third_party/icu/i18n/double-conversion-cached-powers.cpp"
#include "extension/icu/third_party/icu/i18n/double-conversion-strtod.cpp"

#include "extension/icu/third_party/icu/i18n/double-conversion-fast-dtoa.cpp"

#include "extension/icu/third_party/icu/i18n/double-conversion-strtod.cpp"
#include "extension/icu/third_party/icu/i18n/double-conversion-double-to-string.cpp"

#include "extension/icu/third_party/icu/i18n/double-conversion-string-to-double.cpp"

#include "extension/icu/third_party/icu/i18n/double-conversion-cached-powers.cpp"

#include "extension/icu/third_party/icu/i18n/double-conversion-bignum-dtoa.cpp"

#include "extension/icu/third_party/icu/i18n/double-conversion-bignum.cpp"

#include "extension/icu/third_party/icu/i18n/double-conversion-string-to-double.cpp"

Loading