MySQL: Fix parsing 'ALTER TABLE ts ADD COLUMN modified_at TIMESTAMP NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP;' (#5766) (#5767)

olshak · web-flow · commit 422a92b64657 · 2024-04-13T15:29:40.000Z
diff --git a/src/sqlfluff/dialects/dialect_mysql.py b/src/sqlfluff/dialects/dialect_mysql.py
@@ -338,6 +338,7 @@ class ColumnDefinitionSegment(BaseSegment):
                             ),
                             Ref("NumericLiteralSegment"),
                             Ref("QuotedLiteralSegment"),
+                            "NULL",
                         ),
                         optional=True,
                     ),
diff --git a/test/fixtures/dialects/mysql/create_table_datetime.sql b/test/fixtures/dialects/mysql/create_table_datetime.sql
@@ -20,5 +20,6 @@ CREATE TABLE `foo` (
   ts12 TIMESTAMP NULL DEFAULT '0000-00-00 00:00:00',
   ts13 TIMESTAMP NULL DEFAULT NOW ON UPDATE NOW,
   ts14 TIMESTAMP NULL DEFAULT NOW() ON UPDATE NOW(),
-  ts15 TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
+  ts15 TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  ts16 TIMESTAMP NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP
 )
diff --git a/test/fixtures/dialects/mysql/create_table_datetime.yml b/test/fixtures/dialects/mysql/create_table_datetime.yml
@@ -3,7 +3,7 @@
 # computed by SQLFluff when running the tests. Please run
 # `python test/generate_parse_fixture_yml.py`  to generate them after adding or
 # altering SQL files.
-_hash: e9c33e67e5d27f30efd11d52a52f8df18d2b949a6a4585b07a9053b6d4e5f1a8
+_hash: 7d380062698a45e2def8a6ea2766b072296d0f462727a05fddfceddc50c2e735
 file:
   statement:
     create_table_statement:
@@ -137,9 +137,8 @@ file:
         - naked_identifier: ts8
         - keyword: TIMESTAMP
         - keyword: 'NULL'
-        - column_constraint_segment:
-            keyword: DEFAULT
-            null_literal: 'NULL'
+        - keyword: DEFAULT
+        - keyword: 'NULL'
       - comma: ','
       - column_definition:
         - naked_identifier: ts9
@@ -208,4 +207,14 @@ file:
         - keyword: 'ON'
         - keyword: UPDATE
         - keyword: CURRENT_TIMESTAMP
+      - comma: ','
+      - column_definition:
+        - naked_identifier: ts16
+        - keyword: TIMESTAMP
+        - keyword: 'NULL'
+        - keyword: DEFAULT
+        - keyword: 'NULL'
+        - keyword: 'ON'
+        - keyword: UPDATE
+        - keyword: CURRENT_TIMESTAMP
       - end_bracket: )

Original file line number	Diff line number	Diff line change
@@ -20,5 +20,6 @@ CREATE TABLE `foo` (
`20`	`20`	`ts12 TIMESTAMP NULL DEFAULT '0000-00-00 00:00:00',`
`21`	`21`	`ts13 TIMESTAMP NULL DEFAULT NOW ON UPDATE NOW,`
`22`	`22`	`ts14 TIMESTAMP NULL DEFAULT NOW() ON UPDATE NOW(),`
`23`		`- ts15 TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP`
	`23`	`+ ts15 TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,`
	`24`	`+ ts16 TIMESTAMP NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP`
`24`	`25`	`)`