bigquery: EXTRACT support For DAYOFWEEK, DAYOFYEAR, ISOWEEK, TIME (ap…

…ache#980)
serprex · Nov 6, 2023 · b0bf4d1 · b0bf4d1
1 parent 8acc3b6
commit b0bf4d1
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 0 deletions.
diff --git a/src/ast/value.rs b/src/ast/value.rs
@@ -117,6 +117,8 @@ pub enum DateTimeField {
     Month,
     Week,
     Day,
+    DayOfWeek,
+    DayOfYear,
     Date,
     Hour,
     Minute,
@@ -127,6 +129,7 @@ pub enum DateTimeField {
     Doy,
     Epoch,
     Isodow,
+    IsoWeek,
     Isoyear,
     Julian,
     Microsecond,
@@ -138,6 +141,7 @@ pub enum DateTimeField {
     Nanosecond,
     Nanoseconds,
     Quarter,
+    Time,
     Timezone,
     TimezoneHour,
     TimezoneMinute,
@@ -151,6 +155,8 @@ impl fmt::Display for DateTimeField {
             DateTimeField::Month => "MONTH",
             DateTimeField::Week => "WEEK",
             DateTimeField::Day => "DAY",
+            DateTimeField::DayOfWeek => "DAYOFWEEK",
+            DateTimeField::DayOfYear => "DAYOFYEAR",
             DateTimeField::Date => "DATE",
             DateTimeField::Hour => "HOUR",
             DateTimeField::Minute => "MINUTE",
@@ -162,6 +168,7 @@ impl fmt::Display for DateTimeField {
             DateTimeField::Epoch => "EPOCH",
             DateTimeField::Isodow => "ISODOW",
             DateTimeField::Isoyear => "ISOYEAR",
+            DateTimeField::IsoWeek => "ISOWEEK",
             DateTimeField::Julian => "JULIAN",
             DateTimeField::Microsecond => "MICROSECOND",
             DateTimeField::Microseconds => "MICROSECONDS",
@@ -172,6 +179,7 @@ impl fmt::Display for DateTimeField {
             DateTimeField::Nanosecond => "NANOSECOND",
             DateTimeField::Nanoseconds => "NANOSECONDS",
             DateTimeField::Quarter => "QUARTER",
+            DateTimeField::Time => "TIME",
             DateTimeField::Timezone => "TIMEZONE",
             DateTimeField::TimezoneHour => "TIMEZONE_HOUR",
             DateTimeField::TimezoneMinute => "TIMEZONE_MINUTE",

diff --git a/src/keywords.rs b/src/keywords.rs
@@ -197,6 +197,8 @@ define_keywords!(
     DATE,
     DATETIME,
     DAY,
+    DAYOFWEEK,
+    DAYOFYEAR,
     DEALLOCATE,
     DEC,
     DECADE,
@@ -337,6 +339,7 @@ define_keywords!(
     IS,
     ISODOW,
     ISOLATION,
+    ISOWEEK,
     ISOYEAR,
     JAR,
     JOIN,

diff --git a/src/parser/mod.rs b/src/parser/mod.rs
@@ -1512,6 +1512,8 @@ impl<'a> Parser<'a> {
                 Keyword::MONTH => Ok(DateTimeField::Month),
                 Keyword::WEEK => Ok(DateTimeField::Week),
                 Keyword::DAY => Ok(DateTimeField::Day),
+                Keyword::DAYOFWEEK => Ok(DateTimeField::DayOfWeek),
+                Keyword::DAYOFYEAR => Ok(DateTimeField::DayOfYear),
                 Keyword::DATE => Ok(DateTimeField::Date),
                 Keyword::HOUR => Ok(DateTimeField::Hour),
                 Keyword::MINUTE => Ok(DateTimeField::Minute),
@@ -1523,6 +1525,7 @@ impl<'a> Parser<'a> {
                 Keyword::EPOCH => Ok(DateTimeField::Epoch),
                 Keyword::ISODOW => Ok(DateTimeField::Isodow),
                 Keyword::ISOYEAR => Ok(DateTimeField::Isoyear),
+                Keyword::ISOWEEK => Ok(DateTimeField::IsoWeek),
                 Keyword::JULIAN => Ok(DateTimeField::Julian),
                 Keyword::MICROSECOND => Ok(DateTimeField::Microsecond),
                 Keyword::MICROSECONDS => Ok(DateTimeField::Microseconds),
@@ -1533,6 +1536,7 @@ impl<'a> Parser<'a> {
                 Keyword::NANOSECOND => Ok(DateTimeField::Nanosecond),
                 Keyword::NANOSECONDS => Ok(DateTimeField::Nanoseconds),
                 Keyword::QUARTER => Ok(DateTimeField::Quarter),
+                Keyword::TIME => Ok(DateTimeField::Time),
                 Keyword::TIMEZONE => Ok(DateTimeField::Timezone),
                 Keyword::TIMEZONE_HOUR => Ok(DateTimeField::TimezoneHour),
                 Keyword::TIMEZONE_MINUTE => Ok(DateTimeField::TimezoneMinute),

diff --git a/tests/sqlparser_common.rs b/tests/sqlparser_common.rs
@@ -2069,6 +2069,8 @@ fn parse_extract() {
     verified_stmt("SELECT EXTRACT(MONTH FROM d)");
     verified_stmt("SELECT EXTRACT(WEEK FROM d)");
     verified_stmt("SELECT EXTRACT(DAY FROM d)");
+    verified_stmt("SELECT EXTRACT(DAYOFWEEK FROM d)");
+    verified_stmt("SELECT EXTRACT(DAYOFYEAR FROM d)");
     verified_stmt("SELECT EXTRACT(DATE FROM d)");
     verified_stmt("SELECT EXTRACT(HOUR FROM d)");
     verified_stmt("SELECT EXTRACT(MINUTE FROM d)");
@@ -2082,6 +2084,7 @@ fn parse_extract() {
     verified_stmt("SELECT EXTRACT(DOY FROM d)");
     verified_stmt("SELECT EXTRACT(EPOCH FROM d)");
     verified_stmt("SELECT EXTRACT(ISODOW FROM d)");
+    verified_stmt("SELECT EXTRACT(ISOWEEK FROM d)");
     verified_stmt("SELECT EXTRACT(ISOYEAR FROM d)");
     verified_stmt("SELECT EXTRACT(JULIAN FROM d)");
     verified_stmt("SELECT EXTRACT(MICROSECOND FROM d)");
@@ -2094,6 +2097,7 @@ fn parse_extract() {
     verified_stmt("SELECT EXTRACT(TIMEZONE FROM d)");
     verified_stmt("SELECT EXTRACT(TIMEZONE_HOUR FROM d)");
     verified_stmt("SELECT EXTRACT(TIMEZONE_MINUTE FROM d)");
+    verified_stmt("SELECT EXTRACT(TIME FROM d)");
 
     let res = parse_sql_statements("SELECT EXTRACT(JIFFY FROM d)");
     assert_eq!(