Skip to content

Commit 7443e10

Browse files
committed
simplified change
1 parent ca8d634 commit 7443e10

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

src/parser/mod.rs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8410,10 +8410,7 @@ impl<'a> Parser<'a> {
84108410
} else {
84118411
let columns = self.parse_parenthesized_column_list(Optional, is_mysql)?;
84128412

8413-
let (partitioned, after_columns) = match self.parse_insert_partition()? {
8414-
Some((partitioned, after_columns)) => (Some(partitioned), after_columns),
8415-
None => (None, vec![])
8416-
};
8413+
let (partitioned, after_columns) = self.parse_insert_partition()?;
84178414

84188415
let source = Some(Box::new(self.parse_query()?));
84198416

@@ -8493,7 +8490,7 @@ impl<'a> Parser<'a> {
84938490
}
84948491
}
84958492

8496-
pub fn parse_insert_partition(&mut self) -> Result<Option<(Vec<Expr>, Vec<Ident>)>, ParserError> {
8493+
pub fn parse_insert_partition(&mut self) -> Result<(Option<Vec<Expr>>, Vec<Ident>), ParserError> {
84978494
if self.parse_keyword(Keyword::PARTITION) {
84988495
self.expect_token(&Token::LParen)?;
84998496
let partition_cols = self.parse_comma_separated(Parser::parse_expr)?;
@@ -8502,9 +8499,9 @@ impl<'a> Parser<'a> {
85028499
// Hive allows you to specify columns after partitions as well if you want.
85038500
let after_columns = self.parse_parenthesized_column_list(Optional, false)?;
85048501

8505-
Ok(Some((partition_cols, after_columns)))
8502+
Ok((Some(partition_cols), after_columns))
85068503
} else {
8507-
Ok(None)
8504+
Ok((None, vec![]))
85088505
}
85098506
}
85108507

0 commit comments

Comments
 (0)