Update vendored DuckDB sources to b1b235b

duckdb · Nov 23, 2024 · 19170e3 · 19170e3
1 parent b1b235b
commit 19170e3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/duckdb/extension/parquet/include/thrift_tools.hpp b/src/duckdb/extension/parquet/include/thrift_tools.hpp
@@ -98,7 +98,10 @@ struct ReadAheadBuffer {
 		}
 
 		if (read_head.GetEnd() > handle.GetFileSize()) {
-			throw std::runtime_error("Prefetch registered for bytes outside file");
+			throw std::runtime_error("Prefetch registered for bytes outside file: " + handle.GetPath() +
+			                         ", attempted range: [" + std::to_string(pos) + ", " +
+			                         std::to_string(read_head.GetEnd()) +
+			                         "), file size: " + std::to_string(handle.GetFileSize()));
 		}
 	}
 

diff --git a/src/duckdb/src/function/table/read_file.cpp b/src/duckdb/src/function/table/read_file.cpp
@@ -64,7 +64,7 @@ static unique_ptr<FunctionData> ReadFileBind(ClientContext &context, TableFuncti
 	names.push_back("content");
 	return_types.push_back(LogicalType::BIGINT);
 	names.push_back("size");
-	return_types.push_back(LogicalType::TIMESTAMP);
+	return_types.push_back(LogicalType::TIMESTAMP_TZ);
 	names.push_back("last_modified");
 
 	return std::move(result);
@@ -172,7 +172,8 @@ static void ReadFileExecute(ClientContext &context, TableFunctionInput &input, D
 					// correctly)
 					try {
 						auto timestamp_seconds = Timestamp::FromEpochSeconds(fs.GetLastModifiedTime(*file_handle));
-						FlatVector::GetData<timestamp_t>(last_modified_vector)[out_idx] = timestamp_seconds;
+						FlatVector::GetData<timestamp_tz_t>(last_modified_vector)[out_idx] =
+						    timestamp_tz_t(timestamp_seconds);
 					} catch (std::exception &ex) {
 						ErrorData error(ex);
 						if (error.Type() == ExceptionType::CONVERSION) {

diff --git 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 "4-dev2198"
+#define DUCKDB_PATCH_VERSION "4-dev2210"
 #endif
 #ifndef DUCKDB_MINOR_VERSION
 #define DUCKDB_MINOR_VERSION 1
@@ -8,10 +8,10 @@
 #define DUCKDB_MAJOR_VERSION 1
 #endif
 #ifndef DUCKDB_VERSION
-#define DUCKDB_VERSION "v1.1.4-dev2198"
+#define DUCKDB_VERSION "v1.1.4-dev2210"
 #endif
 #ifndef DUCKDB_SOURCE_ID
-#define DUCKDB_SOURCE_ID "bc629ef235"
+#define DUCKDB_SOURCE_ID "1a3d614f0e"
 #endif
 #include "duckdb/function/table/system_functions.hpp"
 #include "duckdb/main/database.hpp"