From 7f8bce95c8d202283edb63af7a8ca3bd77106cc9 Mon Sep 17 00:00:00 2001 From: jonathanlehto Date: Fri, 1 Mar 2024 15:51:37 -0500 Subject: [PATCH] simplified change --- src/parser/mod.rs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/parser/mod.rs b/src/parser/mod.rs index eb3e015ad..fc63e589c 100644 --- a/src/parser/mod.rs +++ b/src/parser/mod.rs @@ -7950,10 +7950,7 @@ impl<'a> Parser<'a> { } else { let columns = self.parse_parenthesized_column_list(Optional, is_mysql)?; - let (partitioned, after_columns) = match self.parse_insert_partition()? { - Some((partitioned, after_columns)) => (Some(partitioned), after_columns), - None => (None, vec![]) - }; + let (partitioned, after_columns) = self.parse_insert_partition()?; let source = Some(Box::new(self.parse_query()?)); @@ -8033,7 +8030,7 @@ impl<'a> Parser<'a> { } } - pub fn parse_insert_partition(&mut self) -> Result, Vec)>, ParserError> { + pub fn parse_insert_partition(&mut self) -> Result<(Option>, Vec), ParserError> { if self.parse_keyword(Keyword::PARTITION) { self.expect_token(&Token::LParen)?; let partition_cols = self.parse_comma_separated(Parser::parse_expr)?; @@ -8042,9 +8039,9 @@ impl<'a> Parser<'a> { // Hive allows you to specify columns after partitions as well if you want. let after_columns = self.parse_parenthesized_column_list(Optional, false)?; - Ok(Some((partition_cols, after_columns))) + Ok((Some(partition_cols), after_columns)) } else { - Ok(None) + Ok((None, vec![])) } }