You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datafusion.apache.org by gi...@apache.org on 2026/06/19 03:51:16 UTC
(datafusion) 01/01: feat(unparser): support binary literals (#23001)
This is an automated email from the ASF dual-hosted git repository.
github-merge-queue[bot] pushed a commit to branch gh-readonly-queue/main/pr-23001-0838a4ddb902535b0e95a1c5a254be7e9c7fe9bf
in repository https://gitbox.apache.org/repos/asf/datafusion.git
commit 055161dd37d0b00aef00f9fa6ac0f0065868c736
Author: Louis Vialar <zy...@users.noreply.github.com>
AuthorDate: Fri Jun 19 05:50:54 2026 +0200
feat(unparser): support binary literals (#23001)
## Which issue does this PR close?
- Closes #23000.
## Rationale for this change
Binary literal values should be properly unparsed to SQL.
## What changes are included in this PR?
Unparses all four types of binary array scalar values to hexadecimal
literal strings.
## Are these changes tested?
Yes
## Are there any user-facing changes?
No
<!--
If there are user-facing changes then we may require documentation to be
updated before approving the PR.
-->
<!--
If there are any breaking changes to public APIs, please add the `api
change` label.
-->
---
datafusion/sql/src/unparser/expr.rs | 100 +++++++++++++++++++++++++++++++-----
1 file changed, 88 insertions(+), 12 deletions(-)
diff --git a/datafusion/sql/src/unparser/expr.rs b/datafusion/sql/src/unparser/expr.rs
index d83c6b6e13..bcc46e837b 100644
--- a/datafusion/sql/src/unparser/expr.rs
+++ b/datafusion/sql/src/unparser/expr.rs
@@ -1368,19 +1368,27 @@ impl Unparser<'_> {
ScalarValue::Utf8(None)
| ScalarValue::Utf8View(None)
| ScalarValue::LargeUtf8(None) => Ok(ast::Expr::value(ast::Value::Null)),
- ScalarValue::Binary(Some(_)) => not_impl_err!("Unsupported scalar: {v:?}"),
- ScalarValue::Binary(None) => Ok(ast::Expr::value(ast::Value::Null)),
- ScalarValue::BinaryView(Some(_)) => {
- not_impl_err!("Unsupported scalar: {v:?}")
- }
- ScalarValue::BinaryView(None) => Ok(ast::Expr::value(ast::Value::Null)),
- ScalarValue::FixedSizeBinary(..) => {
- not_impl_err!("Unsupported scalar: {v:?}")
- }
- ScalarValue::LargeBinary(Some(_)) => {
- not_impl_err!("Unsupported scalar: {v:?}")
+ ScalarValue::Binary(Some(bin))
+ | ScalarValue::BinaryView(Some(bin))
+ | ScalarValue::LargeBinary(Some(bin))
+ | ScalarValue::FixedSizeBinary(_, Some(bin)) => {
+ let hex = bin
+ .iter()
+ .flat_map(|x| {
+ const HEX: [char; 16] = [
+ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b',
+ 'c', 'd', 'e', 'f',
+ ];
+ let (hi, lo) = (((*x >> 4) & 0xfu8), (*x & 0xfu8));
+ [HEX[hi as usize], HEX[lo as usize]]
+ })
+ .collect::<String>();
+ Ok(ast::Expr::value(ast::Value::HexStringLiteral(hex)))
}
- ScalarValue::LargeBinary(None) => Ok(ast::Expr::value(ast::Value::Null)),
+ ScalarValue::Binary(None)
+ | ScalarValue::BinaryView(None)
+ | ScalarValue::FixedSizeBinary(_, None)
+ | ScalarValue::LargeBinary(None) => Ok(ast::Expr::value(ast::Value::Null)),
ScalarValue::FixedSizeList(a) => self.scalar_value_list_to_sql(a.values()),
ScalarValue::List(a) => self.scalar_value_list_to_sql(a.values()),
ScalarValue::LargeList(a) => self.scalar_value_list_to_sql(a.values()),
@@ -3724,4 +3732,72 @@ mod tests {
let sql = expr_to_sql(&expr).unwrap().to_string();
assert_eq!(sql, "(c1 IS NOT DISTINCT FROM true)");
}
+
+ #[test]
+ fn test_binary_literal() {
+ let value = vec![0xDEu8, 0xAD, 0xBE, 0xEF];
+ let expected_hex = "X'deadbeef'";
+
+ assert_eq!(
+ expr_to_sql(&Expr::Literal(
+ ScalarValue::Binary(Some(value.clone())),
+ None
+ ))
+ .unwrap()
+ .to_string(),
+ expected_hex
+ );
+ assert_eq!(
+ expr_to_sql(&Expr::Literal(
+ ScalarValue::BinaryView(Some(value.clone())),
+ None
+ ))
+ .unwrap()
+ .to_string(),
+ expected_hex
+ );
+ assert_eq!(
+ expr_to_sql(&Expr::Literal(
+ ScalarValue::FixedSizeBinary(4, Some(value.clone())),
+ None
+ ))
+ .unwrap()
+ .to_string(),
+ expected_hex
+ );
+ assert_eq!(
+ expr_to_sql(&Expr::Literal(
+ ScalarValue::LargeBinary(Some(value.clone())),
+ None
+ ))
+ .unwrap()
+ .to_string(),
+ expected_hex
+ );
+
+ assert_eq!(
+ expr_to_sql(&Expr::Literal(ScalarValue::Binary(None), None))
+ .unwrap()
+ .to_string(),
+ "NULL"
+ );
+ assert_eq!(
+ expr_to_sql(&Expr::Literal(ScalarValue::BinaryView(None), None))
+ .unwrap()
+ .to_string(),
+ "NULL"
+ );
+ assert_eq!(
+ expr_to_sql(&Expr::Literal(ScalarValue::FixedSizeBinary(1, None), None))
+ .unwrap()
+ .to_string(),
+ "NULL"
+ );
+ assert_eq!(
+ expr_to_sql(&Expr::Literal(ScalarValue::LargeBinary(None), None))
+ .unwrap()
+ .to_string(),
+ "NULL"
+ );
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datafusion.apache.org
For additional commands, e-mail: commits-help@datafusion.apache.org