Skip to content

Fix #369 - Add Support in Date/Time keywords #383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
yuval-illumex wants to merge 6 commits into from
Closed

Fix #369 - Add Support in Date/Time keywords #383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b094aba
Inital support in current_timestamp
yuval-illumex Dec 14, 2021
d63d415
Support time functions
yuval-illumex Dec 15, 2021
abae1ef
Add Test
yuval-illumex Dec 15, 2021
47e0643
Fix PR
yuval-illumex Dec 17, 2021
d9a42f7
Fix tests
yuval-illumex Dec 21, 2021
ff36aec
Merge branch 'sqlparser-rs:main' into main
yuval-illumex Dec 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions src/parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,9 @@ impl<'a> Parser<'a> {
self.prev_token();
Ok(Expr::Value(self.parse_value()?))
}
Keyword::CURRENT_TIMESTAMP | Keyword::CURRENT_TIME | Keyword::CURRENT_DATE => {
self.parse_time_functions(ObjectName(vec![w.to_ident()]))
}
Keyword::CASE => self.parse_case_expr(),
Keyword::CAST => self.parse_cast_expr(),
Keyword::TRY_CAST => self.parse_try_cast_expr(),
Expand Down Expand Up @@ -552,6 +555,20 @@ impl<'a> Parser<'a> {
}))
}

pub fn parse_time_functions(&mut self, name: ObjectName) -> Result<Expr, ParserError> {
let args = if self.consume_token(&Token::LParen) {
self.parse_optional_args()?
} else {
vec![]
};
Ok(Expr::Function(Function {
name,
args,
over: None,
distinct: false,
}))
}

pub fn parse_window_frame_units(&mut self) -> Result<WindowFrameUnits, ParserError> {
match self.next_token() {
Token::Word(w) => match w.keyword {
Expand Down
48 changes: 48 additions & 0 deletions tests/sqlparser_common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4050,3 +4050,51 @@ fn verified_only_select(query: &str) -> Select {
fn verified_expr(query: &str) -> Expr {
all_dialects().verified_expr(query)
}

#[test]
fn parse_time_functions() {
Comment thread
yuval-illumex marked this conversation as resolved.
let sql = "SELECT CURRENT_TIMESTAMP()";
let select = verified_only_select(sql);
assert_eq!(
&Expr::Function(Function {
name: ObjectName(vec![Ident::new("CURRENT_TIMESTAMP")]),
args: vec![],
over: None,
distinct: false,
}),
expr_from_projection(&select.projection[0])
);

// Validating Parenthesis
one_statement_parses_to("SELECT CURRENT_TIMESTAMP", sql);

let sql = "SELECT CURRENT_TIME()";
let select = verified_only_select(sql);
assert_eq!(
&Expr::Function(Function {
name: ObjectName(vec![Ident::new("CURRENT_TIME")]),
args: vec![],
over: None,
distinct: false,
}),
expr_from_projection(&select.projection[0])
);

// Validating Parenthesis
one_statement_parses_to("SELECT CURRENT_TIME", sql);

let sql = "SELECT CURRENT_DATE()";
let select = verified_only_select(sql);
assert_eq!(
&Expr::Function(Function {
name: ObjectName(vec![Ident::new("CURRENT_DATE")]),
args: vec![],
over: None,
distinct: false,
}),
expr_from_projection(&select.projection[0])
);

// Validating Parenthesis
one_statement_parses_to("SELECT CURRENT_DATE", sql);
}