From 6c9bc89f3d87a74781655fd14b01c6d50e9d1a46 Mon Sep 17 00:00:00 2001 From: krlmlr Date: Thu, 28 Aug 2025 16:08:59 +0000 Subject: [PATCH] vendor: Update vendored sources to duckdb/duckdb@3a45b5f17f3d4d83148c7d30765a0b38cde96f96 Make `duckdb_log` return a TIMESTAMP_TZ (duckdb/duckdb#18768) Fix Path Typo in Extension's CMake Warning Message (duckdb/duckdb#18766) --- src/duckdb/src/function/table/system/duckdb_log.cpp | 2 +- src/duckdb/src/function/table/version/pragma_version.cpp | 6 +++--- src/duckdb/src/logging/log_storage.cpp | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/duckdb/src/function/table/system/duckdb_log.cpp b/src/duckdb/src/function/table/system/duckdb_log.cpp index 2be0531c9..f84cb405a 100644 --- a/src/duckdb/src/function/table/system/duckdb_log.cpp +++ b/src/duckdb/src/function/table/system/duckdb_log.cpp @@ -28,7 +28,7 @@ static unique_ptr DuckDBLogBind(ClientContext &context, TableFunct return_types.emplace_back(LogicalType::UBIGINT); names.emplace_back("timestamp"); - return_types.emplace_back(LogicalType::TIMESTAMP); + return_types.emplace_back(LogicalType::TIMESTAMP_TZ); names.emplace_back("type"); return_types.emplace_back(LogicalType::VARCHAR); diff --git a/src/duckdb/src/function/table/version/pragma_version.cpp b/src/duckdb/src/function/table/version/pragma_version.cpp index df8c8a48b..8e301b321 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 "0-dev3456" +#define DUCKDB_PATCH_VERSION "0-dev3462" #endif #ifndef DUCKDB_MINOR_VERSION #define DUCKDB_MINOR_VERSION 4 @@ -8,10 +8,10 @@ #define DUCKDB_MAJOR_VERSION 1 #endif #ifndef DUCKDB_VERSION -#define DUCKDB_VERSION "v1.4.0-dev3456" +#define DUCKDB_VERSION "v1.4.0-dev3462" #endif #ifndef DUCKDB_SOURCE_ID -#define DUCKDB_SOURCE_ID "ebe58746a0" +#define DUCKDB_SOURCE_ID "3a45b5f17f" #endif #include "duckdb/function/table/system_functions.hpp" #include "duckdb/main/database.hpp" diff --git a/src/duckdb/src/logging/log_storage.cpp b/src/duckdb/src/logging/log_storage.cpp index a2a780eeb..8b3ab305d 100644 --- a/src/duckdb/src/logging/log_storage.cpp +++ b/src/duckdb/src/logging/log_storage.cpp @@ -520,7 +520,8 @@ unique_ptr FileLogStorage::BindReplace(ClientContext &context, TableFu string columns; if (table == LoggingTargetTable::LOG_ENTRIES) { - columns = "'context_id': 'UBIGINT', 'timestamp': 'TIMESTAMP', 'type': 'VARCHAR', 'log_level': 'VARCHAR' , " + columns = "'context_id': 'UBIGINT', 'timestamp': 'TIMESTAMP WITH TIME ZONE', 'type': 'VARCHAR', 'log_level': " + "'VARCHAR' , " "'message': 'VARCHAR'"; } else if (table == LoggingTargetTable::LOG_CONTEXTS) { columns = "'context_id': 'UBIGINT', 'scope': 'VARCHAR', 'connection_id': 'UBIGINT', 'transaction_id': " @@ -529,7 +530,8 @@ unique_ptr FileLogStorage::BindReplace(ClientContext &context, TableFu select = "SELECT context_id, scope, connection_id, transaction_id, query_id, thread_id, timestamp, type, " "log_level, message "; columns = "'context_id': 'UBIGINT', 'scope': 'VARCHAR', 'connection_id': 'UBIGINT', 'transaction_id': " - "'UBIGINT', 'query_id': 'UBIGINT', 'thread_id': 'UBIGINT', 'timestamp': 'TIMESTAMP', 'type': " + "'UBIGINT', 'query_id': 'UBIGINT', 'thread_id': 'UBIGINT', 'timestamp': 'TIMESTAMP WITH TIME ZONE', " + "'type': " "'VARCHAR', 'log_level': 'VARCHAR' , 'message': 'VARCHAR'"; } else { throw InternalException("Invalid logging target table");