Skip to content

Commit

Permalink
simplified change
Browse files Browse the repository at this point in the history
  • Loading branch information
jonathanlehto committed Mar 1, 2024
1 parent bed6c09 commit 7f8bce9
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions src/parser/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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()?));

Expand Down Expand Up @@ -8033,7 +8030,7 @@ impl<'a> Parser<'a> {
}
}

pub fn parse_insert_partition(&mut self) -> Result<Option<(Vec<Expr>, Vec<Ident>)>, ParserError> {
pub fn parse_insert_partition(&mut self) -> Result<(Option<Vec<Expr>>, Vec<Ident>), ParserError> {
if self.parse_keyword(Keyword::PARTITION) {
self.expect_token(&Token::LParen)?;
let partition_cols = self.parse_comma_separated(Parser::parse_expr)?;
Expand All @@ -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![]))
}
}

Expand Down

0 comments on commit 7f8bce9

Please sign in to comment.