Make parse_fetch more permissive

Author: Vedin

src/parser/mod.rs

@@ -15017,10 +15017,8 @@ impl<'a> Parser<'a> {
 
     /// Parse a FETCH clause
     pub fn parse_fetch(&mut self) -> Result<Fetch, ParserError> {
-        if dialect_of!(self is SnowflakeDialect) {
-            return self.parse_snowflake_fetch();
-        }
-        self.expect_one_of_keywords(&[Keyword::FIRST, Keyword::NEXT])?;
+        let _ = self.parse_one_of_keywords(&[Keyword::FIRST, Keyword::NEXT]);
+
         let (quantity, percent) = if self
             .parse_one_of_keywords(&[Keyword::ROW, Keyword::ROWS])
             .is_some()
@@ -15029,39 +15027,23 @@ impl<'a> Parser<'a> {
         } else {
             let quantity = Expr::Value(self.parse_value()?);
             let percent = self.parse_keyword(Keyword::PERCENT);
-            self.expect_one_of_keywords(&[Keyword::ROW, Keyword::ROWS])?;
+            let _ = self.parse_one_of_keywords(&[Keyword::ROW, Keyword::ROWS]);
             (Some(quantity), percent)
         };
+
         let with_ties = if self.parse_keyword(Keyword::ONLY) {
             false
-        } else if self.parse_keywords(&[Keyword::WITH, Keyword::TIES]) {
-            true
         } else {
-            return self.expected("one of ONLY or WITH TIES", self.peek_token());
+            self.parse_keywords(&[Keyword::WITH, Keyword::TIES])
         };
+
         Ok(Fetch {
             with_ties,
             percent,
             quantity,
         })
     }
 
-    /// Parse a FETCH clause with Snowflake-specific syntax
-    fn parse_snowflake_fetch(&mut self) -> Result<Fetch, ParserError> {
-        // Snowflake: All additional keywords are optional. WITH TIES is not allowed.
-        let _ = self.parse_one_of_keywords(&[Keyword::FIRST, Keyword::NEXT]);
-
-        let quantity = Expr::Value(self.parse_value()?);
-        let _ = self.parse_one_of_keywords(&[Keyword::ROW, Keyword::ROWS]);
-        let _ = self.parse_keyword(Keyword::ONLY);
-
-        Ok(Fetch {
-            with_ties: false,
-            percent: false,
-            quantity: Some(quantity),
-        })
-    }
-
     /// Parse a FOR UPDATE/FOR SHARE clause
     pub fn parse_lock(&mut self) -> Result<LockClause, ParserError> {
         let lock_type = match self.expect_one_of_keywords(&[Keyword::UPDATE, Keyword::SHARE])? {

tests/sqlparser_snowflake.rs

@@ -4164,18 +4164,4 @@ fn test_snowflake_fetch_clause_syntax() {
         "SELECT c1 FROM fetch_test FETCH FIRST 2 ROWS",
         canonical,
     );
-
-    snowflake()
-        .verified_only_select_with_canonical("SELECT c1 FROM fetch_test FETCH 2 ONLY", canonical);
-    let res = snowflake().parse_sql_statements("SELECT c1 FROM fetch_test FETCH 2 PERCENT");
-    assert_eq!(
-        res.unwrap_err().to_string(),
-        "sql parser error: Expected: end of statement, found: PERCENT"
-    );
-    let res =
-        snowflake().parse_sql_statements("SELECT c1 FROM fetch_test FETCH FIRST 2 ROWS WITH TIES");
-    assert_eq!(
-        res.unwrap_err().to_string(),
-        "sql parser error: Expected: end of statement, found: WITH"
-    );
 }