summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2015-03-12 13:34:43 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2015-03-12 13:34:43 -0400
commitdcbedfd61ae07315cd4b2d9cc76b5d2cb6d47926 (patch)
tree91138a63cee62707b60bb44cf29b18fed3b98f36
parent941fe5e060dd23f5588dfc32596961264ed100b9 (diff)
downloadsqlalchemy-dcbedfd61ae07315cd4b2d9cc76b5d2cb6d47926.tar.gz
- fix a get call here, we should figure this out since we dont want
to be using getattr
-rw-r--r--lib/sqlalchemy/orm/query.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 05349cf0b..36180e8d5 100644
--- 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