fix: ensure we do not recursive flatten as the adapter col method is …

…already recursive

.changes/1.1.12.md

@@ -0,0 +1,3 @@
+## 1.1.12 - 2025-01-30
+### Fixed
+* Ensure we don't recurse in flattening struct columns as the adapter is already recursive under the hood

CHANGELOG.md

@@ -6,6 +6,10 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
+## 1.1.12 - 2025-01-30
+### Fixed
+* Ensure we don't recurse in flattening struct columns as the adapter is already recursive under the hood
+
 ## 1.1.11 - 2025-01-30
 ### Fixed
 * Ensure records and structs are flattened

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "dbt-osmosis"
-version = "1.1.11"
+version = "1.1.12"
 description = "A dbt utility for managing YAML to make developing with dbt more delightful."
 readme = "README.md"
 license = { text = "Apache-2.0" }

src/dbt_osmosis/core/osmosis.py

@@ -853,26 +853,31 @@ def get_columns(context: YamlRefactorContext, ref: TableRef) -> dict[str, Column
     normalized_cols = OrderedDict()
     offset = 0
 
-    def process_column(col: BaseColumn | ColumnMetadata):
+    def process_column(col: BaseColumn | ColumnMetadata) -> None:
         nonlocal offset
-        if any(re.match(b, col.name) for b in context.ignore_patterns):
-            logger.debug(
-                ":no_entry_sign: Skipping column => %s due to skip pattern match.", col.name
-            )
-            return
-        normalized = normalize_column_name(col.name, context.project.runtime_cfg.credentials.type)
-        if isinstance(col, ColumnMetadata):
-            col_meta = col
+
+        if hasattr(col, "flatten"):
+            # flatten bq structs
+            cols = getattr(col, "flatten")()
         else:
-            dtype = _maybe_use_precise_dtype(col, context.settings)
-            col_meta = ColumnMetadata(
-                name=normalized, type=dtype, index=offset, comment=getattr(col, "comment", None)
+            cols = [col]
+
+        for col in cols:
+            if any(re.match(b, col.name) for b in context.ignore_patterns):
+                logger.debug(
+                    ":no_entry_sign: Skipping column => %s due to skip pattern match.", col.name
+                )
+                return
+            normalized = normalize_column_name(
+                col.name, context.project.runtime_cfg.credentials.type
             )
-        normalized_cols[normalized] = col_meta
-        offset += 1
-        if hasattr(col, "flatten"):
-            for struct_field in t.cast(Iterable[BaseColumn], getattr(col, "flatten")()):
-                process_column(struct_field)
+            if not isinstance(col, ColumnMetadata):
+                dtype = _maybe_use_precise_dtype(col, context.settings)
+                col = ColumnMetadata(
+                    name=normalized, type=dtype, index=offset, comment=getattr(col, "comment", None)
+                )
+            normalized_cols[normalized] = col
+            offset += 1
 
     if catalog := context.read_catalog():
         logger.debug(":blue_book: Catalog found => Checking for ref => %s", ref)