Better date function for tsql (#1636)

* Better date function parsing for T-SQL * Add rule test case * Add additional case * Update function name * Wording
sqlfluff · Oct 14, 2021 · 6794b96 · 6794b96
1 parent 8619f79
commit 6794b96
Show file tree

Hide file tree

Showing 8 changed files with 429 additions and 9 deletions.
diff --git a/src/sqlfluff/dialects/dialect_ansi.py b/src/sqlfluff/dialects/dialect_ansi.py
@@ -967,7 +967,7 @@ class FunctionSegment(BaseSegment):
     match_grammar = OneOf(
         Sequence(
             Sequence(
-                Ref("DateAddFunctionNameSegment"),
+                Ref("DatePartFunctionNameSegment"),
                 Bracketed(
                     Delimited(
                         Ref("DatePartClause"),
@@ -987,7 +987,7 @@ class FunctionSegment(BaseSegment):
                     Ref("FunctionNameSegment"),
                     max_times=1,
                     min_times=1,
-                    exclude=Ref("DateAddFunctionNameSegment"),
+                    exclude=Ref("DatePartFunctionNameSegment"),
                 ),
                 Bracketed(
                     Ref(
@@ -3142,7 +3142,7 @@ class DropSequenceStatementSegment(BaseSegment):
 
 
 @ansi_dialect.segment()
-class DateAddFunctionNameSegment(BaseSegment):
+class DatePartFunctionNameSegment(BaseSegment):
     """DATEADD function name segment.
 
     Need to be able to specify this as type function_name

diff --git a/src/sqlfluff/dialects/dialect_exasol.py b/src/sqlfluff/dialects/dialect_exasol.py
@@ -3412,7 +3412,7 @@ class FunctionSegment(BaseSegment):
     match_grammar = OneOf(
         Sequence(
             Sequence(
-                Ref("DateAddFunctionNameSegment"),
+                Ref("DatePartFunctionNameSegment"),
                 Bracketed(
                     Ref(
                         "FunctionContentsGrammar",
@@ -3430,7 +3430,7 @@ class FunctionSegment(BaseSegment):
                     Ref("FunctionNameSegment"),
                     max_times=1,
                     min_times=1,
-                    exclude=Ref("DateAddFunctionNameSegment"),
+                    exclude=Ref("DatePartFunctionNameSegment"),
                 ),
                 Bracketed(
                     Ref(
@@ -3447,7 +3447,7 @@ class FunctionSegment(BaseSegment):
 
 
 @exasol_dialect.segment(replace=True)
-class DateAddFunctionNameSegment(BaseSegment):
+class DatePartFunctionNameSegment(BaseSegment):
     """DATEADD function name segment.
 
     Need to be able to specify this as type function_name

diff --git a/src/sqlfluff/dialects/dialect_redshift.py b/src/sqlfluff/dialects/dialect_redshift.py
@@ -35,7 +35,7 @@
 
 
 @redshift_dialect.segment(replace=True)
-class DateAddFunctionNameSegment(BaseSegment):
+class DatePartFunctionNameSegment(BaseSegment):
     """DATEADD function name segment.
 
     Override to support DATEDIFF as well

diff --git a/src/sqlfluff/dialects/dialect_tsql.py b/src/sqlfluff/dialects/dialect_tsql.py
@@ -928,7 +928,7 @@ class FunctionSegment(BaseSegment):
     match_grammar = OneOf(
         Sequence(
             Sequence(
-                Ref("DateAddFunctionNameSegment"),
+                Ref("DatePartFunctionNameSegment"),
                 Bracketed(
                     Delimited(
                         Ref("DatePartClause"),
@@ -992,7 +992,7 @@ class FunctionSegment(BaseSegment):
                         # List of special functions handled differently
                         Ref("CastFunctionNameSegment"),
                         Ref("ConvertFunctionNameSegment"),
-                        Ref("DateAddFunctionNameSegment"),
+                        Ref("DatePartFunctionNameSegment"),
                         Ref("WithinGroupFunctionNameSegment"),
                     ),
                 ),
@@ -1465,3 +1465,14 @@ class DropStatementSegment(BaseSegment):
             Ref("DelimiterSegment", optional=True),
         ],
     )
+
+
+@tsql_dialect.segment(replace=True)
+class DatePartFunctionNameSegment(BaseSegment):
+    """DATEADD function name segment.
+
+    Override to support DATEDIFF as well
+    """
+
+    type = "function_name"
+    match_grammar = OneOf("DATEADD", "DATEDIFF", "DATEDIFF_BIG", "DATENAME")
diff --git a/src/sqlfluff/dialects/dialect_tsql_keywords.py b/src/sqlfluff/dialects/dialect_tsql_keywords.py
@@ -236,6 +236,9 @@
     "COLUMNSTORE",
     "D",
     "DATEADD",
+    "DATEDIFF",
+    "DATEDIFF_BIG",
+    "DATENAME",
     "DAY",
     "DAYOFYEAR",
     "DD",

diff --git a/test/fixtures/dialects/tsql/select_date_functions.sql b/test/fixtures/dialects/tsql/select_date_functions.sql
@@ -0,0 +1,25 @@
+SELECT
+    [hello],
+    DATEDIFF(day, [mydate], GETDATE()) AS [test],
+    DATEPART(day, [mydate], GETDATE()) AS [test2],
+    DATEDIFF(year,        '2005-12-31 23:59:59.9999999', '2006-01-01 00:00:00.0000000'),
+    DATEDIFF(quarter,     '2005-12-31 23:59:59.9999999', '2006-01-01 00:00:00.0000000'),
+    DATEDIFF(month,       '2005-12-31 23:59:59.9999999', '2006-01-01 00:00:00.0000000'),
+    DATEDIFF(dayofyear,   '2005-12-31 23:59:59.9999999', '2006-01-01 00:00:00.0000000'),
+    DATEDIFF(day,         '2005-12-31 23:59:59.9999999', '2006-01-01 00:00:00.0000000'),
+    DATEDIFF(week,        '2005-12-31 23:59:59.9999999', '2006-01-01 00:00:00.0000000'),
+    DATEDIFF(hour,        '2005-12-31 23:59:59.9999999', '2006-01-01 00:00:00.0000000'),
+    DATEDIFF(minute,      '2005-12-31 23:59:59.9999999', '2006-01-01 00:00:00.0000000'),
+    DATEDIFF(second,      '2005-12-31 23:59:59.9999999', '2006-01-01 00:00:00.0000000'),
+    DATEDIFF(millisecond, '2005-12-31 23:59:59.9999999', '2006-01-01 00:00:00.0000000'),
+    DATEDIFF(microsecond, '2005-12-31 23:59:59.9999999', '2006-01-01 00:00:00.0000000'),
+    DATEDIFF_BIG(microsecond, '2005-12-31 23:59:59.9999999', '2006-01-01 00:00:00.0000000'),
+    DATEADD(year,2147483647, '20060731'),
+    DATEADD(year,-2147483647, '20060731'),
+    DATENAME(year, '12:10:30.123'),
+    DATENAME(month, '12:10:30.123'),
+    DATENAME(day, '12:10:30.123'),
+    DATENAME(dayofyear, '12:10:30.123'),
+    DATENAME(weekday, '12:10:30.123')
+FROM
+    mytable;