Fix/1116 mixed cluster order for mv

.changes/unreleased/Fixes-20240613-162504.yaml

@@ -0,0 +1,6 @@
+kind: Fixes
+body: Fix mixed cluster order for materialized views
+time: 2024-06-13T16:25:04.020387+02:00
+custom:
+    Author: thmswt
+    Issue: "1116"

dbt/adapters/bigquery/relation_configs/_cluster.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from typing import Any, Dict, FrozenSet, Optional
+from typing import Any, Dict, Optional, Tuple
 
 from dbt.adapters.relation_configs import RelationConfigChange
 from dbt.adapters.contracts.relation import RelationConfig
@@ -20,7 +20,7 @@ class BigQueryClusterConfig(BigQueryBaseRelationConfig):
         - Note: can contain up to four columns
     """
 
-    fields: FrozenSet[str]
+    fields: Tuple[str, ...]
 
     @classmethod
     def from_dict(cls, config_dict: Dict[str, Any]) -> Self:
@@ -35,13 +35,13 @@ def parse_relation_config(cls, relation_config: RelationConfig) -> Dict[str, Any
             # users may input a single field as a string
             if isinstance(cluster_by, str):
                 cluster_by = [cluster_by]
-            config_dict.update({"fields": frozenset(cluster_by)})
+            config_dict.update({"fields": tuple(cluster_by)})
 
         return config_dict
 
     @classmethod
     def parse_bq_table(cls, table: BigQueryTable) -> Dict[str, Any]:  # type: ignore
-        config_dict = {"fields": frozenset(table.clustering_fields)}
+        config_dict = {"fields": tuple(table.clustering_fields)}
         return config_dict
 
 

tests/functional/adapter/materialized_view_tests/test_materialized_view_changes.py

@@ -22,7 +22,7 @@ def check_start_state(project, materialized_view):
         assert results.partition.field == "record_valid_date"
         assert results.partition.data_type == "datetime"
         assert results.partition.granularity == "day"
-        assert results.cluster.fields == frozenset({"id", "value"})
+        assert results.cluster.fields == tuple(["id", "value"])
 
     @staticmethod
     def change_config_via_alter(project, materialized_view):
@@ -74,7 +74,7 @@ def check_state_replace_change_is_applied(project, materialized_view):
         assert results.partition.field == "value"
         assert results.partition.data_type == "int64"
         assert results.partition.range == {"start": 0, "end": 500, "interval": 50}
-        assert results.cluster.fields == frozenset({"id"})
+        assert results.cluster.fields == tuple(["id"])
 
 
 class TestBigQueryMaterializedViewChangesApply(

tests/functional/adapter/materialized_view_tests/test_materialized_view_cluster_changes.py

@@ -21,7 +21,7 @@ def check_start_state(project, materialized_view):
         assert isinstance(results, BigQueryMaterializedViewConfig)
         assert results.options.enable_refresh is True
         assert results.options.refresh_interval_minutes == 60
-        assert results.cluster.fields == frozenset({"id", "value"})
+        assert results.cluster.fields == tuple(["id", "value"])
 
     @staticmethod
     def change_config_via_alter(project, materialized_view):
@@ -48,7 +48,7 @@ def check_state_replace_change_is_applied(project, materialized_view):
         with get_connection(project.adapter):
             results = project.adapter.describe_relation(materialized_view)
         assert isinstance(results, BigQueryMaterializedViewConfig)
-        assert results.cluster.fields == frozenset({"id"})
+        assert results.cluster.fields == tuple(["id"])
 
 
 class TestBigQueryMaterializedViewClusterChangesApply(