summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/regressiontests/aggregation_regress/tests.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/regressiontests/aggregation_regress/tests.py b/tests/regressiontests/aggregation_regress/tests.py
index 786431420d..58d0b2748f 100644
--- a/tests/regressiontests/aggregation_regress/tests.py
+++ b/tests/regressiontests/aggregation_regress/tests.py
@@ -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
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):
# Regression for #10197 -- Queries with aggregates can be pickled.
# First check that pickling is possible at all. No crash = success