diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2012-04-23 11:50:47 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2012-04-23 11:50:47 -0400 |
| commit | 8f35f7a803c67f4ab0620686592a021a24e4b331 (patch) | |
| tree | c8245ecc0367a6ca6ab4bd7dfa68a99a2b952d9b /lib | |
| parent | ff0fb31bf205a82c4af8781ac9afc96586a67d66 (diff) | |
| parent | 8b16cd876cb157d6f06863f2e345ff3e1d56972f (diff) | |
| download | sqlalchemy-8f35f7a803c67f4ab0620686592a021a24e4b331.tar.gz | |
- re-merge + CHANGES
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sqlalchemy/orm/query.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/strategies.py | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index 924679085..b0ce9ee13 100644 --- a/lib/sqlalchemy/orm/query.py +++ b/lib/sqlalchemy/orm/query.py @@ -2907,7 +2907,6 @@ class Query(object): context.whereclause, from_obj=froms, use_labels=labels, - correlate=False, # TODO: this order_by is only needed if # LIMIT/OFFSET is present in self._select_args, # else the application on the outside is enough @@ -2973,7 +2972,6 @@ class Query(object): from_obj=froms, use_labels=labels, for_update=for_update, - correlate=False, order_by=context.order_by, **self._select_args ) diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py index 703fc0160..06b630076 100644 --- a/lib/sqlalchemy/orm/strategies.py +++ b/lib/sqlalchemy/orm/strategies.py @@ -749,7 +749,7 @@ class SubqueryLoader(AbstractRelationshipLoader): ): # reformat the original query # to look only for significant columns - q = orig_query._clone() + q = orig_query._clone().correlate(None) # TODO: why does polymporphic etc. require hardcoding # into _adapt_col_list ? Does query.add_columns(...) work |