Remove rednundant if branches and adjust tests

dlt-hub · Feb 6, 2024 · a077442 · a077442
1 parent 6037b04
commit a077442
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 18 deletions.
diff --git a/dlt/common/libs/pydantic.py b/dlt/common/libs/pydantic.py
@@ -117,8 +117,6 @@ def pydantic_to_table_schema_columns(
             inner_type = list
         elif is_dict_generic_type(inner_type):
             inner_type = dict
-        elif issubclass(inner_type, BaseModel):
-            is_inner_type_pydantic_model = True
 
         is_inner_type_pydantic_model = False
         name = field.alias or field_name
@@ -132,9 +130,7 @@ def pydantic_to_table_schema_columns(
                 # try to coerce unknown type to text
                 data_type = "text"
 
-        if data_type == "complex" and skip_complex_types:
-            continue
-        elif is_inner_type_pydantic_model and not skip_complex_types:
+        if is_inner_type_pydantic_model:
             # This case is for a single field schema/model
             # we need to generate snake_case field names
             # and return flattened field schemas
@@ -146,12 +142,8 @@ def pydantic_to_table_schema_columns(
                     **hints,
                     "name": snake_case_naming_convention.make_path(name, hints["name"]),
                 }
-        elif is_inner_type_pydantic_model and skip_complex_types:
-            result[name] = {
-                "name": name,
-                "data_type": "complex",
-                "nullable": nullable,
-            }
+        elif data_type == "complex" and skip_complex_types:
+            continue
         else:
             result[name] = {
                 "name": name,

diff --git a/tests/load/pipeline/test_pydantic_models.py b/tests/load/pipeline/test_pydantic_models.py
@@ -116,26 +116,23 @@ def src():
             }
 
             assert loaded_values == {
-                "child": '{"child_attribute":"any string","optional_child_attribute":null}',
+                "child__child_attribute": "any string",
+                "child__optional_child_attribute": None,
                 "optional_parent_attribute": None,
                 "data_dictionary": '{"child_attribute":"any string"}',
             }
 
     keys = p.default_schema.tables["items"]["columns"].keys()
     assert keys == {
-        "child",
+        "child__child_attribute",
+        "child__optional_child_attribute",
         "optional_parent_attribute",
         "data_dictionary",
         "_dlt_load_id",
         "_dlt_id",
     }
 
     columns = p.default_schema.tables["items"]["columns"]
-    assert columns["child"] == {
-        "name": "child",
-        "data_type": "complex",
-        "nullable": False,
-    }
 
     assert columns["optional_parent_attribute"] == {
         "name": "optional_parent_attribute",