Put back Union order changes, use dbtClassMixin in test_serialization.py

dbt-labs · Dec 19, 2024 · 5f94de5 · 5f94de5
1 parent d1274b1
commit 5f94de5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/core/dbt/artifacts/resources/v1/components.py b/core/dbt/artifacts/resources/v1/components.py
@@ -12,7 +12,7 @@
 from dbt_common.dataclass_schema import ExtensibleDbtClassMixin, dbtClassMixin
 from dbt_semantic_interfaces.type_enums import TimeGranularity
 
-NodeVersion = Union[str, float]
+NodeVersion = Union[int, float, str]
 
 
 @dataclass

diff --git a/core/dbt/artifacts/resources/v1/source_definition.py b/core/dbt/artifacts/resources/v1/source_definition.py
@@ -40,7 +40,7 @@ class ExternalTable(AdditionalPropertiesAllowed, Mergeable):
     file_format: Optional[str] = None
     row_format: Optional[str] = None
     tbl_properties: Optional[str] = None
-    partitions: Optional[Union[List[str], List[ExternalPartition]]] = None
+    partitions: Optional[Union[List[ExternalPartition], List[str]]] = None
 
     def __bool__(self):
         return self.location is not None

diff --git a/core/dbt/parser/schemas.py b/core/dbt/parser/schemas.py
@@ -299,7 +299,7 @@ def _add_yaml_snapshot_nodes_to_manifest(
                 snapshot_node = parser._create_parsetime_node(
                     block,
                     compiled_path,
-                    parser.initial_config(fqn),
+                    parser.initial_config_builder(fqn),
                     fqn,
                     snapshot["name"],
                 )

diff --git a/tests/functional/artifacts/test_serialization.py b/tests/functional/artifacts/test_serialization.py
@@ -1,28 +1,26 @@
 from dataclasses import dataclass, field
 from typing import Any, Dict, List, Optional, Union
 
-import pytest
-from mashumaro.mixins.msgpack import DataClassMessagePackMixin
+from dbt_common.dataclass_schema import dbtClassMixin
 
 
 @dataclass
-class ExternalPartition(DataClassMessagePackMixin):
+class ExternalPartition(dbtClassMixin):
     name: str = ""
     description: str = ""
     data_type: str = ""
     meta: Dict[str, Any] = field(default_factory=dict)
 
 
 @dataclass
-class ExternalTable(DataClassMessagePackMixin):
+class ExternalTable(dbtClassMixin):
     location: Optional[str] = None
     file_format: Optional[str] = None
     row_format: Optional[str] = None
     tbl_properties: Optional[str] = None
     partitions: Optional[Union[List[ExternalPartition], List[str]]] = None
 
 
-@pytest.mark.skip("skip until mashumaro 3.15")
 def test_partitions_serialization():
 
     part1 = ExternalPartition(