From e3305a3579ac89a40a34f3cab5878b0fefc5d4e5 Mon Sep 17 00:00:00 2001 From: John Davis Date: Fri, 9 Feb 2024 16:40:52 -0500 Subject: [PATCH] Fix bug: if using alias on ORM entity, use __table__ as valid FromClause --- lib/galaxy/model/__init__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/galaxy/model/__init__.py b/lib/galaxy/model/__init__.py index e39b938363a..395385d0247 100644 --- a/lib/galaxy/model/__init__.py +++ b/lib/galaxy/model/__init__.py @@ -6373,8 +6373,8 @@ class DatasetCollection(Base, Dictifiable, UsesAnnotations, Serializable): dataset_permission_attributes = dataset_permission_attributes or () return_entities = return_entities or () dataset_collection = self - dc = alias(DatasetCollection) - dce = alias(DatasetCollectionElement) + dc = alias(DatasetCollection.__table__) + dce = alias(DatasetCollectionElement.__table__) depth_collection_type = dataset_collection.collection_type order_by_columns = [dce.c.element_index] nesting_level = 0 @@ -6395,8 +6395,8 @@ class DatasetCollection(Base, Dictifiable, UsesAnnotations, Serializable): while ":" in depth_collection_type: nesting_level += 1 - inner_dce = alias(DatasetCollectionElement) - inner_dc = alias(DatasetCollection) + inner_dce = alias(DatasetCollectionElement.__table__) + inner_dc = alias(DatasetCollection.__table__) order_by_columns.append(inner_dce.c.element_index) q = q.outerjoin(inner_dce, inner_dce.c.dataset_collection_id == dce.c.child_collection_id) if collection_attributes: