From a9d354bd4af11339793307493f4cb5f4961a6cfd Mon Sep 17 00:00:00 2001 From: DuckDB Labs GitHub Bot Date: Sat, 26 Sep 2026 05:42:19 +0000 Subject: [PATCH] Update vendored DuckDB sources to 46f1c14caa --- .../src/function/table/version/pragma_version.cpp | 6 +++--- .../src/storage/single_file_block_manager.cpp | 13 +++++++++++-- .../ub_extension_icu_third_party_icu_i18n.cpp | 12 ++++++------ 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/src/duckdb/src/function/table/version/pragma_version.cpp b/src/duckdb/src/function/table/version/pragma_version.cpp index 97857a11f..9e39a0133 100644 --- a/src/duckdb/src/function/table/version/pragma_version.cpp +++ b/src/duckdb/src/function/table/version/pragma_version.cpp @@ -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 @@ -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" diff --git a/src/duckdb/src/storage/single_file_block_manager.cpp b/src/duckdb/src/storage/single_file_block_manager.cpp index 77db20e4a..0b0fecd8f 100644 --- a/src/duckdb/src/storage/single_file_block_manager.cpp +++ b/src/duckdb/src/storage/single_file_block_manager.cpp @@ -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); @@ -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(); @@ -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 diff --git a/src/duckdb/ub_extension_icu_third_party_icu_i18n.cpp b/src/duckdb/ub_extension_icu_third_party_icu_i18n.cpp index 0be09fb29..53fa43dc2 100644 --- a/src/duckdb/ub_extension_icu_third_party_icu_i18n.cpp +++ b/src/duckdb/ub_extension_icu_third_party_icu_i18n.cpp @@ -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" -