Update condition for BigQueryDialect or GenericDialect

I updated condition. This changes conditionalize parsing for only BigQueryDialect or GenericDialect.
sqlparser-rs · May 24, 2022 · 4c5021f · 4c5021f
1 parent 25b878f
commit 4c5021f
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 19 deletions.
diff --git a/src/parser.rs b/src/parser.rs
@@ -3609,27 +3609,32 @@ impl<'a> Parser<'a> {
                 // appearing alone in parentheses (e.g. `FROM (mytable)`)
                 self.expected("joined table", self.peek_token())
             }
-        } else if self.parse_keyword(Keyword::UNNEST) {
-            self.expect_token(&Token::LParen)?;
-            let expr = self.parse_expr()?;
-            self.expect_token(&Token::RParen)?;
+        } else if dialect_of!(self is BigQueryDialect | GenericDialect) {
+            if self.parse_keyword(Keyword::UNNEST) {
+                self.expect_token(&Token::LParen)?;
+                let expr = self.parse_expr()?;
+                self.expect_token(&Token::RParen)?;
 
-            let alias = match self.parse_optional_table_alias(keywords::RESERVED_FOR_TABLE_ALIAS) {
-                Ok(Some(alias)) => Some(alias),
-                Ok(None) => None,
-                Err(e) => return Err(e),
-            };
+                let alias =
+                    match self.parse_optional_table_alias(keywords::RESERVED_FOR_TABLE_ALIAS) {
+                        Ok(Some(alias)) => Some(alias),
+                        Ok(None) => None,
+                        Err(e) => return Err(e),
+                    };
 
-            let with_offset = match self.expect_keywords(&[Keyword::WITH, Keyword::OFFSET]) {
-                Ok(()) => true,
-                Err(_) => false,
-            };
+                let with_offset = match self.expect_keywords(&[Keyword::WITH, Keyword::OFFSET]) {
+                    Ok(()) => true,
+                    Err(_) => false,
+                };
 
-            Ok(TableFactor::UNNEST {
-                alias,
-                array_expr: Box::new(expr),
-                with_offset,
-            })
+                Ok(TableFactor::UNNEST {
+                    alias,
+                    array_expr: Box::new(expr),
+                    with_offset,
+                })
+            } else {
+                self.expected("UNNEST", self.peek_token())
+            }
         } else {
             let name = self.parse_object_name()?;
             // Postgres, MSSQL: table-valued functions:

diff --git a/tests/sqlparser_common.rs b/tests/sqlparser_common.rs
@@ -2779,8 +2779,11 @@ fn parse_table_function() {
 
 #[test]
 fn parse_unnest() {
+    let dialects = TestedDialects {
+        dialects: vec![Box::new(BigQueryDialect {}), Box::new(GenericDialect {})],
+    };
     let sql = "SELECT * FROM UNNEST(expr) AS numbers WITH OFFSET";
-    let select = verified_only_select(sql);
+    let select = dialects.verified_only_select(sql);
     assert_eq!(
         select.from,
         vec![TableWithJoins {