bq: add in more date/time parts

Author: donhcd

src/ast/value.rs

@@ -132,7 +132,7 @@ pub enum DateTimeField {
     YearOfWeekIso,
     Quarter,
     Month,
-    Week,
+    Week(Option<String>),
     WeekIso,
     Day,
     DayOfWeek,
@@ -142,6 +142,8 @@ pub enum DateTimeField {
     Minute,
     Second,
     Epoch,
+    // https://cloud.google.com/bigquery/docs/reference/standard-sql/functions-and-operators#extract_2
+    Other(&'static str),
     Literal(String),
 }
 
@@ -153,7 +155,8 @@ impl fmt::Display for DateTimeField {
             DateTimeField::YearOfWeekIso => "YEAROFWEEKISO",
             DateTimeField::Quarter => "QUARTER",
             DateTimeField::Month => "MONTH",
-            DateTimeField::Week => "WEEK",
+            DateTimeField::Week(None) => "WEEK",
+            DateTimeField::Week(Some(ref weekday)) => return write!(f, "WEEK({})", weekday),
             DateTimeField::WeekIso => "WEEKISO",
             DateTimeField::Day => "DAY",
             DateTimeField::DayOfWeek => "DAYOFWEEK",
@@ -163,6 +166,7 @@ impl fmt::Display for DateTimeField {
             DateTimeField::Minute => "MINUTE",
             DateTimeField::Second => "SECOND",
             DateTimeField::Epoch => "EPOCH",
+            DateTimeField::Other(s) => return write!(f, "{}", s),
             DateTimeField::Literal(ref s) => return write!(f, "'{}'", s),
         })
     }

src/dialect/keywords.rs

@@ -221,6 +221,7 @@ define_keywords!(
     FOREIGN,
     FRAME_ROW,
     FREE,
+    FRIDAY,
     FROM,
     FULL,
     FUNCTION,
@@ -254,6 +255,8 @@ define_keywords!(
     INTO,
     IS,
     ISOLATION,
+    ISOWEEK,
+    ISOYEAR,
     JOIN,
     JSONFILE,
     KEY,
@@ -283,6 +286,8 @@ define_keywords!(
     MEMBER,
     MERGE,
     METHOD,
+    MICROSECOND,
+    MILLISECOND,
     MIN,
     MINUS,
     MINUTE,
@@ -291,6 +296,7 @@ define_keywords!(
     MODIFIES,
     MODULE,
     MON,
+    MONDAY,
     MONS,
     MONTH,
     MONTHS,
@@ -393,6 +399,7 @@ define_keywords!(
     ROWID,
     ROWS,
     ROW_NUMBER,
+    SATURDAY,
     SAVEPOINT,
     SCHEMA,
     SCOPE,
@@ -428,6 +435,7 @@ define_keywords!(
     SUBSTRING_REGEX,
     SUCCEEDS,
     SUM,
+    SUNDAY,
     SYMMETRIC,
     SYSTEM,
     SYSTEM_TIME,
@@ -437,6 +445,7 @@ define_keywords!(
     TEXT,
     TEXTFILE,
     THEN,
+    THURSDAY,
     TIES,
     TIME,
     TIMESTAMP,
@@ -456,6 +465,7 @@ define_keywords!(
     TRUE,
     TRUNCATE,
     TRY_CAST,
+    TUESDAY,
     UESCAPE,
     UNBOUNDED,
     UNCOMMITTED,
@@ -481,6 +491,7 @@ define_keywords!(
     VIEW,
     VIRTUAL,
     W,
+    WEDNESDAY,
     WEEK,
     WEEKDAY,
     WEEKOFYEAR,

src/parser.rs

@@ -668,12 +668,27 @@ impl<'a> Parser<'a> {
                 Keyword::MONTH | Keyword::MM | Keyword::MON | Keyword::MONS | Keyword::MONTHS => {
                     Ok(DateTimeField::Month)
                 }
+                Keyword::WEEK
+                    if dialect_of!(self is BigQueryDialect)
+                        && self.consume_token(&Token::LParen) =>
+                {
+                    use Keyword::*;
+                    let weekday = self.expect_one_of_keywords(&[
+                        SUNDAY, MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY, SATURDAY,
+                    ])?;
+                    self.expect_token(&Token::RParen)?;
+                    Ok(DateTimeField::Week(Some(format!("{:?}", weekday))))
+                }
                 Keyword::WEEK
                 | Keyword::W
                 | Keyword::WK
                 | Keyword::WEEKOFYEAR
                 | Keyword::WOY
-                | Keyword::WY => Ok(DateTimeField::Week),
+                | Keyword::WY => Ok(DateTimeField::Week(None)),
+                Keyword::ISOWEEK => Ok(DateTimeField::Other("ISOWEEK")),
+                Keyword::ISOYEAR => Ok(DateTimeField::Other("ISOYEAR")),
+                Keyword::MICROSECOND => Ok(DateTimeField::Other("MICROSECOND")),
+                Keyword::MILLISECOND => Ok(DateTimeField::Other("MILLISECOND")),
                 Keyword::WEEKISO
                 | Keyword::WEEK_ISO
                 | Keyword::WEEKOFYEARISO
@@ -739,11 +754,15 @@ impl<'a> Parser<'a> {
             Token::Word(kw)
                 if [
                     Keyword::YEAR,
+                    Keyword::QUARTER,
                     Keyword::MONTH,
+                    Keyword::WEEK,
                     Keyword::DAY,
                     Keyword::HOUR,
                     Keyword::MINUTE,
                     Keyword::SECOND,
+                    Keyword::MILLISECOND,
+                    Keyword::MICROSECOND,
                 ]
                 .iter()
                 .any(|d| kw.keyword == *d) =>