Add parser support for timestampadd
#857
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
andygrove
requested review from
ayushdg,
charlesbluca,
galipremsagar and
jdye64
as code owners
andygrove
changed the title
timestampadd
sarahyurick
reviewed
Oct 12, 2022
Comment on lines
+50
to
+75
| Token::Word(w) if w.value.to_lowercase() == "timestampadd" => { | ||
| // TIMESTAMPADD(YEAR, 2, d) | ||
| parser.next_token(); // skip timestampadd | ||
| parser.expect_token(&Token::LParen)?; | ||
| let time_unit = parser.next_token(); | ||
| parser.expect_token(&Token::Comma)?; | ||
| let n = parser.parse_expr()?; | ||
| parser.expect_token(&Token::Comma)?; | ||
| let expr = parser.parse_expr()?; | ||
| parser.expect_token(&Token::RParen)?; | ||
|
|
||
| // convert to function args | ||
| let args = vec![ | ||
| FunctionArg::Unnamed(FunctionArgExpr::Expr(Expr::Value( | ||
| Value::SingleQuotedString(time_unit.to_string()), | ||
| ))), | ||
| FunctionArg::Unnamed(FunctionArgExpr::Expr(n)), | ||
| FunctionArg::Unnamed(FunctionArgExpr::Expr(expr)), | ||
| ]; | ||
|
|
||
| Ok(Some(Expr::Function(Function { | ||
| name: ObjectName(vec![Ident::new("TIMESTAMPADD")]), | ||
| args, | ||
| over: None, | ||
| distinct: false, | ||
| special: false, |
There was a problem hiding this comment.
This is so cool! Definitely more convenient than having to go through SQLParser and DataFusion, I can already think of a couple more functions that I'll do this for.
This was referenced Oct 14, 2022
Merged
| ]; | ||
|
|
||
| Ok(Some(Expr::Function(Function { | ||
| name: ObjectName(vec![Ident::new("TIMESTAMPADD")]), |
There was a problem hiding this comment.
For sake of consistency with other custom functions, could we give this an all lowercase name?
Suggested change
| name: ObjectName(vec![Ident::new("TIMESTAMPADD")]), | |
| name: ObjectName(vec![Ident::new("timestampadd")]), |
Codecov Report
@@ Coverage Diff @@
## main #857 +/- ##
==========================================
+ Coverage 77.44% 77.58% +0.13%
==========================================
Files 71 71
Lines 3600 3600
Branches 634 634
==========================================
+ Hits 2788 2793 +5
+ Misses 685 676 -9
- Partials 127 131 +4
📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
|
Closing this now that these changes are part of #838 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
DataFusion's parser cannot parse
timestampadd(year, 2, d)becauseyearis not a keyword, so it assumes that this is an identifier and looks for a column with this name.This PR works around the issue by providing a custom prefix parser in the
DaskSqlDialectwhere we can override parsing of just this expression and then fall back to DataFusion. This is a new feature that was added to sqlparser relatively recently.