Support COUNT(DISTINCT x) and similar

This commit is contained in:
Jamie Brandon 2019-05-22 15:44:41 +01:00 committed by Nikhil Benesch
parent 4f944dd4aa
commit 72ced4bffe
No known key found for this signature in database
GPG key ID: F7386C5DEADABA7F
3 changed files with 65 additions and 4 deletions

View file

@ -253,6 +253,14 @@ impl Parser {
pub fn parse_function(&mut self, name: SQLObjectName) -> Result<ASTNode, ParserError> {
self.expect_token(&Token::LParen)?;
let all = self.parse_keyword("ALL");
let distinct = self.parse_keyword("DISTINCT");
if all && distinct {
return parser_err!(format!(
"Cannot specify both ALL and DISTINCT in function: {}",
name.to_string(),
));
}
let args = self.parse_optional_args()?;
let over = if self.parse_keyword("OVER") {
// TBD: support window names (`OVER mywin`) in place of inline specification
@ -279,7 +287,12 @@ impl Parser {
None
};
Ok(ASTNode::SQLFunction { name, args, over })
Ok(ASTNode::SQLFunction {
name,
args,
over,
distinct,
})
}
pub fn parse_window_frame(&mut self) -> Result<Option<SQLWindowFrame>, ParserError> {