This is an automated email from the ASF dual-hosted git repository.
alamb pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/datafusion.git
The following commit(s) were added to refs/heads/main by this push:
new fbf793434e Support to unparse `ScalarValue::TimestampNanosecond` to
String (#10984)
fbf793434e is described below
commit fbf793434e8f94fc08b55ad1ced68b10d3a8c2ff
Author: Jax Liu <[email protected]>
AuthorDate: Wed Jun 19 04:03:32 2024 +0800
Support to unparse `ScalarValue::TimestampNanosecond` to String (#10984)
* support unparse TimestampNanosecond
* cargo fmt
* extract the duplicate code
---
datafusion/sql/src/unparser/expr.rs | 48 +++++++++++++++++++++++++++++++++----
1 file changed, 44 insertions(+), 4 deletions(-)
diff --git a/datafusion/sql/src/unparser/expr.rs
b/datafusion/sql/src/unparser/expr.rs
index 66334b0b41..65481aed64 100644
--- a/datafusion/sql/src/unparser/expr.rs
+++ b/datafusion/sql/src/unparser/expr.rs
@@ -19,11 +19,12 @@ use arrow::util::display::array_value_to_string;
use core::fmt;
use std::{fmt::Display, vec};
-use arrow_array::{Date32Array, Date64Array};
+use arrow_array::{Date32Array, Date64Array, TimestampNanosecondArray};
use arrow_schema::DataType;
use sqlparser::ast::Value::SingleQuotedString;
use sqlparser::ast::{
- self, Expr as AstExpr, Function, FunctionArg, Ident, Interval,
UnaryOperator,
+ self, Expr as AstExpr, Function, FunctionArg, Ident, Interval,
TimezoneInfo,
+ UnaryOperator,
};
use datafusion_common::{
@@ -819,8 +820,36 @@ impl Unparser<'_> {
ScalarValue::TimestampMicrosecond(None, _) => {
Ok(ast::Expr::Value(ast::Value::Null))
}
- ScalarValue::TimestampNanosecond(Some(_ts), _) => {
- not_impl_err!("Unsupported scalar: {v:?}")
+ ScalarValue::TimestampNanosecond(Some(_ts), tz) => {
+ let result = if let Some(tz) = tz {
+ v.to_array()?
+ .as_any()
+ .downcast_ref::<TimestampNanosecondArray>()
+ .ok_or(internal_datafusion_err!(
+ "Unable to downcast to TimestampNanosecond from
TimestampNanosecond scalar"
+ ))?
+ .value_as_datetime_with_tz(0, tz.parse()?)
+ .ok_or(internal_datafusion_err!(
+ "Unable to convert TimestampNanosecond to DateTime"
+ ))?.to_string()
+ } else {
+ v.to_array()?
+ .as_any()
+ .downcast_ref::<TimestampNanosecondArray>()
+ .ok_or(internal_datafusion_err!(
+ "Unable to downcast to TimestampNanosecond from
TimestampNanosecond scalar"
+ ))?
+ .value_as_datetime(0)
+ .ok_or(internal_datafusion_err!(
+ "Unable to convert TimestampNanosecond to
NaiveDateTime"
+ ))?.to_string()
+ };
+ Ok(ast::Expr::Cast {
+ kind: ast::CastKind::Cast,
+ expr:
Box::new(ast::Expr::Value(SingleQuotedString(result))),
+ data_type: ast::DataType::Timestamp(None,
TimezoneInfo::None),
+ format: None,
+ })
}
ScalarValue::TimestampNanosecond(None, _) => {
Ok(ast::Expr::Value(ast::Value::Null))
@@ -1151,6 +1180,17 @@ mod tests {
Expr::Literal(ScalarValue::Date32(Some(-1))),
r#"CAST('1969-12-31' AS DATE)"#,
),
+ (
+ Expr::Literal(ScalarValue::TimestampNanosecond(Some(10001),
None)),
+ r#"CAST('1970-01-01 00:00:00.000010001' AS TIMESTAMP)"#,
+ ),
+ (
+ Expr::Literal(ScalarValue::TimestampNanosecond(
+ Some(10001),
+ Some("+08:00".into()),
+ )),
+ r#"CAST('1970-01-01 08:00:00.000010001 +08:00' AS TIMESTAMP)"#,
+ ),
(sum(col("a")), r#"sum(a)"#),
(
count_udaf()
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
