Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 13 additions & 3 deletions src/parser/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -844,9 +844,19 @@ impl<'a> Parser<'a> {
Keyword::OVERLAY => self.parse_overlay_expr(),
Keyword::TRIM => self.parse_trim_expr(),
Keyword::INTERVAL
if self.peek_token().token != Token::Period
&& self.peek_token().token != Token::Comma
&& self.peek_token().token != Token::RParen =>
if !vec![
Token::Comma,
Token::Period,
Token::RParen,
Token::Gt,
Token::GtEq,
Token::Lt,
Token::LtEq,
Token::Eq,
Token::DoubleEq,
Token::Neq,
]
.contains(&self.peek_token().token) =>
{
self.parse_interval()
}
Expand Down
12 changes: 10 additions & 2 deletions tests/sqlparser_common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1275,7 +1275,6 @@ fn generic() -> TestedDialects {
}
}


#[test]
fn parse_json_ops_without_colon() {
use self::JsonOperator;
Expand Down Expand Up @@ -8687,6 +8686,15 @@ WITH (
#[test]
fn interval_identifier() {
generic()
.parse_sql_statements("SELECT min(interval) as min_interval FROM table1")
.parse_sql_statements(
"
SELECT MIN(interval) AS min_interval FROM table1 WHERE interval > 0;
SELECT MIN(interval) AS min_interval FROM table1 WHERE interval >= 0;
SELECT MAX(interval) AS max_interval FROM table1 WHERE interval < 100;
SELECT MAX(interval) AS max_interval FROM table1 WHERE interval <= 100;
SELECT COUNT(interval) AS intervals FROM table1 WHERE interval = 50;
SELECT COUNT(interval) AS intervals FROM table1 WHERE interval <> NULL;
",
)
.unwrap();
}