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

Refs #11256 -- Extended the annotation field name conflict check to cover m2ms and reverse related descriptors as well. This is needed to actually cover the case raised by #14373. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14116 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Carl Meyer 2010-10-10 08:04:14 +00:00
parent ace6519fae
commit 2f17dd3dd0
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/db/models/query.py
View File

@ -625,7 +625,7 @@ class QuerySet(object):
% arg.default_alias) % arg.default_alias)
kwargs[arg.default_alias] = arg kwargs[arg.default_alias] = arg
names = set([f.name for f in self.model._meta.fields]) names = set(self.model._meta.get_all_field_names())
for aggregate in kwargs: for aggregate in kwargs:
if aggregate in names: if aggregate in names:
raise ValueError("The %s annotation conflicts with a field on " raise ValueError("The %s annotation conflicts with a field on "

8
tests/regressiontests/aggregation_regress/tests.py
View File

@ -489,6 +489,14 @@ class AggregationTests(TestCase):
# Regression for #11256 - providing an aggregate name that conflicts with a field name on the model raises ValueError # Regression for #11256 - providing an aggregate name that conflicts with a field name on the model raises ValueError
self.assertRaises(ValueError, Author.objects.annotate, age=Avg('friends__age')) self.assertRaises(ValueError, Author.objects.annotate, age=Avg('friends__age'))
def test_m2m_name_conflict(self):
# Regression for #11256 - providing an aggregate name that conflicts with an m2m name on the model raises ValueError
self.assertRaises(ValueError, Author.objects.annotate, friends=Count('friends'))
def test_reverse_relation_name_conflict(self):
# Regression for #11256 - providing an aggregate name that conflicts with a reverse-related name on the model raises ValueError
self.assertRaises(ValueError, Author.objects.annotate, book_contact_set=Avg('friends__age'))
def test_pickle(self): def test_pickle(self):
# Regression for #10197 -- Queries with aggregates can be pickled. # Regression for #10197 -- Queries with aggregates can be pickled.
# First check that pickling is possible at all. No crash = success # First check that pickling is possible at all. No crash = success