From 768108186a48a94948a7763d0f5c4dfb3f0ce773 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Wed, 5 Jun 2013 18:27:36 -0400 Subject: [PATCH] shrugs --- lib/sqlalchemy/orm/query.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index 6d8d9d4f5e..d251f983fe 100644 --- a/lib/sqlalchemy/orm/query.py +++ b/lib/sqlalchemy/orm/query.py @@ -2672,7 +2672,9 @@ class Query(object): # i.e. when select_from() or join() is used context.froms = list(context.from_clause) # this would fix... - # context.froms += tuple(context.from_clause) + #import pdb + #pdb.set_trace() + #context.froms += tuple(context.from_clause) else: # "load from discrete FROMs" mode, @@ -2925,8 +2927,10 @@ class _MapperEntity(_QueryEntity): return entity.common_parent(self.entity_zero) + #_adapted_selectable = None def adapt_to_selectable(self, query, sel): query._entities.append(self) + # self._adapted_selectable = sel def _get_entity_clauses(self, query, context): @@ -2988,6 +2992,7 @@ class _MapperEntity(_QueryEntity): def setup_context(self, query, context): adapter = self._get_entity_clauses(query, context) + #if self._adapted_selectable is None: context.froms += (self.selectable,) if context.order_by is False and self.mapper.order_by: -- 2.47.3