Ticket #17424: ticket17424_with_tests.diff

django/db/models/sql/query.py

@@ -693 +693 @@
         Returns True if the join was promoted by this call.
         """
         if ((unconditional or self.alias_map[alias][NULLABLE]) and
-                self.alias_map[alias][JOIN_TYPE] != self.LOUTER):
+                self.alias_map[alias][JOIN_TYPE] == self.INNER):
             data = list(self.alias_map[alias])
             data[JOIN_TYPE] = self.LOUTER
             self.alias_map[alias] = tuple(data)

tests/modeltests/aggregation/tests.py

@@ -565 +565 @@
                 (Decimal('82.8'), 1),
             ]
         )
+
+    def test_ticket17424(self):
+        """
+        Check that doing exclude() on a foreign model after annotate()
+        doesn't crash.
+        """
+        from django.db.models.sql.constants import JOIN_TYPE
+        all_books = list(Book.objects.values_list('pk', flat=True))
+
+        annotated_books = Book.objects.annotate(one=Count("id"))
+
+        # The value doesn't matter, we just need any negative
+        # constraint on a related model that's a noop.
+        excluded_books = annotated_books.exclude(publisher__name="__UNLIKELY_VALUE__")
+
+        # Try to generate query tree
+        unicode(excluded_books.query)
+
+        self.assertQuerysetEqual(excluded_books, all_books, lambda x: x.pk, ordered=True)
+
+        # Check internal state
+        self.assertIsNone(annotated_books.query.alias_map["aggregation_book"][JOIN_TYPE])
+        self.assertIsNone(excluded_books.query.alias_map["aggregation_book"][JOIN_TYPE])