fix pattern matching order and adjust tests

Author: ewgenius

datafusion/sql/src/unparser/expr.rs

@@ -261,32 +261,20 @@ impl Unparser<'_> {
                     uses_odbc_syntax: false,
                 }))
             }
-            Expr::Like(Like {
+            Expr::SimilarTo(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::SimilarTo(Like {
+                case_insensitive: _,
+            }) => 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::Like(Like {
                 negated,
                 expr,
                 pattern,
@@ -1823,22 +1811,22 @@ mod tests {
                 r#"dummy_udf(a, b) IS NOT NULL"#,
             ),
             (
-                Expr::Like(Like {
-                    negated: true,
+                Expr::SimilarTo(Like {
+                    negated: false,
                     expr: Box::new(col("a")),
                     pattern: Box::new(lit("foo")),
                     escape_char: Some('o'),
                     case_insensitive: false,
                 }),
-                r#"a NOT LIKE 'foo' ESCAPE 'o'"#,
+                r#"a LIKE 'foo' ESCAPE 'o'"#,
             ),
             (
                 Expr::SimilarTo(Like {
                     negated: false,
                     expr: Box::new(col("a")),
                     pattern: Box::new(lit("foo")),
                     escape_char: Some('o'),
-                    case_insensitive: false,
+                    case_insensitive: true,
                 }),
                 r#"a LIKE 'foo' ESCAPE 'o'"#,
             ),
@@ -1848,19 +1836,19 @@ 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 ILIKE 'foo' ESCAPE 'o'"#,
+                r#"a NOT LIKE 'foo' ESCAPE 'o'"#,
             ),
             (
-                Expr::SimilarTo(Like {
-                    negated: false,
+                Expr::Like(Like {
+                    negated: true,
                     expr: Box::new(col("a")),
                     pattern: Box::new(lit("foo")),
                     escape_char: Some('o'),
                     case_insensitive: true,
                 }),
-                r#"a ILIKE 'foo' ESCAPE 'o'"#,
+                r#"a NOT ILIKE 'foo' ESCAPE 'o'"#,
             ),
             (
                 Expr::Literal(ScalarValue::Date64(Some(0))),
@@ -2651,7 +2639,10 @@ mod tests {
             (&mysql_dialect, "DATETIME"),
         ] {
             let unparser = Unparser::new(dialect);
-            let expr = Expr::Literal(ScalarValue::TimestampMillisecond(Some(1738285549123), None));
+            let expr = Expr::Literal(ScalarValue::TimestampMillisecond(
+                Some(1738285549123),
+                None,
+            ));
             let ast = unparser.expr_to_sql(&expr)?;
 
             let actual = format!("{}", ast);