Merge pull request #17835 from jdavcs/24.0_query_refactor

[24.0] Minor refactor of query building logic for readability
This commit is contained in:
Björn Grüning
2024-03-25 20:24:41 +01:00
committed by GitHub
+1 -2
View File
@@ -6276,11 +6276,10 @@ class DatasetCollection(Base, Dictifiable, UsesAnnotations, Serializable):
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]