From e1f13f15512ece2d8ea8c7bf9f704ce4286c2ffa Mon Sep 17 00:00:00 2001 From: Flávio Juvenal Date: Thu, 12 Apr 2018 15:06:43 -0300 Subject: Fixed #29320 -- Added an exception when an annotation alias matches a ForeignKey attname. --- tests/aggregation_regress/tests.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'tests') diff --git a/tests/aggregation_regress/tests.py b/tests/aggregation_regress/tests.py index 9c8bac0d21..7f03d66bab 100644 --- a/tests/aggregation_regress/tests.py +++ b/tests/aggregation_regress/tests.py @@ -769,6 +769,11 @@ class AggregationTests(TestCase): with self.assertRaisesMessage(ValueError, msg): Author.objects.annotate(friends=Count('friends')) + def test_fk_attname_conflict(self): + msg = "The annotation 'contact_id' conflicts with a field on the model." + with self.assertRaisesMessage(ValueError, msg): + Book.objects.annotate(contact_id=F('publisher_id')) + def test_values_queryset_non_conflict(self): # Regression for #14707 -- If you're using a values query set, some potential conflicts are avoided. -- cgit v1.3