Skip to content

PostgreSQL: Parse a word after an interval value that is not a PostgreSQL field as an alias #2775

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
LucaCappelletti94 merged 1 commit into from
Oct 30, 2026
Merged

PostgreSQL: Parse a word after an interval value that is not a PostgreSQL field as an alias #2775

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
1 change: 1 addition & 0 deletions fuzz/fuzz_seeds/postgres_interval_alias_after_value.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SELECT INTERVAL '1' WEEK, INTERVAL '1' DAYS, INTERVAL '1' DAY
41 changes: 41 additions & 0 deletions src/dialect/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1369,6 +1369,47 @@ pub trait Dialect: Debug + Any {
false
}

/// Returns true if `kw` can start the qualifier of an `INTERVAL` value, e.g. `DAY` in `INTERVAL '1' DAY`.
fn is_interval_qualifier(&self, kw: Keyword) -> bool {
matches!(
kw,
Keyword::YEAR
| Keyword::YEARS
| Keyword::MONTH
| Keyword::MONTHS
| Keyword::WEEK
| Keyword::WEEKS
| Keyword::DAY
| Keyword::DAYS
| Keyword::HOUR
| Keyword::HOURS
| Keyword::MINUTE
| Keyword::MINUTES
| Keyword::SECOND
| Keyword::SECONDS
| Keyword::CENTURY
| Keyword::DECADE
| Keyword::DOW
| Keyword::DOY
| Keyword::EPOCH
| Keyword::ISODOW
| Keyword::ISOYEAR
| Keyword::JULIAN
| Keyword::MICROSECOND
| Keyword::MICROSECONDS
| Keyword::MILLENIUM
| Keyword::MILLENNIUM
| Keyword::MILLISECOND
| Keyword::MILLISECONDS
| Keyword::NANOSECOND
| Keyword::NANOSECONDS
| Keyword::QUARTER
| Keyword::TIMEZONE
| Keyword::TIMEZONE_HOUR
| Keyword::TIMEZONE_MINUTE
)
}

/// Returns true if the dialect supports `EXPLAIN` statements with utility options
/// e.g. `EXPLAIN (ANALYZE TRUE, BUFFERS TRUE) SELECT * FROM tbl;`
fn supports_explain_with_utility_options(&self) -> bool {
Expand Down
13 changes: 13 additions & 0 deletions src/dialect/postgresql.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,6 +544,19 @@ impl Dialect for PostgreSqlDialect {
true
}

/// See `opt_interval` in <https://github.com/postgres/postgres/blob/master/src/backend/parser/gram.y>
fn is_interval_qualifier(&self, kw: Keyword) -> bool {
matches!(
kw,
Keyword::YEAR
| Keyword::MONTH
| Keyword::DAY
| Keyword::HOUR
| Keyword::MINUTE
| Keyword::SECOND
)
}

fn supports_insert_table_alias(&self) -> bool {
true
}
Expand Down
45 changes: 4 additions & 41 deletions src/parser/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3566,47 +3566,10 @@ impl<'a> Parser<'a> {
/// Peek at the next token and determine if it is a temporal unit
/// like `second`.
pub fn next_token_is_temporal_unit(&mut self) -> bool {
if let Token::Word(word) = &self.peek_token_ref().token {
matches!(
word.keyword,
Keyword::YEAR
| Keyword::YEARS
| Keyword::MONTH
| Keyword::MONTHS
| Keyword::WEEK
| Keyword::WEEKS
| Keyword::DAY
| Keyword::DAYS
| Keyword::HOUR
| Keyword::HOURS
| Keyword::MINUTE
| Keyword::MINUTES
| Keyword::SECOND
| Keyword::SECONDS
| Keyword::CENTURY
| Keyword::DECADE
| Keyword::DOW
| Keyword::DOY
| Keyword::EPOCH
| Keyword::ISODOW
| Keyword::ISOYEAR
| Keyword::JULIAN
| Keyword::MICROSECOND
| Keyword::MICROSECONDS
| Keyword::MILLENIUM
| Keyword::MILLENNIUM
| Keyword::MILLISECOND
| Keyword::MILLISECONDS
| Keyword::NANOSECOND
| Keyword::NANOSECONDS
| Keyword::QUARTER
| Keyword::TIMEZONE
| Keyword::TIMEZONE_HOUR
| Keyword::TIMEZONE_MINUTE
)
} else {
false
}
matches!(
&self.peek_token_ref().token,
Token::Word(word) if self.dialect.is_interval_qualifier(word.keyword)
)
}

/// Syntax
Expand Down
37 changes: 20 additions & 17 deletions tests/sqlparser_common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7080,8 +7080,11 @@ fn parse_interval_all() {
expr_from_projection(only(&select.projection)),
);

// PostgreSQL reads `WEEK` and the plural units as a column alias.
let dialects = all_dialects_except(|d| d.is::<PostgreSqlDialect>());

let sql = "SELECT INTERVAL 5 DAYS";
let select = verified_only_select(sql);
let select = dialects.verified_only_select(sql);
assert_eq!(
&Expr::Interval(Interval {
value: Box::new(Expr::value(number("5"))),
Expand Down Expand Up @@ -7122,18 +7125,18 @@ fn parse_interval_all() {

verified_only_select("SELECT INTERVAL '1' YEAR");
verified_only_select("SELECT INTERVAL '1' MONTH");
verified_only_select("SELECT INTERVAL '1' WEEK");
dialects.verified_only_select("SELECT INTERVAL '1' WEEK");
verified_only_select("SELECT INTERVAL '1' DAY");
verified_only_select("SELECT INTERVAL '1' HOUR");
verified_only_select("SELECT INTERVAL '1' MINUTE");
verified_only_select("SELECT INTERVAL '1' SECOND");
verified_only_select("SELECT INTERVAL '1' YEARS");
verified_only_select("SELECT INTERVAL '1' MONTHS");
verified_only_select("SELECT INTERVAL '1' WEEKS");
verified_only_select("SELECT INTERVAL '1' DAYS");
verified_only_select("SELECT INTERVAL '1' HOURS");
verified_only_select("SELECT INTERVAL '1' MINUTES");
verified_only_select("SELECT INTERVAL '1' SECONDS");
dialects.verified_only_select("SELECT INTERVAL '1' YEARS");
dialects.verified_only_select("SELECT INTERVAL '1' MONTHS");
dialects.verified_only_select("SELECT INTERVAL '1' WEEKS");
dialects.verified_only_select("SELECT INTERVAL '1' DAYS");
dialects.verified_only_select("SELECT INTERVAL '1' HOURS");
dialects.verified_only_select("SELECT INTERVAL '1' MINUTES");
dialects.verified_only_select("SELECT INTERVAL '1' SECONDS");
verified_only_select("SELECT INTERVAL '1' YEAR TO MONTH");
verified_only_select("SELECT INTERVAL '1' DAY TO HOUR");
verified_only_select("SELECT INTERVAL '1' DAY TO MINUTE");
Expand All @@ -7143,18 +7146,18 @@ fn parse_interval_all() {
verified_only_select("SELECT INTERVAL '1' MINUTE TO SECOND");
verified_only_select("SELECT INTERVAL 1 YEAR");
verified_only_select("SELECT INTERVAL 1 MONTH");
verified_only_select("SELECT INTERVAL 1 WEEK");
dialects.verified_only_select("SELECT INTERVAL 1 WEEK");
verified_only_select("SELECT INTERVAL 1 DAY");
verified_only_select("SELECT INTERVAL 1 HOUR");
verified_only_select("SELECT INTERVAL 1 MINUTE");
verified_only_select("SELECT INTERVAL 1 SECOND");
verified_only_select("SELECT INTERVAL 1 YEARS");
verified_only_select("SELECT INTERVAL 1 MONTHS");
verified_only_select("SELECT INTERVAL 1 WEEKS");
verified_only_select("SELECT INTERVAL 1 DAYS");
verified_only_select("SELECT INTERVAL 1 HOURS");
verified_only_select("SELECT INTERVAL 1 MINUTES");
verified_only_select("SELECT INTERVAL 1 SECONDS");
dialects.verified_only_select("SELECT INTERVAL 1 YEARS");
dialects.verified_only_select("SELECT INTERVAL 1 MONTHS");
dialects.verified_only_select("SELECT INTERVAL 1 WEEKS");
dialects.verified_only_select("SELECT INTERVAL 1 DAYS");
dialects.verified_only_select("SELECT INTERVAL 1 HOURS");
dialects.verified_only_select("SELECT INTERVAL 1 MINUTES");
dialects.verified_only_select("SELECT INTERVAL 1 SECONDS");
verified_only_select(
"SELECT '2 years 15 months 100 weeks 99 hours 123456789 milliseconds'::INTERVAL",
);
Expand Down
37 changes: 37 additions & 0 deletions tests/sqlparser_postgres.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11671,3 +11671,40 @@ fn parse_drop_group_is_dialect_gated() {
))
);
}

#[test]
fn parse_interval_followed_by_alias() {
for alias in [
"WEEK", "WEEKS", "DAYS", "YEARS", "DECADE", "QUARTER", "EPOCH",
] {
let select = pg().verified_only_select_with_canonical(
&format!("SELECT INTERVAL '1' {alias}"),
&format!("SELECT INTERVAL '1' AS {alias}"),
);
match only(&select.projection) {
SelectItem::ExprWithAlias {
expr: Expr::Interval(interval),
alias: ident,
} => {
assert_eq!(interval.leading_field, None);
assert_eq!(ident.value, alias);
}
item => panic!("unexpected projection: {item:?}"),
}
}

let select = pg().verified_only_select("SELECT INTERVAL '1' DAY");
assert!(matches!(
only(&select.projection),
SelectItem::UnnamedExpr(Expr::Interval(Interval {
leading_field: Some(DateTimeField::Day),
..
}))
));

assert_eq!(
pg().parse_sql_statements("SELECT 1 WHERE x > INTERVAL '1' WEEK")
.unwrap_err(),
ParserError::ParserError("Expected: end of statement, found: WEEK".to_string())
);
}
Loading