summaryrefslogtreecommitdiff
path: root/tests/defer
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2016-04-10 15:08:41 -0400
committerTim Graham <timograham@gmail.com>2016-04-13 10:32:17 -0400
commit0456a8b9e66608e2e7b7e64035d477f44c259c94 (patch)
treedd25741ba59ce5ae39d420abe70492b1f7b26089 /tests/defer
parentc339a5a6f72690cd90d5a653dc108fbb60274a20 (diff)
downloaddjango-0456a8b9e66608e2e7b7e64035d477f44c259c94.tar.gz
Fixed #26486 -- Fixed a select_related() + defer() MTI edge case.
Diffstat (limited to 'tests/defer')
-rw-r--r--tests/defer/tests.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/defer/tests.py b/tests/defer/tests.py
index 0c8320fdf5..b148c31906 100644
--- a/tests/defer/tests.py
+++ b/tests/defer/tests.py
@@ -128,9 +128,8 @@ class DeferTests(AssertionMixin, TestCase):
Primary.objects.only("name").select_related("related")[0]
def test_defer_foreign_keys_are_deferred_and_not_traversed(self):
- # With a depth-based select_related, all deferred ForeignKeys are
- # deferred instead of traversed.
- with self.assertNumQueries(3):
+ # select_related() overrides defer().
+ with self.assertNumQueries(1):
obj = Primary.objects.defer("related").select_related()[0]
self.assert_delayed(obj, 1)
self.assertEqual(obj.related.id, self.s1.pk)