Ticket #6018: select_related.diff

a/django/db/models/query.py

@@ -852 +852 @@
-    """
-
-    # If we've got a max_depth set and we've exceeded that depth, bail now.
-
+=
-        return None
-
-    qn = connection.ops.quote_name

a/tests/modeltests/select_related/models.py

@@ -147 +147 @@
->>> len(db.connection.queries)
-5
-
+# Test the bug with select_related and extra combination
+>>> s = Species.objects.all().select_related(depth=1).extra(select={'a': 'select_related_species.id + 10'})[0]
+
+# With the correct code the result should be True
+>>> s.id + 10 == s.a
+True
+
-# Reset DEBUG to where we found it.
->>> settings.DEBUG = False
-"""}