Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/duckdb/src/function/table/system/duckdb_log.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ static unique_ptr<FunctionData> 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);
Expand Down
6 changes: 3 additions & 3 deletions src/duckdb/src/function/table/version/pragma_version.cpp
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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"
Expand Down
6 changes: 4 additions & 2 deletions src/duckdb/src/logging/log_storage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,8 @@ unique_ptr<TableRef> 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': "
Expand All @@ -529,7 +530,8 @@ unique_ptr<TableRef> 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");
Expand Down