diff options
| author | Diana Clarke <diana.joan.clarke@gmail.com> | 2012-04-02 21:42:17 -0400 |
|---|---|---|
| committer | Diana Clarke <diana.joan.clarke@gmail.com> | 2012-04-02 21:42:17 -0400 |
| commit | 8b16cd876cb157d6f06863f2e345ff3e1d56972f (patch) | |
| tree | e314f2185f5936cbf2408472d68b142e9af360dc /lib | |
| parent | 47a799ecd5d03b78e5d67918302c0da2950d27b8 (diff) | |
| download | sqlalchemy-8b16cd876cb157d6f06863f2e345ff3e1d56972f.tar.gz | |
make auto-correlation the same for Query & select()
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 66d7f6eb4..faa53ee8d 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 5f4b182d0..9411e97c9 100644 --- a/lib/sqlalchemy/orm/strategies.py +++ b/lib/sqlalchemy/orm/strategies.py @@ -799,7 +799,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 |