summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/query.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-06-05 18:06:59 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2013-06-05 18:06:59 -0400
commit80a9c530696a0b0707c013abd24c02a21f66e79c (patch)
treec271526d5f591588861b95cbdca95e6ba7397c99 /lib/sqlalchemy/orm/query.py
parent9a736a4c6e3a21a4d3682a0bd2b547ef0703a027 (diff)
downloadsqlalchemy-80a9c530696a0b0707c013abd24c02a21f66e79c.tar.gz
a test for what's breaking, plus a non-working fix for it...
Diffstat (limited to 'lib/sqlalchemy/orm/query.py')
-rw-r--r--lib/sqlalchemy/orm/query.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 39ed8d8bf..6d8d9d4f5 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -2671,6 +2671,9 @@ class Query(object):
# "load from explicit FROMs" mode,
# i.e. when select_from() or join() is used
context.froms = list(context.from_clause)
+ # this would fix...
+ # context.froms += tuple(context.from_clause)
+
else:
# "load from discrete FROMs" mode,
# i.e. when each _MappedEntity has its own FROM