This is an automated email from the ASF dual-hosted git repository.
iffyio pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/datafusion-sqlparser-rs.git
The following commit(s) were added to refs/heads/main by this push:
new 44f3be38 fix: parse snowflake fetch clause (#1894)
44f3be38 is described below
commit 44f3be38e5c9199479a4b986fdfaf417e925f0d4
Author: Denys Tsomenko <denist...@gmail.com>
AuthorDate: Tue Jun 24 09:29:44 2025 +0300
fix: parse snowflake fetch clause (#1894)
---
src/parser/mod.rs | 11 ++++++-----
tests/sqlparser_snowflake.rs | 19 +++++++++++++++++++
2 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/src/parser/mod.rs b/src/parser/mod.rs
index 35c05dfb..a5e89069 100644
--- a/src/parser/mod.rs
+++ b/src/parser/mod.rs
@@ -15023,7 +15023,8 @@ impl<'a> Parser<'a> {
/// Parse a FETCH clause
pub fn parse_fetch(&mut self) -> Result<Fetch, ParserError> {
- 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()
@@ -15032,16 +15033,16 @@ 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,
diff --git a/tests/sqlparser_snowflake.rs b/tests/sqlparser_snowflake.rs
index b11a2cb0..7dc00f9a 100644
--- a/tests/sqlparser_snowflake.rs
+++ b/tests/sqlparser_snowflake.rs
@@ -4146,3 +4146,22 @@ END
assert_eq!(2, exception[1].idents.len());
assert_eq!(2, exception[1].statements.len());
}
+
+#[test]
+fn test_snowflake_fetch_clause_syntax() {
+ let canonical = "SELECT c1 FROM fetch_test FETCH FIRST 2 ROWS ONLY";
+ snowflake().verified_only_select_with_canonical("SELECT c1 FROM fetch_test
FETCH 2", canonical);
+
+ snowflake()
+ .verified_only_select_with_canonical("SELECT c1 FROM fetch_test FETCH
FIRST 2", canonical);
+ snowflake()
+ .verified_only_select_with_canonical("SELECT c1 FROM fetch_test FETCH
NEXT 2", canonical);
+
+ snowflake()
+ .verified_only_select_with_canonical("SELECT c1 FROM fetch_test FETCH
2 ROW", canonical);
+
+ snowflake().verified_only_select_with_canonical(
+ "SELECT c1 FROM fetch_test FETCH FIRST 2 ROWS",
+ canonical,
+ );
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@datafusion.apache.org
For additional commands, e-mail: commits-h...@datafusion.apache.org
