Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More descriptive error for plus/minus between timestamps/dates #4662

Merged
merged 1 commit into from
Dec 19, 2022
Merged

More descriptive error for plus/minus between timestamps/dates #4662

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 33 additions & 5 deletions datafusion/expr/src/type_coercion/binary.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

//! Coercion rules for matching argument types for binary operators

use crate::type_coercion::is_numeric;
use crate::type_coercion::{is_date, is_numeric, is_timestamp};
use crate::Operator;
use arrow::compute::can_cast_types;
use arrow::datatypes::{
Expand Down Expand Up @@ -121,14 +121,22 @@ pub fn coerce_types(
Operator::Like | Operator::NotLike | Operator::ILike | Operator::NotILike => {
like_coercion(lhs_type, rhs_type)
}
// date +/- interval returns date
Operator::Plus | Operator::Minus
if (*lhs_type == DataType::Date32
|| *lhs_type == DataType::Date64
|| matches!(lhs_type, DataType::Timestamp(_, _))) =>
if is_date(lhs_type) || is_timestamp(lhs_type) =>
{
match rhs_type {
// timestamp/date +/- interval returns timestamp/date
DataType::Interval(_) => Some(lhs_type.clone()),
// providing more helpful error message
DataType::Date32 | DataType::Date64 | DataType::Timestamp(_, _) => {
return Err(DataFusionError::Plan(
format!(
"'{:?} {} {:?}' is an unsupported operation. \
addition/subtraction on dates/timestamps only supported with interval types",
lhs_type, op, rhs_type
),
));
}
_ => None,
}
}
Expand Down Expand Up @@ -672,6 +680,7 @@ mod tests {
use super::*;
use crate::Operator;
use arrow::datatypes::DataType;
use datafusion_common::assert_contains;
use datafusion_common::DataFusionError;
use datafusion_common::Result;

Expand Down Expand Up @@ -848,6 +857,25 @@ mod tests {
}};
}

#[test]
fn test_date_timestamp_arithmetic_error() -> Result<()> {
let err = coerce_types(
&DataType::Timestamp(TimeUnit::Nanosecond, None),
&Operator::Minus,
&DataType::Timestamp(TimeUnit::Nanosecond, None),
)
.unwrap_err()
.to_string();
assert_contains!(&err, "'Timestamp(Nanosecond, None) - Timestamp(Nanosecond, None)' is an unsupported operation. addition/subtraction on dates/timestamps only supported with interval types");

let err = coerce_types(&DataType::Date32, &Operator::Plus, &DataType::Date64)
.unwrap_err()
.to_string();
assert_contains!(&err, "'Date32 + Date64' is an unsupported operation. addition/subtraction on dates/timestamps only supported with interval types");

Ok(())
}

#[test]
fn test_type_coercion() -> Result<()> {
test_coercion_binary_rule!(
Expand Down