Skip to content

fix: Correct INTERVAL + INTERVAL expression parsing #26

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

Merged
MazterQyou merged 1 commit into from
Sep 19, 2022
Merged

fix: Correct INTERVAL + INTERVAL expression parsing #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1026,7 +1026,7 @@ impl<'a> Parser<'a> {

// The first token in an interval is a string literal which specifies
// the duration of the interval.
let value = self.parse_expr()?;
let value = self.parse_subexpr(Self::PLUS_MINUS_PREC)?;

// Following the string literal is a qualifier which indicates the units
// of the duration specified in the string literal.
Expand Down
53 changes: 53 additions & 0 deletions tests/sqlparser_common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2708,6 +2708,59 @@ fn parse_literal_interval() {
);
}

#[test]
fn parse_interval_math() {
let sql = "SELECT INTERVAL '1 DAY' + INTERVAL '2 DAY'";
let select = verified_only_select(sql);
assert_eq!(
&Expr::BinaryOp {
left: Box::new(Expr::Value(Value::Interval {
value: Box::new(Expr::Value(Value::SingleQuotedString("1 DAY".to_string()))),
leading_field: None,
leading_precision: None,
last_field: None,
fractional_seconds_precision: None,
})),
op: BinaryOperator::Plus,
right: Box::new(Expr::Value(Value::Interval {
value: Box::new(Expr::Value(Value::SingleQuotedString("2 DAY".to_string()))),
leading_field: None,
leading_precision: None,
last_field: None,
fractional_seconds_precision: None,
})),
},
expr_from_projection(only(&select.projection)),
);

let sql = "SELECT INTERVAL '1' || ' DAY' + INTERVAL '2 DAY'";
let select = verified_only_select(sql);
assert_eq!(
&Expr::BinaryOp {
left: Box::new(Expr::Value(Value::Interval {
value: Box::new(Expr::BinaryOp {
left: Box::new(Expr::Value(Value::SingleQuotedString("1".to_string()))),
op: BinaryOperator::StringConcat,
right: Box::new(Expr::Value(Value::SingleQuotedString(" DAY".to_string()))),
}),
leading_field: None,
leading_precision: None,
last_field: None,
fractional_seconds_precision: None,
})),
op: BinaryOperator::Plus,
right: Box::new(Expr::Value(Value::Interval {
value: Box::new(Expr::Value(Value::SingleQuotedString("2 DAY".to_string()))),
leading_field: None,
leading_precision: None,
last_field: None,
fractional_seconds_precision: None,
})),
},
expr_from_projection(only(&select.projection)),
);
}

#[test]
fn parse_at_timezone() {
let zero = Expr::Value(number("0"));
Expand Down