Merge branch 'main' into TSQL_Declare_Fix

sqlfluff · Oct 13, 2021 · 89cd067 · 89cd067
2 parents c3f95de + 2a72241
commit 89cd067
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 33 deletions.
diff --git a/src/sqlfluff/dialects/dialect_snowflake.py b/src/sqlfluff/dialects/dialect_snowflake.py
@@ -791,45 +791,56 @@ class AlterTableColumnStatementSegment(BaseSegment):
         "ALTER",
         "TABLE",
         Ref("TableReferenceSegment"),
-        OneOf("ALTER", "MODIFY"),
-        OptionallyBracketed(
-            Delimited(
-                OneOf(
-                    # Add things
-                    Sequence(
-                        Ref.keyword("COLUMN", optional=True),
-                        Ref("SingleIdentifierGrammar"),
+        OneOf(
+            Sequence(
+                "DROP",
+                Ref.keyword("COLUMN", optional=True),
+                Ref("SingleIdentifierGrammar"),
+            ),
+            Sequence(
+                OneOf("ALTER", "MODIFY"),
+                OptionallyBracketed(
+                    Delimited(
                         OneOf(
-                            Sequence("DROP", "DEFAULT"),
+                            # Add things
                             Sequence(
-                                "SET",
-                                "DEFAULT",
-                                Ref("NakedIdentifierSegment"),
-                                Ref("DotSegment"),
-                                "NEXTVAL",
-                            ),
-                            Sequence(
-                                OneOf("SET", "DROP", optional=True), "NOT", "NULL"
+                                Ref.keyword("COLUMN", optional=True),
+                                Ref("SingleIdentifierGrammar"),
+                                OneOf(
+                                    Sequence("DROP", "DEFAULT"),
+                                    Sequence(
+                                        "SET",
+                                        "DEFAULT",
+                                        Ref("NakedIdentifierSegment"),
+                                        Ref("DotSegment"),
+                                        "NEXTVAL",
+                                    ),
+                                    Sequence(
+                                        OneOf("SET", "DROP", optional=True),
+                                        "NOT",
+                                        "NULL",
+                                    ),
+                                    Sequence(
+                                        Sequence(
+                                            Sequence("SET", "DATA", optional=True),
+                                            "TYPE",
+                                            optional=True,
+                                        ),
+                                        Ref("DatatypeSegment"),
+                                    ),
+                                    Sequence("COMMENT", Ref("QuotedLiteralSegment")),
+                                ),
                             ),
                             Sequence(
-                                Sequence(
-                                    Sequence("SET", "DATA", optional=True),
-                                    "TYPE",
-                                    optional=True,
-                                ),
-                                Ref("DatatypeSegment"),
+                                "COLUMN",
+                                Ref("SingleIdentifierGrammar"),
+                                OneOf("SET", "UNSET"),
+                                "MASKING",
+                                "POLICY",
+                                Ref("FunctionNameIdentifierSegment", optional=True),
                             ),
-                            Sequence("COMMENT", Ref("QuotedLiteralSegment")),
                         ),
                     ),
-                    Sequence(
-                        "COLUMN",
-                        Ref("SingleIdentifierGrammar"),
-                        OneOf("SET", "UNSET"),
-                        "MASKING",
-                        "POLICY",
-                        Ref("FunctionNameIdentifierSegment", optional=True),
-                    ),
                 ),
             ),
         ),

diff --git a/test/fixtures/dialects/snowflake/snowflake_alter_table_column.sql b/test/fixtures/dialects/snowflake/snowflake_alter_table_column.sql
@@ -27,3 +27,6 @@ alter table empl_info modify
     column empl_id unset masking policy
   , column empl_dob unset masking policy
 ;
+
+alter table test_table column test_column;
+alter table test_schema.test_table column test_column;
diff --git a/test/fixtures/dialects/snowflake/snowflake_alter_table_column.yml b/test/fixtures/dialects/snowflake/snowflake_alter_table_column.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: ef15dedecc089fc8c97f4c6711b60ce49df61850e4a5ed998bfd55f0f5d309d4
+_hash: e96e904a863c121e05868d36181faed96219162fc10dfb3432527bac5acd292f
 file:
 - statement:
     alter_table_column_statement:
@@ -154,3 +154,23 @@ file:
     - keyword: masking
     - keyword: policy
 - statement_terminator: ;
+- statement:
+    alter_table_statement:
+    - keyword: alter
+    - keyword: table
+    - table_reference:
+        identifier: test_table
+    - parameter: column
+    - identifier: test_column
+- statement_terminator: ;
+- statement:
+    alter_table_statement:
+    - keyword: alter
+    - keyword: table
+    - table_reference:
+      - identifier: test_schema
+      - dot: .
+      - identifier: test_table
+    - parameter: column
+    - identifier: test_column
+- statement_terminator: ;