diff options
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/orm/query.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index 28ddc1f13..3f8300a09 100644 --- a/lib/sqlalchemy/orm/query.py +++ b/lib/sqlalchemy/orm/query.py @@ -1301,7 +1301,7 @@ class Query(object): join_to_left = not is_aliased_class and not left_is_aliased - if self._from_obj: + if self._from_obj and left_selectable is not None: replace_clause_index, clause = sql_util.find_join_source( self._from_obj, left_selectable) @@ -2622,7 +2622,9 @@ class _ColumnEntity(_QueryEntity): return self.column.type def adapt_to_selectable(self, query, sel): - _ColumnEntity(query, sel.corresponding_column(self.column)) + c = _ColumnEntity(query, sel.corresponding_column(self.column)) + c.entity_zero = self.entity_zero + c.entities = self.entities def setup_entity(self, entity, mapper, adapter, from_obj, is_aliased_class, with_polymorphic): |