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

Fixed #19190 -- Refactored Query select clause attributes 

The Query.select and Query.select_fields were collapsed into one list
because the attributes had to be always in sync. Now that they are in
one attribute it is impossible to edit them out of sync.

Similar collapse was done for Query.related_select_cols and
Query.related_select_fields.
This commit is contained in:
Anssi Kääriäinen 2012-10-25 20:57:32 +03:00
parent 789ea3342d
commit 11699ac4b5
5 changed files with 61 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/contrib/gis/db/models/sql/compiler.py
View File

@ -39,7 +39,7 @@ class GeoSQLCompiler(compiler.SQLCompiler):
if self.query.select: if self.query.select:
only_load = self.deferred_to_columns() only_load = self.deferred_to_columns()
# This loop customized for GeoQuery. # This loop customized for GeoQuery.
for col, field in zip(self.query.select, self.query.select_fields): for col, field in self.query.select:
if isinstance(col, (list, tuple)): if isinstance(col, (list, tuple)):
alias, column = col alias, column = col
table = self.query.alias_map[alias].table_name table = self.query.alias_map[alias].table_name
@ -85,7 +85,7 @@ class GeoSQLCompiler(compiler.SQLCompiler):
]) ])
# This loop customized for GeoQuery. # This loop customized for GeoQuery.
for (table, col), field in zip(self.query.related_select_cols, self.query.related_select_fields): for (table, col), field in self.query.related_select_cols:
r = self.get_field_select(field, table, col) r = self.get_field_select(field, table, col)
if with_aliases and col in col_aliases: if with_aliases and col in col_aliases:
c_alias = 'Col%d' % len(col_aliases) c_alias = 'Col%d' % len(col_aliases)

28
django/db/models/sql/compiler.py
View File

@ -6,7 +6,7 @@ from django.db.backends.util import truncate_name
from django.db.models.constants import LOOKUP_SEP from django.db.models.constants import LOOKUP_SEP
from django.db.models.query_utils import select_related_descend from django.db.models.query_utils import select_related_descend
from django.db.models.sql.constants import (SINGLE, MULTI, ORDER_DIR, from django.db.models.sql.constants import (SINGLE, MULTI, ORDER_DIR,
GET_ITERATOR_CHUNK_SIZE) GET_ITERATOR_CHUNK_SIZE, SelectInfo)
from django.db.models.sql.datastructures import EmptyResultSet from django.db.models.sql.datastructures import EmptyResultSet
from django.db.models.sql.expressions import SQLEvaluator from django.db.models.sql.expressions import SQLEvaluator
from django.db.models.sql.query import get_order_dir, Query from django.db.models.sql.query import get_order_dir, Query
@ -188,7 +188,7 @@ class SQLCompiler(object):
col_aliases = set() col_aliases = set()
if self.query.select: if self.query.select:
only_load = self.deferred_to_columns() only_load = self.deferred_to_columns()
for col in self.query.select: for col, _ in self.query.select:
if isinstance(col, (list, tuple)): if isinstance(col, (list, tuple)):
alias, column = col alias, column = col
table = self.query.alias_map[alias].table_name table = self.query.alias_map[alias].table_name
@ -233,7 +233,7 @@ class SQLCompiler(object):
for alias, aggregate in self.query.aggregate_select.items() for alias, aggregate in self.query.aggregate_select.items()
]) ])
for table, col in self.query.related_select_cols: for (table, col), _ in self.query.related_select_cols:
r = '%s.%s' % (qn(table), qn(col)) r = '%s.%s' % (qn(table), qn(col))
if with_aliases and col in col_aliases: if with_aliases and col in col_aliases:
c_alias = 'Col%d' % len(col_aliases) c_alias = 'Col%d' % len(col_aliases)
@ -557,8 +557,9 @@ class SQLCompiler(object):
for extra_select, extra_params in six.itervalues(self.query.extra_select): for extra_select, extra_params in six.itervalues(self.query.extra_select):
extra_selects.append(extra_select) extra_selects.append(extra_select)
params.extend(extra_params) params.extend(extra_params)
cols = (group_by + self.query.select + select_cols = [s.col for s in self.query.select]
self.query.related_select_cols + extra_selects) related_select_cols = [s.col for s in self.query.related_select_cols]
cols = (group_by + select_cols + related_select_cols + extra_selects)
seen = set() seen = set()
for col in cols: for col in cols:
if col in seen: if col in seen:
@ -589,7 +590,6 @@ class SQLCompiler(object):
opts = self.query.get_meta() opts = self.query.get_meta()
root_alias = self.query.get_initial_alias() root_alias = self.query.get_initial_alias()
self.query.related_select_cols = [] self.query.related_select_cols = []
self.query.related_select_fields = []
if not used: if not used:
used = set() used = set()
if dupe_set is None: if dupe_set is None:
@ -664,8 +664,8 @@ class SQLCompiler(object):
used.add(alias) used.add(alias)
columns, aliases = self.get_default_columns(start_alias=alias, columns, aliases = self.get_default_columns(start_alias=alias,
opts=f.rel.to._meta, as_pairs=True) opts=f.rel.to._meta, as_pairs=True)
self.query.related_select_cols.extend(columns) self.query.related_select_cols.extend(
self.query.related_select_fields.extend(f.rel.to._meta.fields) SelectInfo(col, field) for col, field in zip(columns, f.rel.to._meta.fields))
if restricted: if restricted:
next = requested.get(f.name, {}) next = requested.get(f.name, {})
else: else:
@ -734,8 +734,8 @@ class SQLCompiler(object):
used.add(alias) used.add(alias)
columns, aliases = self.get_default_columns(start_alias=alias, columns, aliases = self.get_default_columns(start_alias=alias,
opts=model._meta, as_pairs=True, local_only=True) opts=model._meta, as_pairs=True, local_only=True)
self.query.related_select_cols.extend(columns) self.query.related_select_cols.extend(
self.query.related_select_fields.extend(model._meta.fields) SelectInfo(col, field) for col, field in zip(columns, model._meta.fields))
next = requested.get(f.related_query_name(), {}) next = requested.get(f.related_query_name(), {})
# Use True here because we are looking at the _reverse_ side of # Use True here because we are looking at the _reverse_ side of
@ -772,7 +772,7 @@ class SQLCompiler(object):
if resolve_columns: if resolve_columns:
if fields is None: if fields is None:
# We only set this up here because # We only set this up here because
# related_select_fields isn't populated until # related_select_cols isn't populated until
# execute_sql() has been called. # execute_sql() has been called.
# We also include types of fields of related models that # We also include types of fields of related models that
@ -782,11 +782,11 @@ class SQLCompiler(object):
# This code duplicates the logic for the order of fields # This code duplicates the logic for the order of fields
# found in get_columns(). It would be nice to clean this up. # found in get_columns(). It would be nice to clean this up.
if self.query.select_fields: if self.query.select:
fields = self.query.select_fields fields = [f.field for f in self.query.select]
else: else:
fields = self.query.model._meta.fields fields = self.query.model._meta.fields
fields = fields + self.query.related_select_fields fields = fields + [f.field for f in self.query.related_select_cols]
# If the field was deferred, exclude it from being passed # If the field was deferred, exclude it from being passed
# into `resolve_columns` because it wasn't selected. # into `resolve_columns` because it wasn't selected.

3
django/db/models/sql/constants.py
View File

@ -25,6 +25,9 @@ JoinInfo = namedtuple('JoinInfo',
'table_name rhs_alias join_type lhs_alias ' 'table_name rhs_alias join_type lhs_alias '
'lhs_join_col rhs_join_col nullable') 'lhs_join_col rhs_join_col nullable')
# Pairs of column clauses to select, and (possibly None) field for the clause.
SelectInfo = namedtuple('SelectInfo', 'col field')
# How many results to expect from a cursor.execute call # How many results to expect from a cursor.execute call
MULTI = 'multi' MULTI = 'multi'
SINGLE = 'single' SINGLE = 'single'

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

@ -20,7 +20,7 @@ from django.db.models.expressions import ExpressionNode
from django.db.models.fields import FieldDoesNotExist from django.db.models.fields import FieldDoesNotExist
from django.db.models.sql import aggregates as base_aggregates_module from django.db.models.sql import aggregates as base_aggregates_module
from django.db.models.sql.constants import (QUERY_TERMS, ORDER_DIR, SINGLE, from django.db.models.sql.constants import (QUERY_TERMS, ORDER_DIR, SINGLE,
ORDER_PATTERN, JoinInfo) ORDER_PATTERN, JoinInfo, SelectInfo)
from django.db.models.sql.datastructures import EmptyResultSet, Empty, MultiJoin from django.db.models.sql.datastructures import EmptyResultSet, Empty, MultiJoin
from django.db.models.sql.expressions import SQLEvaluator from django.db.models.sql.expressions import SQLEvaluator
from django.db.models.sql.where import (WhereNode, Constraint, EverythingNode, from django.db.models.sql.where import (WhereNode, Constraint, EverythingNode,
@ -115,17 +115,20 @@ class Query(object):
self.default_ordering = True self.default_ordering = True
self.standard_ordering = True self.standard_ordering = True
self.ordering_aliases = [] self.ordering_aliases = []
self.related_select_fields = []
self.dupe_avoidance = {} self.dupe_avoidance = {}
self.used_aliases = set() self.used_aliases = set()
self.filter_is_sticky = False self.filter_is_sticky = False
self.included_inherited_models = {} self.included_inherited_models = {}
# SQL-related attributes # SQL-related attributes
# Select and related select clauses as SelectInfo instances.
# The select is used for cases where we want to set up the select
# clause to contain other than default fields (values(), annotate(),
# subqueries...)
self.select = [] self.select = []
# For each to-be-selected field in self.select there must be a # The related_select_cols is used for columns needed for
# corresponding entry in self.select - git seems to need this. # select_related - this is populated in compile stage.
self.select_fields = [] self.related_select_cols = []
self.tables = [] # Aliases in the order they are created. self.tables = [] # Aliases in the order they are created.
self.where = where() self.where = where()
self.where_class = where self.where_class = where
@ -138,7 +141,6 @@ class Query(object):
self.select_for_update = False self.select_for_update = False
self.select_for_update_nowait = False self.select_for_update_nowait = False
self.select_related = False self.select_related = False
self.related_select_cols = []
# SQL aggregate-related attributes # SQL aggregate-related attributes
self.aggregates = SortedDict() # Maps alias -> SQL aggregate function self.aggregates = SortedDict() # Maps alias -> SQL aggregate function
@ -191,15 +193,14 @@ class Query(object):
Pickling support. Pickling support.
""" """
obj_dict = self.__dict__.copy() obj_dict = self.__dict__.copy()
obj_dict['related_select_fields'] = []
obj_dict['related_select_cols'] = [] obj_dict['related_select_cols'] = []
# Fields can't be pickled, so if a field list has been # Fields can't be pickled, so if a field list has been
# specified, we pickle the list of field names instead. # specified, we pickle the list of field names instead.
# None is also a possible value; that can pass as-is # None is also a possible value; that can pass as-is
obj_dict['select_fields'] = [ obj_dict['select'] = [
f is not None and f.name or None (s.col, s.field is not None and s.field.name or None)
for f in obj_dict['select_fields'] for s in obj_dict['select']
] ]
return obj_dict return obj_dict
@ -209,9 +210,9 @@ class Query(object):
""" """
# Rebuild list of field instances # Rebuild list of field instances
opts = obj_dict['model']._meta opts = obj_dict['model']._meta
obj_dict['select_fields'] = [ obj_dict['select'] = [
name is not None and opts.get_field(name) or None SelectInfo(tpl[0], tpl[1] is not None and opts.get_field(tpl[1]) or None)
for name in obj_dict['select_fields'] for tpl in obj_dict['select']
] ]
self.__dict__.update(obj_dict) self.__dict__.update(obj_dict)
@ -256,10 +257,9 @@ class Query(object):
obj.standard_ordering = self.standard_ordering obj.standard_ordering = self.standard_ordering
obj.included_inherited_models = self.included_inherited_models.copy() obj.included_inherited_models = self.included_inherited_models.copy()
obj.ordering_aliases = [] obj.ordering_aliases = []
obj.select_fields = self.select_fields[:]
obj.related_select_fields = self.related_select_fields[:]
obj.dupe_avoidance = self.dupe_avoidance.copy() obj.dupe_avoidance = self.dupe_avoidance.copy()
obj.select = self.select[:] obj.select = self.select[:]
obj.related_select_cols = []
obj.tables = self.tables[:] obj.tables = self.tables[:]
obj.where = copy.deepcopy(self.where, memo=memo) obj.where = copy.deepcopy(self.where, memo=memo)
obj.where_class = self.where_class obj.where_class = self.where_class
@ -275,7 +275,6 @@ class Query(object):
obj.select_for_update = self.select_for_update obj.select_for_update = self.select_for_update
obj.select_for_update_nowait = self.select_for_update_nowait obj.select_for_update_nowait = self.select_for_update_nowait
obj.select_related = self.select_related obj.select_related = self.select_related
obj.related_select_cols = []
obj.aggregates = copy.deepcopy(self.aggregates, memo=memo) obj.aggregates = copy.deepcopy(self.aggregates, memo=memo)
if self.aggregate_select_mask is None: if self.aggregate_select_mask is None:
obj.aggregate_select_mask = None obj.aggregate_select_mask = None
@ -384,7 +383,6 @@ class Query(object):
query.select_for_update = False query.select_for_update = False
query.select_related = False query.select_related = False
query.related_select_cols = [] query.related_select_cols = []
query.related_select_fields = []
result = query.get_compiler(using).execute_sql(SINGLE) result = query.get_compiler(using).execute_sql(SINGLE)
if result is None: if result is None:
@ -527,14 +525,14 @@ class Query(object):
# Selection columns and extra extensions are those provided by 'rhs'. # Selection columns and extra extensions are those provided by 'rhs'.
self.select = [] self.select = []
for col in rhs.select: for col, field in rhs.select:
if isinstance(col, (list, tuple)): if isinstance(col, (list, tuple)):
self.select.append((change_map.get(col[0], col[0]), col[1])) new_col = change_map.get(col[0], col[0]), col[1]
self.select.append(SelectInfo(new_col, field))
else: else:
item = copy.deepcopy(col) item = copy.deepcopy(col)
item.relabel_aliases(change_map) item.relabel_aliases(change_map)
self.select.append(item) self.select.append(SelectInfo(item, field))
self.select_fields = rhs.select_fields[:]
if connector == OR: if connector == OR:
# It would be nice to be able to handle this, but the queries don't # It would be nice to be able to handle this, but the queries don't
@ -750,24 +748,23 @@ class Query(object):
""" """
assert set(change_map.keys()).intersection(set(change_map.values())) == set() assert set(change_map.keys()).intersection(set(change_map.values())) == set()
def relabel_column(col):
if isinstance(col, (list, tuple)):
old_alias = col[0]
return (change_map.get(old_alias, old_alias), col[1])
else:
col.relabel_aliases(change_map)
return col
# 1. Update references in "select" (normal columns plus aliases), # 1. Update references in "select" (normal columns plus aliases),
# "group by", "where" and "having". # "group by", "where" and "having".
self.where.relabel_aliases(change_map) self.where.relabel_aliases(change_map)
self.having.relabel_aliases(change_map) self.having.relabel_aliases(change_map)
for columns in [self.select, self.group_by or []]: if self.group_by:
for pos, col in enumerate(columns): self.group_by = [relabel_column(col) for col in self.group_by]
if isinstance(col, (list, tuple)): self.select = [SelectInfo(relabel_column(s.col), s.field)
old_alias = col[0] for s in self.select]
columns[pos] = (change_map.get(old_alias, old_alias), col[1]) self.aggregates = SortedDict(
else: (key, relabel_column(col)) for key, col in self.aggregates.items())
col.relabel_aliases(change_map)
for mapping in [self.aggregates]:
for key, col in mapping.items():
if isinstance(col, (list, tuple)):
old_alias = col[0]
mapping[key] = (change_map.get(old_alias, old_alias), col[1])
else:
col.relabel_aliases(change_map)
# 2. Rename the alias in the internal table/alias datastructures. # 2. Rename the alias in the internal table/alias datastructures.
for k, aliases in self.join_map.items(): for k, aliases in self.join_map.items():
@ -1570,7 +1567,7 @@ class Query(object):
# since we are adding a IN <subquery> clause. This prevents the # since we are adding a IN <subquery> clause. This prevents the
# database from tripping over IN (...,NULL,...) selects and returning # database from tripping over IN (...,NULL,...) selects and returning
# nothing # nothing
alias, col = query.select[0] alias, col = query.select[0].col
query.where.add((Constraint(alias, col, None), 'isnull', False), AND) query.where.add((Constraint(alias, col, None), 'isnull', False), AND)
self.add_filter(('%s__in' % prefix, query), negate=True, trim=True, self.add_filter(('%s__in' % prefix, query), negate=True, trim=True,
@ -1629,7 +1626,6 @@ class Query(object):
Removes all fields from SELECT clause. Removes all fields from SELECT clause.
""" """
self.select = [] self.select = []
self.select_fields = []
self.default_cols = False self.default_cols = False
self.select_related = False self.select_related = False
self.set_extra_mask(()) self.set_extra_mask(())
@ -1642,7 +1638,6 @@ class Query(object):
columns. columns.
""" """
self.select = [] self.select = []
self.select_fields = []
def add_distinct_fields(self, *field_names): def add_distinct_fields(self, *field_names):
""" """
@ -1674,8 +1669,7 @@ class Query(object):
col = join.lhs_join_col col = join.lhs_join_col
joins = joins[:-1] joins = joins[:-1]
self.promote_joins(joins[1:]) self.promote_joins(joins[1:])
self.select.append((final_alias, col)) self.select.append(SelectInfo((final_alias, col), field))
self.select_fields.append(field)
except MultiJoin: except MultiJoin:
raise FieldError("Invalid field name: '%s'" % name) raise FieldError("Invalid field name: '%s'" % name)
except FieldError: except FieldError:
@ -1731,8 +1725,8 @@ class Query(object):
""" """
self.group_by = [] self.group_by = []
for sel in self.select: for col, _ in self.select:
self.group_by.append(sel) self.group_by.append(col)
def add_count_column(self): def add_count_column(self):
""" """
@ -1745,7 +1739,7 @@ class Query(object):
else: else:
assert len(self.select) == 1, \ assert len(self.select) == 1, \
"Cannot add count col with multiple cols in 'select': %r" % self.select "Cannot add count col with multiple cols in 'select': %r" % self.select
count = self.aggregates_module.Count(self.select[0]) count = self.aggregates_module.Count(self.select[0].col)
else: else:
opts = self.model._meta opts = self.model._meta
if not self.select: if not self.select:
@ -1757,7 +1751,7 @@ class Query(object):
assert len(self.select) == 1, \ assert len(self.select) == 1, \
"Cannot add count col with multiple cols in 'select'." "Cannot add count col with multiple cols in 'select'."
count = self.aggregates_module.Count(self.select[0], distinct=True) count = self.aggregates_module.Count(self.select[0].col, distinct=True)
# Distinct handling is done in Count(), so don't do it at this # Distinct handling is done in Count(), so don't do it at this
# level. # level.
self.distinct = False self.distinct = False
@ -1781,7 +1775,6 @@ class Query(object):
d = d.setdefault(part, {}) d = d.setdefault(part, {})
self.select_related = field_dict self.select_related = field_dict
self.related_select_cols = [] self.related_select_cols = []
self.related_select_fields = []
def add_extra(self, select, select_params, where, params, tables, order_by): def add_extra(self, select, select_params, where, params, tables, order_by):
""" """
@ -1975,7 +1968,7 @@ class Query(object):
self.unref_alias(select_alias) self.unref_alias(select_alias)
select_alias = join_info.rhs_alias select_alias = join_info.rhs_alias
select_col = join_info.rhs_join_col select_col = join_info.rhs_join_col
self.select = [(select_alias, select_col)] self.select = [SelectInfo((select_alias, select_col), None)]
self.remove_inherited_models() self.remove_inherited_models()
def is_nullable(self, field): def is_nullable(self, field):

4
django/db/models/sql/subqueries.py
View File

@ -76,7 +76,7 @@ class DeleteQuery(Query):
return return
else: else:
innerq.clear_select_clause() innerq.clear_select_clause()
innerq.select, innerq.select_fields = [(self.get_initial_alias(), pk.column)], [None] innerq.select = [SelectInfo((self.get_initial_alias(), pk.column), None)]
values = innerq values = innerq
where = self.where_class() where = self.where_class()
where.add((Constraint(None, pk.column, pk), 'in', values), AND) where.add((Constraint(None, pk.column, pk), 'in', values), AND)
@ -244,7 +244,7 @@ class DateQuery(Query):
alias = result[3][-1] alias = result[3][-1]
select = Date((alias, field.column), lookup_type) select = Date((alias, field.column), lookup_type)
self.clear_select_clause() self.clear_select_clause()
self.select, self.select_fields = [select], [None] self.select = [SelectInfo(select, None)]
self.distinct = True self.distinct = True
self.order_by = order == 'ASC' and [1] or [-1] self.order_by = order == 'ASC' and [1] or [-1]