Skip to content
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

fix: support uppercase when parsing Interval #8478

Merged
merged 4 commits into from
Dec 11, 2023
Merged

fix: support uppercase when parsing Interval #8478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a49b81f
fix: interval uppercase unit
QuenKar Dec 7, 2023
a75418c
feat: add test
QuenKar Dec 9, 2023
1869cba
chore: fmt
QuenKar Dec 9, 2023
2081019
chore: remove redundant test
QuenKar Dec 9, 2023
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 datafusion/sql/src/expr/value.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,7 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> {

// TODO make interval parsing better in arrow-rs / expose `IntervalType`
fn has_units(val: &str) -> bool {
let val = val.to_lowercase();
val.ends_with("century")
|| val.ends_with("centuries")
|| val.ends_with("decade")
Expand Down
80 changes: 80 additions & 0 deletions datafusion/sqllogictest/test_files/interval.slt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,86 @@ select interval '5' nanoseconds
----
0 years 0 mons 0 days 0 hours 0 mins 0.000000005 secs

query ?
select interval '5 YEAR'
----
0 years 60 mons 0 days 0 hours 0 mins 0.000000000 secs

query ?
select interval '5 MONTH'
----
0 years 5 mons 0 days 0 hours 0 mins 0.000000000 secs

query ?
select interval '5 WEEK'
----
0 years 0 mons 35 days 0 hours 0 mins 0.000000000 secs

query ?
select interval '5 DAY'
----
0 years 0 mons 5 days 0 hours 0 mins 0.000000000 secs

query ?
select interval '5 HOUR'
----
0 years 0 mons 0 days 5 hours 0 mins 0.000000000 secs

query ?
select interval '5 HOURS'
----
0 years 0 mons 0 days 5 hours 0 mins 0.000000000 secs

query ?
select interval '5 MINUTE'
----
0 years 0 mons 0 days 0 hours 5 mins 0.000000000 secs

query ?
select interval '5 SECOND'
----
0 years 0 mons 0 days 0 hours 0 mins 5.000000000 secs

query ?
select interval '5 SECONDS'
----
0 years 0 mons 0 days 0 hours 0 mins 5.000000000 secs

query ?
select interval '5 MILLISECOND'
----
0 years 0 mons 0 days 0 hours 0 mins 0.005000000 secs

query ?
select interval '5 MILLISECONDS'
----
0 years 0 mons 0 days 0 hours 0 mins 0.005000000 secs

query ?
select interval '5 MICROSECOND'
----
0 years 0 mons 0 days 0 hours 0 mins 0.000005000 secs

query ?
select interval '5 MICROSECONDS'
----
0 years 0 mons 0 days 0 hours 0 mins 0.000005000 secs

query ?
select interval '5 NANOSECOND'
----
0 years 0 mons 0 days 0 hours 0 mins 0.000000005 secs

query ?
select interval '5 NANOSECONDS'
----
0 years 0 mons 0 days 0 hours 0 mins 0.000000005 secs

query ?
select interval '5 YEAR 5 MONTH 5 DAY 5 HOUR 5 MINUTE 5 SECOND 5 MILLISECOND 5 MICROSECOND 5 NANOSECOND'
----
0 years 65 mons 5 days 5 hours 5 mins 5.005005005 secs

# Interval with string literal addition
query ?
select interval '1 month' + '1 month'
Expand Down