Merge pull request #17835 from jdavcs/24.0_query_refactor

[24.0] Minor refactor of query building logic for readability
galaxyproject · Mar 25, 2024 · 6352742 · 6352742
2 parents cdb5110 + 28f2063
commit 6352742
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/lib/galaxy/model/__init__.py b/lib/galaxy/model/__init__.py
@@ -6276,11 +6276,10 @@ def attribute_columns(column_collection, attributes, nesting_level=None):
             q = q.outerjoin(inner_dce, inner_dce.c.dataset_collection_id == dce.c.child_collection_id)
             if collection_attributes:
                 q = q.join(inner_dc, inner_dc.c.id == dce.c.child_collection_id)
-            q = q.add_columns(*attribute_columns(inner_dce.c, element_attributes, nesting_level))
-            if collection_attributes:
                 q = q.add_columns(
                     *attribute_columns(inner_dc.c, collection_attributes, nesting_level),
                 )
+            q = q.add_columns(*attribute_columns(inner_dce.c, element_attributes, nesting_level))
             dce = inner_dce
             dc = inner_dc
             depth_collection_type = depth_collection_type.split(":", 1)[1]