Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 11 additions & 0 deletions datafusion/sql/src/unparser/dialect.rs
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,17 @@ pub trait Dialect: Send + Sync {
fn supports_empty_select_list(&self) -> bool {
false
}

/// Override the default string literal unparsing.
///
/// Returns `Some(ast::Expr)` to replace the default single-quoted string,
/// or `None` to use the default behavior.
///
/// For example, MSSQL requires non-ASCII strings to use national string
/// literal syntax (`N'datafusion資料融合'`).
fn string_literal_to_sql(&self, _s: &str) -> Option<ast::Expr> {
None
}
}

/// `IntervalStyle` to use for unparsing
Expand Down
84 changes: 73 additions & 11 deletions datafusion/sql/src/unparser/expr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1290,18 +1290,17 @@ impl Unparser<'_> {
Ok(ast::Expr::value(ast::Value::Number(ui.to_string(), false)))
}
ScalarValue::UInt64(None) => Ok(ast::Expr::value(ast::Value::Null)),
ScalarValue::Utf8(Some(str)) => {
Ok(ast::Expr::value(SingleQuotedString(str.to_string())))
}
ScalarValue::Utf8(None) => Ok(ast::Expr::value(ast::Value::Null)),
ScalarValue::Utf8View(Some(str)) => {
Ok(ast::Expr::value(SingleQuotedString(str.to_string())))
}
ScalarValue::Utf8View(None) => Ok(ast::Expr::value(ast::Value::Null)),
ScalarValue::LargeUtf8(Some(str)) => {
ScalarValue::Utf8(Some(str))
| ScalarValue::Utf8View(Some(str))
| ScalarValue::LargeUtf8(Some(str)) => {
if let Some(expr) = self.dialect.string_literal_to_sql(str) {
return Ok(expr);
}
Ok(ast::Expr::value(SingleQuotedString(str.to_string())))
}
ScalarValue::LargeUtf8(None) => Ok(ast::Expr::value(ast::Value::Null)),
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(_)) => {
Expand Down Expand Up @@ -2404,7 +2403,6 @@ mod tests {

let expected = r#"('a' > 4)"#;
assert_eq!(actual, expected);

Ok(())
}

Expand Down Expand Up @@ -2988,6 +2986,70 @@ mod tests {
Ok(())
}

#[test]
fn test_mssql_dialect_national_literal() -> Result<()> {
struct MsSqlDialect;

impl Dialect for MsSqlDialect {
fn identifier_quote_style(&self, _identifier: &str) -> Option<char> {
Some('[')
}

fn string_literal_to_sql(&self, s: &str) -> Option<ast::Expr> {
if !s.is_ascii() {
Some(ast::Expr::value(ast::Value::NationalStringLiteral(
s.to_string(),
)))
} else {
None
}
}
}

let dialect = MsSqlDialect;
let unparser = Unparser::new(&dialect);

// Get nation string literal for the custom mssql dialect
for (s, expected) in [
("national string", "'national string'"),
("datafusion資料融合", "N'datafusion資料融合'"),
] {
let expr = Expr::Literal(ScalarValue::Utf8(Some(s.to_string())), None);
let ast = unparser.expr_to_sql(&expr)?;
assert_eq!(ast.to_string(), expected);

let expr = Expr::Literal(ScalarValue::Utf8View(Some(s.to_string())), None);
let ast = unparser.expr_to_sql(&expr)?;
assert_eq!(ast.to_string(), expected);

let expr = Expr::Literal(ScalarValue::LargeUtf8(Some(s.to_string())), None);
let ast = unparser.expr_to_sql(&expr)?;
assert_eq!(ast.to_string(), expected);
}

let dialect = DefaultDialect {};
let unparser = Unparser::new(&dialect);

// Get normal string literal for default dialect
for (s, expected) in [
("national string", "'national string'"),
("datafusion資料融合", "'datafusion資料融合'"),
] {
let expr = Expr::Literal(ScalarValue::Utf8(Some(s.to_string())), None);
let ast = unparser.expr_to_sql(&expr)?;
assert_eq!(ast.to_string(), expected);

let expr = Expr::Literal(ScalarValue::Utf8View(Some(s.to_string())), None);
let ast = unparser.expr_to_sql(&expr)?;
assert_eq!(ast.to_string(), expected);

let expr = Expr::Literal(ScalarValue::LargeUtf8(Some(s.to_string())), None);
let ast = unparser.expr_to_sql(&expr)?;
assert_eq!(ast.to_string(), expected);
}
Ok(())
}

#[test]
fn test_cast_value_to_dict_expr() {
let tests = [(
Expand Down
Loading