Skip to content

Commit 8d924c9

Browse files
wugeerayman-sigma
wugeer
authored and
ayman-sigma
committed
Support pluralized time units (apache#1630)
1 parent 7d9102b commit 8d924c9

File tree

4 files changed

+122
-18
lines changed

4 files changed

+122
-18
lines changed

‎src/ast/value.rs‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,9 @@ impl fmt::Display for DollarQuotedString {
155155
#[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
156156
pub enum DateTimeField {
157157
Year,
158+
Years,
158159
Month,
160+
Months,
159161
/// Week optionally followed by a WEEKDAY.
160162
///
161163
/// ```sql
@@ -164,14 +166,19 @@ pub enum DateTimeField {
164166
///
165167
/// [BigQuery](https://cloud.google.com/bigquery/docs/reference/standard-sql/date_functions#extract)
166168
Week(Option<Ident>),
169+
Weeks,
167170
Day,
168171
DayOfWeek,
169172
DayOfYear,
173+
Days,
170174
Date,
171175
Datetime,
172176
Hour,
177+
Hours,
173178
Minute,
179+
Minutes,
174180
Second,
181+
Seconds,
175182
Century,
176183
Decade,
177184
Dow,
@@ -210,22 +217,29 @@ impl fmt::Display for DateTimeField {
210217
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
211218
match self {
212219
DateTimeField::Year => write!(f, "YEAR"),
220+
DateTimeField::Years => write!(f, "YEARS"),
213221
DateTimeField::Month => write!(f, "MONTH"),
222+
DateTimeField::Months => write!(f, "MONTHS"),
214223
DateTimeField::Week(week_day) => {
215224
write!(f, "WEEK")?;
216225
if let Some(week_day) = week_day {
217226
write!(f, "({week_day})")?
218227
}
219228
Ok(())
220229
}
230+
DateTimeField::Weeks => write!(f, "WEEKS"),
221231
DateTimeField::Day => write!(f, "DAY"),
222232
DateTimeField::DayOfWeek => write!(f, "DAYOFWEEK"),
223233
DateTimeField::DayOfYear => write!(f, "DAYOFYEAR"),
234+
DateTimeField::Days => write!(f, "DAYS"),
224235
DateTimeField::Date => write!(f, "DATE"),
225236
DateTimeField::Datetime => write!(f, "DATETIME"),
226237
DateTimeField::Hour => write!(f, "HOUR"),
238+
DateTimeField::Hours => write!(f, "HOURS"),
227239
DateTimeField::Minute => write!(f, "MINUTE"),
240+
DateTimeField::Minutes => write!(f, "MINUTES"),
228241
DateTimeField::Second => write!(f, "SECOND"),
242+
DateTimeField::Seconds => write!(f, "SECONDS"),
229243
DateTimeField::Century => write!(f, "CENTURY"),
230244
DateTimeField::Decade => write!(f, "DECADE"),
231245
DateTimeField::Dow => write!(f, "DOW"),

‎src/keywords.rs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ define_keywords!(
234234
DAY,
235235
DAYOFWEEK,
236236
DAYOFYEAR,
237+
DAYS,
237238
DEALLOCATE,
238239
DEC,
239240
DECADE,
@@ -499,13 +500,15 @@ define_keywords!(
499500
MILLISECONDS,
500501
MIN,
501502
MINUTE,
503+
MINUTES,
502504
MINVALUE,
503505
MOD,
504506
MODE,
505507
MODIFIES,
506508
MODIFY,
507509
MODULE,
508510
MONTH,
511+
MONTHS,
509512
MSCK,
510513
MULTISET,
511514
MUTATION,
@@ -698,6 +701,7 @@ define_keywords!(
698701
SEARCH,
699702
SECOND,
700703
SECONDARY,
704+
SECONDS,
701705
SECRET,
702706
SECURITY,
703707
SEED,
@@ -866,6 +870,7 @@ define_keywords!(
866870
VOLATILE,
867871
WAREHOUSE,
868872
WEEK,
873+
WEEKS,
869874
WHEN,
870875
WHENEVER,
871876
WHERE,
@@ -880,6 +885,7 @@ define_keywords!(
880885
XML,
881886
XOR,
882887
YEAR,
888+
YEARS,
883889
ZONE,
884890
ZORDER
885891
);

‎src/parser/mod.rs‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2358,7 +2358,9 @@ impl<'a> Parser<'a> {
23582358
match &next_token.token {
23592359
Token::Word(w) => match w.keyword {
23602360
Keyword::YEAR => Ok(DateTimeField::Year),
2361+
Keyword::YEARS => Ok(DateTimeField::Years),
23612362
Keyword::MONTH => Ok(DateTimeField::Month),
2363+
Keyword::MONTHS => Ok(DateTimeField::Months),
23622364
Keyword::WEEK => {
23632365
let week_day = if dialect_of!(self is BigQueryDialect | GenericDialect)
23642366
&& self.consume_token(&Token::LParen)
@@ -2371,14 +2373,19 @@ impl<'a> Parser<'a> {
23712373
};
23722374
Ok(DateTimeField::Week(week_day))
23732375
}
2376+
Keyword::WEEKS => Ok(DateTimeField::Weeks),
23742377
Keyword::DAY => Ok(DateTimeField::Day),
23752378
Keyword::DAYOFWEEK => Ok(DateTimeField::DayOfWeek),
23762379
Keyword::DAYOFYEAR => Ok(DateTimeField::DayOfYear),
2380+
Keyword::DAYS => Ok(DateTimeField::Days),
23772381
Keyword::DATE => Ok(DateTimeField::Date),
23782382
Keyword::DATETIME => Ok(DateTimeField::Datetime),
23792383
Keyword::HOUR => Ok(DateTimeField::Hour),
2384+
Keyword::HOURS => Ok(DateTimeField::Hours),
23802385
Keyword::MINUTE => Ok(DateTimeField::Minute),
2386+
Keyword::MINUTES => Ok(DateTimeField::Minutes),
23812387
Keyword::SECOND => Ok(DateTimeField::Second),
2388+
Keyword::SECONDS => Ok(DateTimeField::Seconds),
23822389
Keyword::CENTURY => Ok(DateTimeField::Century),
23832390
Keyword::DECADE => Ok(DateTimeField::Decade),
23842391
Keyword::DOY => Ok(DateTimeField::Doy),
@@ -2605,12 +2612,19 @@ impl<'a> Parser<'a> {
26052612
matches!(
26062613
word.keyword,
26072614
Keyword::YEAR
2615+
| Keyword::YEARS
26082616
| Keyword::MONTH
2617+
| Keyword::MONTHS
26092618
| Keyword::WEEK
2619+
| Keyword::WEEKS
26102620
| Keyword::DAY
2621+
| Keyword::DAYS
26112622
| Keyword::HOUR
2623+
| Keyword::HOURS
26122624
| Keyword::MINUTE
2625+
| Keyword::MINUTES
26132626
| Keyword::SECOND
2627+
| Keyword::SECONDS
26142628
| Keyword::CENTURY
26152629
| Keyword::DECADE
26162630
| Keyword::DOW

‎tests/sqlparser_common.rs‎

Lines changed: 88 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ mod test_utils;
5050
#[cfg(test)]
5151
use pretty_assertions::assert_eq;
5252
use sqlparser::ast::ColumnOption::Comment;
53+
use sqlparser::ast::DateTimeField::Seconds;
5354
use sqlparser::ast::Expr::{Identifier, UnaryOp};
5455
use sqlparser::ast::Value::Number;
5556
use sqlparser::test_utils::all_dialects_except;
@@ -5400,6 +5401,19 @@ fn parse_interval_all() {
54005401
expr_from_projection(only(&select.projection)),
54015402
);
54025403

5404+
let sql = "SELECT INTERVAL 5 DAYS";
5405+
let select = verified_only_select(sql);
5406+
assert_eq!(
5407+
&Expr::Interval(Interval {
5408+
value: Box::new(Expr::Value(number("5"))),
5409+
leading_field: Some(DateTimeField::Days),
5410+
leading_precision: None,
5411+
last_field: None,
5412+
fractional_seconds_precision: None,
5413+
}),
5414+
expr_from_projection(only(&select.projection)),
5415+
);
5416+
54035417
let sql = "SELECT INTERVAL '10' HOUR (1)";
54045418
let select = verified_only_select(sql);
54055419
assert_eq!(
@@ -5427,10 +5441,18 @@ fn parse_interval_all() {
54275441

54285442
verified_only_select("SELECT INTERVAL '1' YEAR");
54295443
verified_only_select("SELECT INTERVAL '1' MONTH");
5444+
verified_only_select("SELECT INTERVAL '1' WEEK");
54305445
verified_only_select("SELECT INTERVAL '1' DAY");
54315446
verified_only_select("SELECT INTERVAL '1' HOUR");
54325447
verified_only_select("SELECT INTERVAL '1' MINUTE");
54335448
verified_only_select("SELECT INTERVAL '1' SECOND");
5449+
verified_only_select("SELECT INTERVAL '1' YEARS");
5450+
verified_only_select("SELECT INTERVAL '1' MONTHS");
5451+
verified_only_select("SELECT INTERVAL '1' WEEKS");
5452+
verified_only_select("SELECT INTERVAL '1' DAYS");
5453+
verified_only_select("SELECT INTERVAL '1' HOURS");
5454+
verified_only_select("SELECT INTERVAL '1' MINUTES");
5455+
verified_only_select("SELECT INTERVAL '1' SECONDS");
54345456
verified_only_select("SELECT INTERVAL '1' YEAR TO MONTH");
54355457
verified_only_select("SELECT INTERVAL '1' DAY TO HOUR");
54365458
verified_only_select("SELECT INTERVAL '1' DAY TO MINUTE");
@@ -5440,10 +5462,21 @@ fn parse_interval_all() {
54405462
verified_only_select("SELECT INTERVAL '1' MINUTE TO SECOND");
54415463
verified_only_select("SELECT INTERVAL 1 YEAR");
54425464
verified_only_select("SELECT INTERVAL 1 MONTH");
5465+
verified_only_select("SELECT INTERVAL 1 WEEK");
54435466
verified_only_select("SELECT INTERVAL 1 DAY");
54445467
verified_only_select("SELECT INTERVAL 1 HOUR");
54455468
verified_only_select("SELECT INTERVAL 1 MINUTE");
54465469
verified_only_select("SELECT INTERVAL 1 SECOND");
5470+
verified_only_select("SELECT INTERVAL 1 YEARS");
5471+
verified_only_select("SELECT INTERVAL 1 MONTHS");
5472+
verified_only_select("SELECT INTERVAL 1 WEEKS");
5473+
verified_only_select("SELECT INTERVAL 1 DAYS");
5474+
verified_only_select("SELECT INTERVAL 1 HOURS");
5475+
verified_only_select("SELECT INTERVAL 1 MINUTES");
5476+
verified_only_select("SELECT INTERVAL 1 SECONDS");
5477+
verified_only_select(
5478+
"SELECT '2 years 15 months 100 weeks 99 hours 123456789 milliseconds'::INTERVAL",
5479+
);
54475480
}
54485481

54495482
#[test]
@@ -11359,16 +11392,12 @@ fn test_group_by_nothing() {
1135911392
#[test]
1136011393
fn test_extract_seconds_ok() {
1136111394
let dialects = all_dialects_where(|d| d.allow_extract_custom());
11362-
let stmt = dialects.verified_expr("EXTRACT(seconds FROM '2 seconds'::INTERVAL)");
11395+
let stmt = dialects.verified_expr("EXTRACT(SECONDS FROM '2 seconds'::INTERVAL)");
1136311396

1136411397
assert_eq!(
1136511398
stmt,
1136611399
Expr::Extract {
11367-
field: DateTimeField::Custom(Ident {
11368-
value: "seconds".to_string(),
11369-
quote_style: None,
11370-
span: Span::empty(),
11371-
}),
11400+
field: Seconds,
1137211401
syntax: ExtractSyntax::From,
1137311402
expr: Box::new(Expr::Cast {
1137411403
kind: CastKind::DoubleColon,
@@ -11379,7 +11408,59 @@ fn test_extract_seconds_ok() {
1137911408
format: None,
1138011409
}),
1138111410
}
11382-
)
11411+
);
11412+
11413+
let actual_ast = dialects
11414+
.parse_sql_statements("SELECT EXTRACT(seconds FROM '2 seconds'::INTERVAL)")
11415+
.unwrap();
11416+
11417+
let expected_ast = vec![Statement::Query(Box::new(Query {
11418+
with: None,
11419+
body: Box::new(SetExpr::Select(Box::new(Select {
11420+
select_token: AttachedToken::empty(),
11421+
distinct: None,
11422+
top: None,
11423+
top_before_distinct: false,
11424+
projection: vec![UnnamedExpr(Expr::Extract {
11425+
field: Seconds,
11426+
syntax: ExtractSyntax::From,
11427+
expr: Box::new(Expr::Cast {
11428+
kind: CastKind::DoubleColon,
11429+
expr: Box::new(Expr::Value(Value::SingleQuotedString(
11430+
"2 seconds".to_string(),
11431+
))),
11432+
data_type: DataType::Interval,
11433+
format: None,
11434+
}),
11435+
})],
11436+
into: None,
11437+
from: vec![],
11438+
lateral_views: vec![],
11439+
prewhere: None,
11440+
selection: None,
11441+
group_by: GroupByExpr::Expressions(vec![], vec![]),
11442+
cluster_by: vec![],
11443+
distribute_by: vec![],
11444+
sort_by: vec![],
11445+
having: None,
11446+
named_window: vec![],
11447+
qualify: None,
11448+
window_before_qualify: false,
11449+
value_table_mode: None,
11450+
connect_by: None,
11451+
}))),
11452+
order_by: None,
11453+
limit: None,
11454+
limit_by: vec![],
11455+
offset: None,
11456+
fetch: None,
11457+
locks: vec![],
11458+
for_clause: None,
11459+
settings: None,
11460+
format_clause: None,
11461+
}))];
11462+
11463+
assert_eq!(actual_ast, expected_ast);
1138311464
}
1138411465

1138511466
#[test]
@@ -11408,17 +11489,6 @@ fn test_extract_seconds_single_quote_ok() {
1140811489
)
1140911490
}
1141011491

11411-
#[test]
11412-
fn test_extract_seconds_err() {
11413-
let sql = "SELECT EXTRACT(seconds FROM '2 seconds'::INTERVAL)";
11414-
let dialects = all_dialects_except(|d| d.allow_extract_custom());
11415-
let err = dialects.parse_sql_statements(sql).unwrap_err();
11416-
assert_eq!(
11417-
err.to_string(),
11418-
"sql parser error: Expected: date/time field, found: seconds"
11419-
);
11420-
}
11421-
1142211492
#[test]
1142311493
fn test_extract_seconds_single_quote_err() {
1142411494
let sql = r#"SELECT EXTRACT('seconds' FROM '2 seconds'::INTERVAL)"#;

0 commit comments

Comments
 (0)