Skip to content

Commit f639184

Browse files
iffyioJichaoS
iffyio
authored and
JichaoS
committed
Support more DateTimeField variants (apache#1191)
1 parent df1d198 commit f639184

File tree

6 files changed

+129
-46
lines changed

6 files changed

+129
-46
lines changed

‎src/ast/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ impl fmt::Display for Interval {
229229
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
230230
let value = self.value.as_ref();
231231
match (
232-
self.leading_field,
232+
&self.leading_field,
233233
self.leading_precision,
234234
self.fractional_seconds_precision,
235235
) {
@@ -248,13 +248,13 @@ impl fmt::Display for Interval {
248248
}
249249
_ => {
250250
write!(f, "INTERVAL {value}")?;
251-
if let Some(leading_field) = self.leading_field {
251+
if let Some(leading_field) = &self.leading_field {
252252
write!(f, " {leading_field}")?;
253253
}
254254
if let Some(leading_precision) = self.leading_precision {
255255
write!(f, " ({leading_precision})")?;
256256
}
257-
if let Some(last_field) = self.last_field {
257+
if let Some(last_field) = &self.last_field {
258258
write!(f, " TO {last_field}")?;
259259
}
260260
if let Some(fractional_seconds_precision) = self.fractional_seconds_precision {

‎src/ast/value.rs

Lines changed: 75 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@
1212

1313
#[cfg(not(feature = "std"))]
1414
use alloc::string::String;
15+
16+
#[cfg(not(feature = "std"))]
17+
use alloc::format;
18+
19+
#[cfg(not(feature = "std"))]
20+
use alloc::string::ToString;
21+
1522
use core::fmt;
1623

1724
#[cfg(feature = "bigdecimal")]
@@ -20,6 +27,7 @@ use bigdecimal::BigDecimal;
2027
#[cfg(feature = "serde")]
2128
use serde::{Deserialize, Serialize};
2229

30+
use crate::ast::Ident;
2331
#[cfg(feature = "visitor")]
2432
use sqlparser_derive::{Visit, VisitMut};
2533

@@ -109,17 +117,25 @@ impl fmt::Display for DollarQuotedString {
109117
}
110118
}
111119

112-
#[derive(Debug, Copy, Clone, PartialEq, Eq, Ord, PartialOrd, Hash)]
120+
#[derive(Debug, Clone, PartialEq, Eq, Ord, PartialOrd, Hash)]
113121
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
114122
#[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
115123
pub enum DateTimeField {
116124
Year,
117125
Month,
118-
Week,
126+
/// Week optionally followed by a WEEKDAY.
127+
///
128+
/// ```sql
129+
/// WEEK(MONDAY)
130+
/// ```
131+
///
132+
/// [BigQuery](https://cloud.google.com/bigquery/docs/reference/standard-sql/date_functions#extract)
133+
Week(Option<Ident>),
119134
Day,
120135
DayOfWeek,
121136
DayOfYear,
122137
Date,
138+
Datetime,
123139
Hour,
124140
Minute,
125141
Second,
@@ -148,47 +164,67 @@ pub enum DateTimeField {
148164
TimezoneMinute,
149165
TimezoneRegion,
150166
NoDateTime,
167+
/// Arbitrary abbreviation or custom date-time part.
168+
///
169+
/// ```sql
170+
/// EXTRACT(q FROM CURRENT_TIMESTAMP)
171+
/// ```
172+
/// [Snowflake](https://docs.snowflake.com/en/sql-reference/functions-date-time#supported-date-and-time-parts)
173+
Custom(Ident),
151174
}
152175

153176
impl fmt::Display for DateTimeField {
154177
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
155-
f.write_str(match self {
156-
DateTimeField::Year => "YEAR",
157-
DateTimeField::Month => "MONTH",
158-
DateTimeField::Week => "WEEK",
159-
DateTimeField::Day => "DAY",
160-
DateTimeField::DayOfWeek => "DAYOFWEEK",
161-
DateTimeField::DayOfYear => "DAYOFYEAR",
162-
DateTimeField::Date => "DATE",
163-
DateTimeField::Hour => "HOUR",
164-
DateTimeField::Minute => "MINUTE",
165-
DateTimeField::Second => "SECOND",
166-
DateTimeField::Century => "CENTURY",
167-
DateTimeField::Decade => "DECADE",
168-
DateTimeField::Dow => "DOW",
169-
DateTimeField::Doy => "DOY",
170-
DateTimeField::Epoch => "EPOCH",
171-
DateTimeField::Isodow => "ISODOW",
172-
DateTimeField::Isoyear => "ISOYEAR",
173-
DateTimeField::IsoWeek => "ISOWEEK",
174-
DateTimeField::Julian => "JULIAN",
175-
DateTimeField::Microsecond => "MICROSECOND",
176-
DateTimeField::Microseconds => "MICROSECONDS",
177-
DateTimeField::Millenium => "MILLENIUM",
178-
DateTimeField::Millennium => "MILLENNIUM",
179-
DateTimeField::Millisecond => "MILLISECOND",
180-
DateTimeField::Milliseconds => "MILLISECONDS",
181-
DateTimeField::Nanosecond => "NANOSECOND",
182-
DateTimeField::Nanoseconds => "NANOSECONDS",
183-
DateTimeField::Quarter => "QUARTER",
184-
DateTimeField::Time => "TIME",
185-
DateTimeField::Timezone => "TIMEZONE",
186-
DateTimeField::TimezoneAbbr => "TIMEZONE_ABBR",
187-
DateTimeField::TimezoneHour => "TIMEZONE_HOUR",
188-
DateTimeField::TimezoneMinute => "TIMEZONE_MINUTE",
189-
DateTimeField::TimezoneRegion => "TIMEZONE_REGION",
190-
DateTimeField::NoDateTime => "NODATETIME",
191-
})
178+
f.write_str(
179+
match self {
180+
DateTimeField::Year => "YEAR".to_string(),
181+
DateTimeField::Month => "MONTH".to_string(),
182+
DateTimeField::Week(week_day) => {
183+
format!(
184+
"WEEK{}",
185+
week_day
186+
.as_ref()
187+
.map(|w| format!("({w})"))
188+
.unwrap_or_default()
189+
)
190+
}
191+
DateTimeField::Day => "DAY".to_string(),
192+
DateTimeField::DayOfWeek => "DAYOFWEEK".to_string(),
193+
DateTimeField::DayOfYear => "DAYOFYEAR".to_string(),
194+
DateTimeField::Date => "DATE".to_string(),
195+
DateTimeField::Datetime => "DATETIME".to_string(),
196+
DateTimeField::Hour => "HOUR".to_string(),
197+
DateTimeField::Minute => "MINUTE".to_string(),
198+
DateTimeField::Second => "SECOND".to_string(),
199+
DateTimeField::Century => "CENTURY".to_string(),
200+
DateTimeField::Decade => "DECADE".to_string(),
201+
DateTimeField::Dow => "DOW".to_string(),
202+
DateTimeField::Doy => "DOY".to_string(),
203+
DateTimeField::Epoch => "EPOCH".to_string(),
204+
DateTimeField::Isodow => "ISODOW".to_string(),
205+
DateTimeField::Isoyear => "ISOYEAR".to_string(),
206+
DateTimeField::IsoWeek => "ISOWEEK".to_string(),
207+
DateTimeField::Julian => "JULIAN".to_string(),
208+
DateTimeField::Microsecond => "MICROSECOND".to_string(),
209+
DateTimeField::Microseconds => "MICROSECONDS".to_string(),
210+
DateTimeField::Millenium => "MILLENIUM".to_string(),
211+
DateTimeField::Millennium => "MILLENNIUM".to_string(),
212+
DateTimeField::Millisecond => "MILLISECOND".to_string(),
213+
DateTimeField::Milliseconds => "MILLISECONDS".to_string(),
214+
DateTimeField::Nanosecond => "NANOSECOND".to_string(),
215+
DateTimeField::Nanoseconds => "NANOSECONDS".to_string(),
216+
DateTimeField::Quarter => "QUARTER".to_string(),
217+
DateTimeField::Time => "TIME".to_string(),
218+
DateTimeField::Timezone => "TIMEZONE".to_string(),
219+
DateTimeField::TimezoneAbbr => "TIMEZONE_ABBR".to_string(),
220+
DateTimeField::TimezoneHour => "TIMEZONE_HOUR".to_string(),
221+
DateTimeField::TimezoneMinute => "TIMEZONE_MINUTE".to_string(),
222+
DateTimeField::TimezoneRegion => "TIMEZONE_REGION".to_string(),
223+
DateTimeField::NoDateTime => "NODATETIME".to_string(),
224+
DateTimeField::Custom(custom) => format!("{custom}"),
225+
}
226+
.as_str(),
227+
)
192228
}
193229
}
194230

‎src/parser/mod.rs

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1857,11 +1857,23 @@ impl<'a> Parser<'a> {
18571857
Token::Word(w) => match w.keyword {
18581858
Keyword::YEAR => Ok(DateTimeField::Year),
18591859
Keyword::MONTH => Ok(DateTimeField::Month),
1860-
Keyword::WEEK => Ok(DateTimeField::Week),
1860+
Keyword::WEEK => {
1861+
let week_day = if dialect_of!(self is BigQueryDialect | GenericDialect)
1862+
&& self.consume_token(&Token::LParen)
1863+
{
1864+
let week_day = self.parse_identifier(false)?;
1865+
self.expect_token(&Token::RParen)?;
1866+
Some(week_day)
1867+
} else {
1868+
None
1869+
};
1870+
Ok(DateTimeField::Week(week_day))
1871+
}
18611872
Keyword::DAY => Ok(DateTimeField::Day),
18621873
Keyword::DAYOFWEEK => Ok(DateTimeField::DayOfWeek),
18631874
Keyword::DAYOFYEAR => Ok(DateTimeField::DayOfYear),
18641875
Keyword::DATE => Ok(DateTimeField::Date),
1876+
Keyword::DATETIME => Ok(DateTimeField::Datetime),
18651877
Keyword::HOUR => Ok(DateTimeField::Hour),
18661878
Keyword::MINUTE => Ok(DateTimeField::Minute),
18671879
Keyword::SECOND => Ok(DateTimeField::Second),
@@ -1889,6 +1901,11 @@ impl<'a> Parser<'a> {
18891901
Keyword::TIMEZONE_HOUR => Ok(DateTimeField::TimezoneHour),
18901902
Keyword::TIMEZONE_MINUTE => Ok(DateTimeField::TimezoneMinute),
18911903
Keyword::TIMEZONE_REGION => Ok(DateTimeField::TimezoneRegion),
1904+
_ if dialect_of!(self is SnowflakeDialect | GenericDialect) => {
1905+
self.prev_token();
1906+
let custom = self.parse_identifier(false)?;
1907+
Ok(DateTimeField::Custom(custom))
1908+
}
18921909
_ => self.expected("date/time field", next_token),
18931910
},
18941911
_ => self.expected("date/time field", next_token),

‎tests/sqlparser_bigquery.rs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1462,6 +1462,19 @@ fn test_bigquery_trim() {
14621462
);
14631463
}
14641464

1465+
#[test]
1466+
fn parse_extract_weekday() {
1467+
let sql = "SELECT EXTRACT(WEEK(MONDAY) FROM d)";
1468+
let select = bigquery_and_generic().verified_only_select(sql);
1469+
assert_eq!(
1470+
&Expr::Extract {
1471+
field: DateTimeField::Week(Some(Ident::new("MONDAY"))),
1472+
expr: Box::new(Expr::Identifier(Ident::new("d"))),
1473+
},
1474+
expr_from_projection(only(&select.projection)),
1475+
);
1476+
}
1477+
14651478
#[test]
14661479
fn test_select_as_struct() {
14671480
bigquery().verified_only_select("SELECT * FROM (SELECT AS VALUE STRUCT(123 AS a, false AS b))");

‎tests/sqlparser_common.rs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2271,6 +2271,7 @@ fn parse_extract() {
22712271
verified_stmt("SELECT EXTRACT(DAYOFWEEK FROM d)");
22722272
verified_stmt("SELECT EXTRACT(DAYOFYEAR FROM d)");
22732273
verified_stmt("SELECT EXTRACT(DATE FROM d)");
2274+
verified_stmt("SELECT EXTRACT(DATETIME FROM d)");
22742275
verified_stmt("SELECT EXTRACT(HOUR FROM d)");
22752276
verified_stmt("SELECT EXTRACT(MINUTE FROM d)");
22762277
verified_stmt("SELECT EXTRACT(SECOND FROM d)");
@@ -2300,7 +2301,8 @@ fn parse_extract() {
23002301
verified_stmt("SELECT EXTRACT(TIMEZONE_REGION FROM d)");
23012302
verified_stmt("SELECT EXTRACT(TIME FROM d)");
23022303

2303-
let res = parse_sql_statements("SELECT EXTRACT(JIFFY FROM d)");
2304+
let dialects = all_dialects_except(|d| d.is::<SnowflakeDialect>() || d.is::<GenericDialect>());
2305+
let res = dialects.parse_sql_statements("SELECT EXTRACT(JIFFY FROM d)");
23042306
assert_eq!(
23052307
ParserError::ParserError("Expected date/time field, found: JIFFY".to_string()),
23062308
res.unwrap_err()
@@ -2338,7 +2340,8 @@ fn parse_ceil_datetime() {
23382340
verified_stmt("SELECT CEIL(d TO SECOND) FROM df");
23392341
verified_stmt("SELECT CEIL(d TO MILLISECOND) FROM df");
23402342

2341-
let res = parse_sql_statements("SELECT CEIL(d TO JIFFY) FROM df");
2343+
let dialects = all_dialects_except(|d| d.is::<SnowflakeDialect>() || d.is::<GenericDialect>());
2344+
let res = dialects.parse_sql_statements("SELECT CEIL(d TO JIFFY) FROM df");
23422345
assert_eq!(
23432346
ParserError::ParserError("Expected date/time field, found: JIFFY".to_string()),
23442347
res.unwrap_err()
@@ -2364,7 +2367,8 @@ fn parse_floor_datetime() {
23642367
verified_stmt("SELECT FLOOR(d TO SECOND) FROM df");
23652368
verified_stmt("SELECT FLOOR(d TO MILLISECOND) FROM df");
23662369

2367-
let res = parse_sql_statements("SELECT FLOOR(d TO JIFFY) FROM df");
2370+
let dialects = all_dialects_except(|d| d.is::<SnowflakeDialect>() || d.is::<GenericDialect>());
2371+
let res = dialects.parse_sql_statements("SELECT FLOOR(d TO JIFFY) FROM df");
23682372
assert_eq!(
23692373
ParserError::ParserError("Expected date/time field, found: JIFFY".to_string()),
23702374
res.unwrap_err()

‎tests/sqlparser_snowflake.rs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1472,6 +1472,19 @@ fn parse_top() {
14721472
);
14731473
}
14741474

1475+
#[test]
1476+
fn parse_extract_custom_part() {
1477+
let sql = "SELECT EXTRACT(eod FROM d)";
1478+
let select = snowflake_and_generic().verified_only_select(sql);
1479+
assert_eq!(
1480+
&Expr::Extract {
1481+
field: DateTimeField::Custom(Ident::new("eod")),
1482+
expr: Box::new(Expr::Identifier(Ident::new("d"))),
1483+
},
1484+
expr_from_projection(only(&select.projection)),
1485+
);
1486+
}
1487+
14751488
#[test]
14761489
fn parse_comma_outer_join() {
14771490
// compound identifiers

0 commit comments

Comments
 (0)