Merge pull request databendlabs#5490 from fkuner/chore-date-add

chore(parser): delete redundancy reserved function token
zqxul · May 20, 2022 · ae2c460 · ae2c460
2 parents 29f2f59 + f74bef7
commit ae2c460
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/common/ast/src/ast/expr.rs b/common/ast/src/ast/expr.rs
@@ -702,7 +702,7 @@ impl<'a> Display for Expr<'a> {
                 unit,
                 ..
             } => {
-                write!(f, "DATEADD({date}, INTERVAL {interval} {unit})")?;
+                write!(f, "DATE_ADD({date}, INTERVAL {interval} {unit})")?;
             }
         }
 

diff --git a/common/ast/src/parser/expr.rs b/common/ast/src/parser/expr.rs
@@ -792,7 +792,7 @@ pub fn expr_element(i: Input) -> IResult<WithSpan> {
     );
     let date_add = map(
         rule! {
-            DATEADD ~ "(" ~ #subexpr(0) ~ "," ~ #subexpr(0) ~ "," ~ #interval_kind ~ ")"
+            DATE_ADD ~ "(" ~ #subexpr(0) ~ "," ~ #subexpr(0) ~ "," ~ #interval_kind ~ ")"
         },
         |(_, _, date, _, interval, _, unit, _)| ExprElement::DateAdd {
             date,
@@ -818,7 +818,7 @@ pub fn expr_element(i: Input) -> IResult<WithSpan> {
             | #binary_op : "<operator>"
             | #unary_op : "<operator>"
             | #cast : "`CAST(... AS ...)`"
-            | #date_add: "`DATEADD(..., ..., (YEAR| MONTH | DAY | HOUR | MINUTE | SECOND | DOY | DOW))`"
+            | #date_add: "`DATE_ADD(..., ..., (YEAR| MONTH | DAY | HOUR | MINUTE | SECOND | DOY | DOW))`"
             | #interval: "`INTERVAL ... (YEAR| MONTH | DAY | HOUR | MINUTE | SECOND | DOY | DOW)`"
             | #pg_cast : "`::<type_name>`"
             | #extract : "`EXTRACT((YEAR | MONTH | DAY | HOUR | MINUTE | SECOND) FROM ...)`"

diff --git a/common/ast/src/parser/token.rs b/common/ast/src/parser/token.rs
@@ -295,7 +295,7 @@ pub enum TokenKind {
     #[token("DATE", ignore(ascii_case))]
     DATE,
     #[token("DATE_ADD", ignore(ascii_case))]
-    DATEADD,
+    DATE_ADD,
     #[token("DATETIME", ignore(ascii_case))]
     DATETIME,
     #[token("DAY", ignore(ascii_case))]
@@ -791,15 +791,7 @@ impl TokenKind {
             | TokenKind::WHERE
             // | TokenKind::WINDOW
             | TokenKind::WITH
-            | TokenKind::DATEADD
-            | TokenKind::YEAR
-            | TokenKind::MONTH
-            | TokenKind::DAY
-            | TokenKind::HOUR
-            | TokenKind::MINUTE
-            | TokenKind::SECOND
-            | TokenKind::DOY
-            | TokenKind::DOW
+            | TokenKind::DATE_ADD
             if !after_as => true,
             _ => false
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -702,7 +702,7 @@ impl<'a> Display for Expr<'a> { @@
                     unit,
                     ..
                 } => {
-                    write!(f, "DATEADD({date}, INTERVAL {interval} {unit})")?;
+                    write!(f, "DATE_ADD({date}, INTERVAL {interval} {unit})")?;
                 }
             }
@@ Expand Down @@