Fixed overflow error, recursion counter was not included for parenthesis (apache#2199)

Author: LucaCappelletti94

src/parser/mod.rs

@@ -13268,6 +13268,7 @@ impl<'a> Parser<'a> {
     /// preceded with some `WITH` CTE declarations and optionally followed
     /// by `ORDER BY`. Unlike some other parse_... methods, this one doesn't
     /// expect the initial keyword to be already consumed
+    #[cfg_attr(feature = "recursive-protection", recursive::recursive)]
     pub fn parse_query(&mut self) -> Result<Box<Query>, ParserError> {
         let _guard = self.recursion_counter.try_decrease()?;
         let with = if self.parse_keyword(Keyword::WITH) {
@@ -15118,7 +15119,9 @@ impl<'a> Parser<'a> {
     }
 
     /// A table name or a parenthesized subquery, followed by optional `[AS] alias`
+    #[cfg_attr(feature = "recursive-protection", recursive::recursive)]
     pub fn parse_table_factor(&mut self) -> Result<TableFactor, ParserError> {
+        let _guard = self.recursion_counter.try_decrease()?;
         if self.parse_keyword(Keyword::LATERAL) {
             // LATERAL must always be followed by a subquery or table function.
             if self.consume_token(&Token::LParen) {

tests/sqlparser_common.rs

@@ -11020,6 +11020,13 @@ fn parse_deeply_nested_parens_hits_recursion_limits() {
     assert_eq!(ParserError::RecursionLimitExceeded, res.unwrap_err());
 }
 
+#[test]
+fn parse_update_deeply_nested_parens_hits_recursion_limits() {
+    let sql = format!("\nUPDATE\n\n\n\n\n\n\n\n\n\n{}", "(".repeat(1000));
+    let res = parse_sql_statements(&sql);
+    assert_eq!(ParserError::RecursionLimitExceeded, res.unwrap_err());
+}
+
 #[test]
 fn parse_deeply_nested_unary_op_hits_recursion_limits() {
     let sql = format!("SELECT {}", "+".repeat(1000));

tests/sqlparser_snowflake.rs

@@ -3202,21 +3202,19 @@ fn parse_view_column_descriptions() {
 
 #[test]
 fn test_parentheses_overflow() {
-    // TODO: increase / improve after we fix the recursion limit
-    // for real (see https://github.com/apache/datafusion-sqlparser-rs/issues/984)
     let max_nesting_level: usize = 25;
 
-    // Verify the recursion check is not too wasteful... (num of parentheses - 2 is acceptable)
-    let slack = 2;
+    // Verify the recursion check is not too wasteful (num of parentheses within budget)
+    let slack = 3;
     let l_parens = "(".repeat(max_nesting_level - slack);
     let r_parens = ")".repeat(max_nesting_level - slack);
     let sql = format!("SELECT * FROM {l_parens}a.b.c{r_parens}");
     let parsed =
         snowflake_with_recursion_limit(max_nesting_level).parse_sql_statements(sql.as_str());
     assert_eq!(parsed.err(), None);
 
-    // Verify the recursion check triggers... (num of parentheses - 1 is acceptable)
-    let slack = 1;
+    // Verify the recursion check triggers (one more paren exceeds the budget)
+    let slack = 2;
     let l_parens = "(".repeat(max_nesting_level - slack);
     let r_parens = ")".repeat(max_nesting_level - slack);
     let sql = format!("SELECT * FROM {l_parens}a.b.c{r_parens}");