summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2012-06-16 17:40:15 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2012-06-16 17:40:15 -0400
commit3db5ddfdac37bf4306c11aab5decc1b0aaa90cf8 (patch)
tree2502044bfcccd076014974ccf6056d61e359273e /lib
parent1ac57f0b52e3e89097129931d46ebbbb39ee7927 (diff)
downloadsqlalchemy-3db5ddfdac37bf4306c11aab5decc1b0aaa90cf8.tar.gz
- [bug] Fixed bug whereby populate_existing
option would not propagate to subquery eager loaders. [ticket:2497]. Also in 0.7.8.
Diffstat (limited to 'lib')
-rw-r--r--lib/sqlalchemy/orm/strategies.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py
index 70e06723a..d0f8962be 100644
--- a/lib/sqlalchemy/orm/strategies.py
+++ b/lib/sqlalchemy/orm/strategies.py
@@ -833,6 +833,8 @@ class SubqueryLoader(AbstractRelationshipLoader):
# these will fire relative to subq_path.
q = q._with_current_path(subq_path)
q = q._conditional_options(*orig_query._with_options)
+ if orig_query._populate_existing:
+ q._populate_existing = orig_query._populate_existing
return q
def _setup_outermost_orderby(self, q):