diff options
Diffstat (limited to 'django/db/models/sql/query.py')
| -rw-r--r-- | django/db/models/sql/query.py | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index 033a267a8b..a94dca770f 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -18,7 +18,8 @@ from django.db.models.fields import FieldDoesNotExist from django.db.models.query_utils import select_related_descend from django.db.models.sql import aggregates as base_aggregates_module from django.db.models.sql.expressions import SQLEvaluator -from django.db.models.sql.where import WhereNode, Constraint, EverythingNode, AND, OR +from django.db.models.sql.where import (WhereNode, Constraint, EverythingNode, + ExtraWhere, AND, OR) from django.core.exceptions import FieldError from datastructures import EmptyResultSet, Empty, MultiJoin from constants import * @@ -92,8 +93,6 @@ class BaseQuery(object): self._extra_select_cache = None self.extra_tables = () - self.extra_where = () - self.extra_params = () self.extra_order_by = () # A tuple that is a set of model field names and either True, if these @@ -232,8 +231,6 @@ class BaseQuery(object): else: obj._extra_select_cache = self._extra_select_cache.copy() obj.extra_tables = self.extra_tables - obj.extra_where = self.extra_where - obj.extra_params = self.extra_params obj.extra_order_by = self.extra_order_by obj.deferred_loading = deepcopy(self.deferred_loading) if self.filter_is_sticky and self.used_aliases: @@ -418,12 +415,6 @@ class BaseQuery(object): if where: result.append('WHERE %s' % where) params.extend(w_params) - if self.extra_where: - if not where: - result.append('WHERE') - else: - result.append('AND') - result.append(' AND '.join(self.extra_where)) grouping, gb_params = self.get_grouping() if grouping: @@ -458,7 +449,6 @@ class BaseQuery(object): result.append('LIMIT %d' % val) result.append('OFFSET %d' % self.low_mark) - params.extend(self.extra_params) return ' '.join(result), tuple(params) def as_nested_sql(self): @@ -553,9 +543,6 @@ class BaseQuery(object): if self.extra and rhs.extra: raise ValueError("When merging querysets using 'or', you " "cannot have extra(select=...) on both sides.") - if self.extra_where and rhs.extra_where: - raise ValueError("When merging querysets using 'or', you " - "cannot have extra(where=...) on both sides.") self.extra.update(rhs.extra) extra_select_mask = set() if self.extra_select_mask is not None: @@ -565,8 +552,6 @@ class BaseQuery(object): if extra_select_mask: self.set_extra_mask(extra_select_mask) self.extra_tables += rhs.extra_tables - self.extra_where += rhs.extra_where - self.extra_params += rhs.extra_params # Ordering uses the 'rhs' ordering, unless it has none, in which case # the current ordering is used. @@ -2181,10 +2166,8 @@ class BaseQuery(object): select_pairs[name] = (entry, entry_params) # This is order preserving, since self.extra_select is a SortedDict. self.extra.update(select_pairs) - if where: - self.extra_where += tuple(where) - if params: - self.extra_params += tuple(params) + if where or params: + self.where.add(ExtraWhere(where, params), AND) if tables: self.extra_tables += tuple(tables) if order_by: |