Fix: replace exp.StructKwarg with exp.ColumnDef in schema diff (#830)

* Fix: replace exp.StructKwarg with exp.ColumnDef in schema diff

* Bump sqlglot

Author: georgesittas

setup.py

@@ -44,7 +44,7 @@
         "requests",
         "rich",
         "ruamel.yaml",
-        "sqlglot~=12.1.0",
+        "sqlglot~=12.2.0",
         "fsspec",
     ],
     extras_require={

sqlmesh/core/schema_diff.py

@@ -75,13 +75,15 @@ def array_of_primitive(self, name: str, quoted: bool = False) -> TableAlterColum
         )
 
     @classmethod
-    def from_struct_kwarg(self, struct: exp.StructKwarg) -> TableAlterColumn:
+    def from_struct_kwarg(self, struct: exp.ColumnDef) -> TableAlterColumn:
         name = struct.alias_or_name
         quoted = struct.this.quoted
-        if struct.expression.is_type(exp.DataType.Type.STRUCT):
+        kwarg_type = struct.args["kind"]
+
+        if kwarg_type.is_type(exp.DataType.Type.STRUCT):
             return self.struct(name, quoted=quoted)
-        elif struct.expression.is_type(exp.DataType.Type.ARRAY):
-            if struct.expression.expressions[0].is_type(exp.DataType.Type.STRUCT):
+        elif kwarg_type.is_type(exp.DataType.Type.ARRAY):
+            if kwarg_type.expressions[0].is_type(exp.DataType.Type.STRUCT):
                 return self.array_of_struct(name, quoted=quoted)
             else:
                 return self.array_of_primitive(name, quoted=quoted)
@@ -128,7 +130,7 @@ def middle(self, after: t.Union[str, exp.Identifier]) -> TableAlterColumnPositio
     def create(
         self,
         pos: int,
-        current_kwargs: t.List[exp.StructKwarg],
+        current_kwargs: t.List[exp.ColumnDef],
         replacing_col: bool = False,
     ) -> TableAlterColumnPosition:
         is_first = pos == 0
@@ -296,7 +298,7 @@ def _dict_to_struct(cls, value: t.Dict[str, exp.DataType]) -> exp.DataType:
         return exp.DataType(
             this=exp.DataType.Type.STRUCT,
             expressions=[
-                exp.StructKwarg(this=exp.to_identifier(k), expression=v) for k, v in value.items()
+                exp.ColumnDef(this=exp.to_identifier(k), kind=v) for k, v in value.items()
             ],
             nested=True,
         )
@@ -310,10 +312,10 @@ def _is_compatible_type(self, current_type: exp.DataType, new_type: exp.DataType
 
     def _get_matching_kwarg(
         self,
-        current_kwarg: t.Union[str, exp.StructKwarg],
+        current_kwarg: t.Union[str, exp.ColumnDef],
         new_struct: exp.DataType,
         current_pos: int,
-    ) -> t.Tuple[t.Optional[int], t.Optional[exp.StructKwarg]]:
+    ) -> t.Tuple[t.Optional[int], t.Optional[exp.ColumnDef]]:
         current_name = (
             exp.to_identifier(current_kwarg)
             if isinstance(current_kwarg, str)
@@ -346,7 +348,7 @@ def _drop_operation(
         assert column_kwarg
         struct.expressions.pop(column_pos)
         operations.append(
-            TableAlterOperation.drop(columns, root_struct.copy(), column_kwarg.expression)
+            TableAlterOperation.drop(columns, root_struct.copy(), column_kwarg.args["kind"])
         )
         return operations
 
@@ -371,7 +373,7 @@ def _add_operation(
         self,
         columns: t.List[TableAlterColumn],
         new_pos: int,
-        new_kwarg: exp.StructKwarg,
+        new_kwarg: exp.ColumnDef,
         current_struct: exp.DataType,
         root_struct: exp.DataType,
     ) -> t.List[TableAlterOperation]:
@@ -384,7 +386,7 @@ def _add_operation(
         return [
             TableAlterOperation.add(
                 columns,
-                new_kwarg.expression,
+                new_kwarg.args["kind"],
                 root_struct.copy(),
                 col_pos,
             )
@@ -415,7 +417,7 @@ def _alter_operation(
         new_type: exp.DataType,
         current_type: t.Union[str, exp.DataType],
         root_struct: exp.DataType,
-        new_kwarg: exp.StructKwarg,
+        new_kwarg: exp.ColumnDef,
     ) -> t.List[TableAlterOperation]:
         current_type = exp.DataType.build(current_type)
         if self.support_nested_operations:
@@ -552,5 +554,5 @@ def compare_columns(
         )
 
 
-def _get_name_and_type(struct: exp.StructKwarg) -> t.Tuple[exp.Identifier, exp.DataType]:
-    return struct.this, struct.expression
+def _get_name_and_type(struct: exp.ColumnDef) -> t.Tuple[exp.Identifier, exp.DataType]:
+    return struct.this, struct.args["kind"]