- fix a get call here, we should figure this out since we dont want

to be using getattr

diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 05349cf0bf3c640a8fd97f2f3bcc753fbdee6cc5..36180e8d5b5a48ca496068202b37f8f02892f1b6 100644 (file)
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -3541,7 +3541,7 @@ class _ColumnEntity(_QueryEntity):
             attributes.QueryableAttribute,
             interfaces.PropComparator
         )):
-            _entity = column._parententity
+            _entity = getattr(column, '_parententity', None)
             if _entity is not None:
                 search_entities = False
             self._label_name = column.key