p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reverted "Refs #20939 -- Moved subquery ordering clearing optimization to the __in lookup." 

This reverts commit e62ea0bb9c since it
broke multi-column __in lookups and _meta.order_wrt on Oracle.
This commit is contained in:
Simon Charette 2017-04-28 09:30:35 -04:00 committed by Tim Graham
parent f32ee6d0ec
commit eb4724a063
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
django/db/models/lookups.py
View File

@ -367,18 +367,9 @@ class In(FieldGetDbPrepValueIterableMixin, BuiltinLookup):
placeholder = '(' + ', '.join(sqls) + ')' placeholder = '(' + ', '.join(sqls) + ')'
return (placeholder, sqls_params) return (placeholder, sqls_params)
else: else:
from django.db.models.sql.query import Query # avoid circular import if not getattr(self.rhs, 'has_select_fields', True):
if isinstance(self.rhs, Query): self.rhs.clear_select_clause()
query = self.rhs self.rhs.add_fields(['pk'])
# It's safe to drop ordering if the queryset isn't using
# slicing, distinct(*fields), or select_for_update().
if (query.low_mark == 0 and query.high_mark is None and
not query.distinct_fields and
not query.select_for_update):
query.clear_ordering(True)
if not query.has_select_fields:
query.clear_select_clause()
query.add_fields(['pk'])
return super().process_rhs(compiler, connection) return super().process_rhs(compiler, connection)
def get_rhs_op(self, connection, rhs): def get_rhs_op(self, connection, rhs):

6
django/db/models/sql/query.py
View File

@ -981,6 +981,12 @@ class Query:
# Subqueries need to use a different set of aliases than the outer query. # Subqueries need to use a different set of aliases than the outer query.
clone.bump_prefix(query) clone.bump_prefix(query)
clone.subquery = True clone.subquery = True
# It's safe to drop ordering if the queryset isn't using slicing,
# distinct(*fields) or select_for_update().
if (self.low_mark == 0 and self.high_mark is None and
not self.distinct_fields and
not self.select_for_update):
clone.clear_ordering(True)
return clone return clone
def prepare_lookup_value(self, value, lookups, can_reuse, allow_joins=True): def prepare_lookup_value(self, value, lookups, can_reuse, allow_joins=True):