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

fix: add recursive protection to Convert

Author: sunng87

src/ast/mod.rs

@@ -115,6 +115,7 @@ where
     Self: Into<T>,
 {
     #[inline(always)]
+    #[cfg_attr(feature = "recursive-protection", recursive::recursive)]
     fn convert(value: Self) -> T {
         Self::into(value)
     }
@@ -4575,9 +4576,17 @@ impl fmt::Display for Statement {
                     "{hivevar}{name} = {l_paren}{value}{r_paren}",
                     hivevar = if *hivevar { "HIVEVAR:" } else { "" },
                     name = variables,
-                    l_paren = if parenthesized { "(" } else { Default::default() },
+                    l_paren = if parenthesized {
+                        "("
+                    } else {
+                        Default::default()
+                    },
                     value = display_comma_separated(value),
-                    r_paren = if parenthesized { ")" } else { Default::default() },
+                    r_paren = if parenthesized {
+                        ")"
+                    } else {
+                        Default::default()
+                    },
                 )
             }
             Statement::SetTimeZone { local, value } => {

src/parser/mod.rs

@@ -2364,8 +2364,7 @@ impl<'a> Parser<'a> {
         self.expect_token(&Token::LParen)?;
         let mut trim_where = None;
         if let Token::Word(word) = self.peek_token().token {
-            if [Keyword::BOTH, Keyword::LEADING, Keyword::TRAILING].contains(&word.keyword)
-            {
+            if [Keyword::BOTH, Keyword::LEADING, Keyword::TRAILING].contains(&word.keyword) {
                 trim_where = Some(self.parse_trim_where()?);
             }
         }

tests/sqlparser_common.rs

@@ -13348,3 +13348,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);
+}

tests/sqlparser_duckdb.rs

@@ -778,7 +778,9 @@ fn parse_use() {
     for &quote in &quote_styles {
         // Test double identifier with different type of quotes
         assert_eq!(
-            duckdb().verified_stmt(&format!("USE {quote}CATALOG{quote}.{quote}my_schema{quote}")),
+            duckdb().verified_stmt(&format!(
+                "USE {quote}CATALOG{quote}.{quote}my_schema{quote}"
+            )),
             Statement::Use(Use::Object(ObjectName(vec![
                 Ident::with_quote(quote, "CATALOG"),
                 Ident::with_quote(quote, "my_schema")

tests/sqlparser_mysql.rs

@@ -598,8 +598,7 @@ fn parse_use() {
         for &quote in &quote_styles {
             // Test single identifier with different type of quotes
             assert_eq!(
-                mysql_and_generic()
-                    .verified_stmt(&format!("USE {quote}{object_name}{quote}")),
+                mysql_and_generic().verified_stmt(&format!("USE {quote}{object_name}{quote}")),
                 Statement::Use(Use::Object(ObjectName(vec![Ident::with_quote(
                     quote,
                     object_name.to_string(),

tests/sqlparser_snowflake.rs

@@ -2234,9 +2234,7 @@ fn test_snowflake_stage_object_names() {
         .zip(allowed_object_names.iter_mut())
     {
         let (formatted_name, object_name) = it;
-        let sql = format!(
-            "COPY INTO {formatted_name} FROM 'gcs://mybucket/./../a.csv'"
-        );
+        let sql = format!("COPY INTO {formatted_name} FROM 'gcs://mybucket/./../a.csv'");
         match snowflake().verified_stmt(&sql) {
             Statement::CopyIntoSnowflake { into, .. } => {
                 assert_eq!(into.0, object_name.0)
@@ -2714,7 +2712,9 @@ fn parse_use() {
     for &quote in &quote_styles {
         // Test double identifier with different type of quotes
         assert_eq!(
-            snowflake().verified_stmt(&format!("USE {quote}CATALOG{quote}.{quote}my_schema{quote}")),
+            snowflake().verified_stmt(&format!(
+                "USE {quote}CATALOG{quote}.{quote}my_schema{quote}"
+            )),
             Statement::Use(Use::Object(ObjectName(vec![
                 Ident::with_quote(quote, "CATALOG"),
                 Ident::with_quote(quote, "my_schema")
@@ -2747,7 +2747,9 @@ fn parse_use() {
             )])))
         );
         assert_eq!(
-            snowflake().verified_stmt(&format!("USE SCHEMA {quote}CATALOG{quote}.{quote}my_schema{quote}")),
+            snowflake().verified_stmt(&format!(
+                "USE SCHEMA {quote}CATALOG{quote}.{quote}my_schema{quote}"
+            )),
             Statement::Use(Use::Schema(ObjectName(vec![
                 Ident::with_quote(quote, "CATALOG"),
                 Ident::with_quote(quote, "my_schema")