From 26f6e6f16fe4af8ef49fa4d64553651b4987b854 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 6 Jun 2024 22:25:29 +0000 Subject: [PATCH 1/2] Update arrow requirement from 51 to 52 Updates the requirements on [arrow](https://github.com/apache/arrow-rs) to permit the latest version. - [Changelog](https://github.com/apache/arrow-rs/blob/master/CHANGELOG-old.md) - [Commits](https://github.com/apache/arrow-rs/compare/51.0.0...51.0.0) --- updated-dependencies: - dependency-name: arrow dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 5f176778..691d06e8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -60,4 +60,4 @@ unicase = "2.6.0" url = "2.1" uuid = "1.0" vcpkg = "0.2" -arrow = { version = "51", default-features = false } +arrow = { version = "52", default-features = false } From 1e4e8b9ea1a0fa468a60c1450c9abd1e90eecb5c Mon Sep 17 00:00:00 2001 From: Elliana May Date: Fri, 7 Jun 2024 22:09:28 +0800 Subject: [PATCH 2/2] remove arrow bug workaround --- crates/duckdb/src/row.rs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/crates/duckdb/src/row.rs b/crates/duckdb/src/row.rs index cfdec186..f3ecf653 100644 --- a/crates/duckdb/src/row.rs +++ b/crates/duckdb/src/row.rs @@ -559,12 +559,11 @@ impl<'stmt> Row<'stmt> { let value = array.value(row); - // TODO: remove this manual conversion once arrow-rs bug is fixed - let months = (value) as i32; - let days = (value >> 32) as i32; - let nanos = (value >> 64) as i64; - - ValueRef::Interval { months, days, nanos } + ValueRef::Interval { + months: value.months, + days: value.days, + nanos: value.nanoseconds, + } } _ => unimplemented!("{:?}", unit), },