Apache DataFusion SQL Query Engine
fix: to_char returns row 0 for every row with a scalar datetime and a format column (#25700)
jackyleec03ab7026748
diff --git a/datafusion/functions/src/datetime/to_char.rs b/datafusion/functions/src/datetime/to_char.rsindex 1d38471174..cc3c1e66af 100644--- a/datafusion/functions/src/datetime/to_char.rs+++ b/datafusion/functions/src/datetime/to_char.rs@@ -286,12 +286,11 @@ fn to_char_array(args: &[ColumnarValue]) -> Result<ColumnarValue> {}let result = builder.finish();- match args[0] {- ColumnarValue::Scalar(_) => {- let val = result.is_valid(0).then(|| result.value(0).to_string());- Ok(ColumnarValue::Scalar(ScalarValue::Utf8(val)))- }- ColumnarValue::Array(_) => Ok(ColumnarValue::Array(Arc::new(result) as ArrayRef)),+ if result.len() == 1 {+ let val = result.is_valid(0).then(|| result.value(0).to_string());+ Ok(ColumnarValue::Scalar(ScalarValue::Utf8(val)))+ } else {+ Ok(ColumnarValue::Array(Arc::new(result) as ArrayRef))}}diff --git a/datafusion/sqllogictest/test_files/datetime/timestamps.slt b/datafusion/sqllogictest/test_files/datetime/timestamps.sltindex c2be17579a..cc1b65db46 100644--- a/datafusion/sqllogictest/test_files/datetime/timestamps.slt+++ b/datafusion/sqllogictest/test_files/datetime/timestamps.slt@@ -3963,6 +3963,13 @@ select to_char('2000-02-03'::date, '%Y:%d:%m');----2000:03:02+# scalar datetime with a column of formats+query T+select to_char('2000-01-01'::date, time_format) from formats;+----+00-00-00+00::00::00+query Tselect to_char(arrow_cast(12345::int, 'Time32(Second)'), '%H-%M-%S')----