This is an automated email from the ASF dual-hosted git repository.
comphead 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 e0fd892c7d Fix `ILIKE` expression support in SQL unparser (#15820)
e0fd892c7d is described below
commit e0fd892c7dbdd6ac4abd63a30555ac95ea69515c
Author: Evgenii Khramkov <h...@ewgenius.me>
AuthorDate: Thu Apr 24 23:41:27 2025 +0900
Fix `ILIKE` expression support in SQL unparser (#15820)
* Fix ILIKE expression support in SQL unparser (#76)
* update tests
---
datafusion/sql/src/unparser/expr.rs | 45 ++++++++++++++---
datafusion/sql/tests/cases/plan_to_sql.rs | 84 +++++++++++++++++++++++++++++++
2 files changed, 121 insertions(+), 8 deletions(-)
diff --git a/datafusion/sql/src/unparser/expr.rs
b/datafusion/sql/src/unparser/expr.rs
index bf3e7880be..fe00c832f8 100644
--- a/datafusion/sql/src/unparser/expr.rs
+++ b/datafusion/sql/src/unparser/expr.rs
@@ -273,13 +273,6 @@ impl Unparser<'_> {
pattern,
escape_char,
case_insensitive: _,
- })
- | Expr::Like(Like {
- negated,
- expr,
- pattern,
- escape_char,
- case_insensitive: _,
}) => Ok(ast::Expr::Like {
negated: *negated,
expr: Box::new(self.expr_to_sql_inner(expr)?),
@@ -287,6 +280,32 @@ impl Unparser<'_> {
escape_char: escape_char.map(|c| c.to_string()),
any: false,
}),
+ Expr::Like(Like {
+ negated,
+ expr,
+ pattern,
+ escape_char,
+ case_insensitive,
+ }) => {
+ if *case_insensitive {
+ Ok(ast::Expr::ILike {
+ negated: *negated,
+ expr: Box::new(self.expr_to_sql_inner(expr)?),
+ pattern: Box::new(self.expr_to_sql_inner(pattern)?),
+ escape_char: escape_char.map(|c| c.to_string()),
+ any: false,
+ })
+ } else {
+ Ok(ast::Expr::Like {
+ negated: *negated,
+ expr: Box::new(self.expr_to_sql_inner(expr)?),
+ pattern: Box::new(self.expr_to_sql_inner(pattern)?),
+ escape_char: escape_char.map(|c| c.to_string()),
+ any: false,
+ })
+ }
+ }
+
Expr::AggregateFunction(agg) => {
let func_name = agg.func.name();
let AggregateFunctionParams {
@@ -1866,10 +1885,20 @@ mod tests {
expr: Box::new(col("a")),
pattern: Box::new(lit("foo")),
escape_char: Some('o'),
- case_insensitive: true,
+ case_insensitive: false,
}),
r#"a NOT LIKE 'foo' ESCAPE 'o'"#,
),
+ (
+ Expr::Like(Like {
+ negated: true,
+ expr: Box::new(col("a")),
+ pattern: Box::new(lit("foo")),
+ escape_char: Some('o'),
+ case_insensitive: true,
+ }),
+ r#"a NOT ILIKE 'foo' ESCAPE 'o'"#,
+ ),
(
Expr::SimilarTo(Like {
negated: false,
diff --git a/datafusion/sql/tests/cases/plan_to_sql.rs
b/datafusion/sql/tests/cases/plan_to_sql.rs
index a458d72d28..82062dd566 100644
--- a/datafusion/sql/tests/cases/plan_to_sql.rs
+++ b/datafusion/sql/tests/cases/plan_to_sql.rs
@@ -2432,3 +2432,87 @@ fn
test_unparse_left_semi_join_with_table_scan_projection() -> Result<()> {
);
Ok(())
}
+
+#[test]
+fn test_like_filter() {
+ let statement = generate_round_trip_statement(
+ GenericDialect {},
+ r#"SELECT first_name FROM person WHERE first_name LIKE '%John%'"#,
+ );
+ assert_snapshot!(
+ statement,
+ @"SELECT person.first_name FROM person WHERE person.first_name LIKE
'%John%'"
+ );
+}
+
+#[test]
+fn test_ilike_filter() {
+ let statement = generate_round_trip_statement(
+ GenericDialect {},
+ r#"SELECT first_name FROM person WHERE first_name ILIKE '%john%'"#,
+ );
+ assert_snapshot!(
+ statement,
+ @"SELECT person.first_name FROM person WHERE person.first_name ILIKE
'%john%'"
+ );
+}
+
+#[test]
+fn test_not_like_filter() {
+ let statement = generate_round_trip_statement(
+ GenericDialect {},
+ r#"SELECT first_name FROM person WHERE first_name NOT LIKE 'A%'"#,
+ );
+ assert_snapshot!(
+ statement,
+ @"SELECT person.first_name FROM person WHERE person.first_name NOT
LIKE 'A%'"
+ );
+}
+
+#[test]
+fn test_not_ilike_filter() {
+ let statement = generate_round_trip_statement(
+ GenericDialect {},
+ r#"SELECT first_name FROM person WHERE first_name NOT ILIKE 'a%'"#,
+ );
+ assert_snapshot!(
+ statement,
+ @"SELECT person.first_name FROM person WHERE person.first_name NOT
ILIKE 'a%'"
+ );
+}
+
+#[test]
+fn test_like_filter_with_escape() {
+ let statement = generate_round_trip_statement(
+ GenericDialect {},
+ r#"SELECT first_name FROM person WHERE first_name LIKE 'A!_%' ESCAPE
'!'"#,
+ );
+ assert_snapshot!(
+ statement,
+ @"SELECT person.first_name FROM person WHERE person.first_name LIKE
'A!_%' ESCAPE '!'"
+ );
+}
+
+#[test]
+fn test_not_like_filter_with_escape() {
+ let statement = generate_round_trip_statement(
+ GenericDialect {},
+ r#"SELECT first_name FROM person WHERE first_name NOT LIKE 'A!_%'
ESCAPE '!'"#,
+ );
+ assert_snapshot!(
+ statement,
+ @"SELECT person.first_name FROM person WHERE person.first_name NOT
LIKE 'A!_%' ESCAPE '!'"
+ );
+}
+
+#[test]
+fn test_not_ilike_filter_with_escape() {
+ let statement = generate_round_trip_statement(
+ GenericDialect {},
+ r#"SELECT first_name FROM person WHERE first_name NOT ILIKE 'A!_%'
ESCAPE '!'"#,
+ );
+ assert_snapshot!(
+ statement,
+ @"SELECT person.first_name FROM person WHERE person.first_name NOT
ILIKE 'A!_%' ESCAPE '!'"
+ );
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@datafusion.apache.org
For additional commands, e-mail: commits-h...@datafusion.apache.org
