Merge pull request #18 from kemingy/v0.54.x

fix cargo fmt
Merge branch 'v0.54.x' into v0.54.x
Merge pull request #20 from kemingy/calc_overflow
fix lint
Merge branch 'v0.54.x' into v0.54.x
Merge pull request #19 from kemingy/lint
add test for statement convertion
fix: overflow in the calculation expr
fix the test in another pr
fix overflow
fix: lint and test
fix: add recursive protection to Convert

Author: MichaelScofield

src/ast/mod.rs

@@ -134,6 +134,7 @@ where
     Self: Into<T>,
 {
     #[inline(always)]
+    #[cfg_attr(feature = "recursive-protection", recursive::recursive)]
     fn convert(value: Self) -> T {
         Self::into(value)
     }

src/parser/mod.rs

@@ -1323,8 +1323,7 @@ impl<'a> Parser<'a> {
         })?;
         if rewrite_count == 0 {
             return Err(ParserError::ParserError(format!(
-                "Can't use the RANGE keyword in Expr {} without function",
-                expr
+                "Can't use the RANGE keyword in Expr {expr} without function"
             )));
         }
         Ok(expr)
@@ -16880,6 +16879,7 @@ impl Word {
 /// * `Ok(Some(replacement_expr))`: A replacement `Expr` is provided, use replacement `Expr`.
 /// * `Ok(None)`: A replacement `Expr` is not provided, use old `Expr`.
 /// * `Err(err)`: Any error returned.
+#[cfg_attr(feature = "recursive-protection", recursive::recursive)]
 fn rewrite_calculation_expr<F>(
     expr: &Expr,
     rewrite_func_expr: bool,

tests/sqlparser_common.rs

@@ -16185,9 +16185,7 @@ fn assert_sql_err(input: &str, expected: &str) {
     let res_str = format!("{:?}", res.unwrap_err());
     assert!(
         res_str.contains(expected),
-        "`{}` doesn't contains `{}`",
-        res_str,
-        expected
+        "`{res_str}` doesn't contains `{expected}`"
     );
 }
 
@@ -16435,3 +16433,16 @@ fn parse_range_range_align_to_calculate() {
         "Expected: end of statement, found: )",
     );
 }
+
+#[test]
+fn convert_to_datafusion_statement_overflow() {
+    let expr = std::iter::repeat_n("num BETWEEN 0 AND 1", 1000)
+        .collect::<Vec<_>>()
+        .join(" OR ");
+    let sql = format!("SELECT num FROM numbers WHERE {expr}");
+
+    let mut statements = Parser::parse_sql(&GenericDialect {}, sql.as_str()).unwrap();
+    let statement = statements.pop().unwrap();
+    let df_statement: df_sqlparser::ast::Statement = statement.into();
+    assert_eq!(df_statement.to_string(), sql);
+}