diff options
author | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2019-04-15 10:35:37 +0200 |
---|---|---|
committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2019-04-15 12:02:26 +0200 |
commit | 5f7991c42cff73b6278106d499d719b726f85ead (patch) | |
tree | 9ed23eb0c50e548230f4f59815e5aeed25816b4c /tests/many_to_many | |
parent | bfae195b0a2c8dae755610a7e23add5c6bc37b5e (diff) | |
download | django-5f7991c42cff73b6278106d499d719b726f85ead.tar.gz |
Fixed #30325 -- Reverted "Fixed #29725 -- Removed unnecessary join in QuerySet.count() and exists() on a many-to-many relation."
This reverts commit 1299421cadc4fcf63585f2f88337078e43e660e0 due to
a regression with custom managers.
Diffstat (limited to 'tests/many_to_many')
-rw-r--r-- | tests/many_to_many/models.py | 10 | ||||
-rw-r--r-- | tests/many_to_many/tests.py | 42 |
2 files changed, 2 insertions, 50 deletions
diff --git a/tests/many_to_many/models.py b/tests/many_to_many/models.py index a2590b8b36..28d23f2a82 100644 --- a/tests/many_to_many/models.py +++ b/tests/many_to_many/models.py @@ -55,13 +55,3 @@ class InheritedArticleA(AbstractArticle): class InheritedArticleB(AbstractArticle): pass - - -class NullableTargetArticle(models.Model): - headline = models.CharField(max_length=100) - publications = models.ManyToManyField(Publication, through='NullablePublicationThrough') - - -class NullablePublicationThrough(models.Model): - article = models.ForeignKey(NullableTargetArticle, models.CASCADE) - publication = models.ForeignKey(Publication, models.CASCADE, null=True) diff --git a/tests/many_to_many/tests.py b/tests/many_to_many/tests.py index f0156bbe8d..9dc53307a1 100644 --- a/tests/many_to_many/tests.py +++ b/tests/many_to_many/tests.py @@ -1,13 +1,9 @@ from unittest import mock -from django.db import connection, transaction +from django.db import transaction from django.test import TestCase, skipUnlessDBFeature -from django.test.utils import CaptureQueriesContext -from .models import ( - Article, InheritedArticleA, InheritedArticleB, NullablePublicationThrough, - NullableTargetArticle, Publication, -) +from .models import Article, InheritedArticleA, InheritedArticleB, Publication class ManyToManyTests(TestCase): @@ -584,37 +580,3 @@ class ManyToManyTests(TestCase): ] ) self.assertQuerysetEqual(b.publications.all(), ['<Publication: Science Weekly>']) - - -class ManyToManyQueryTests(TestCase): - @classmethod - def setUpTestData(cls): - cls.article = Article.objects.create(headline='Django lets you build Web apps easily') - cls.nullable_target_article = NullableTargetArticle.objects.create(headline='The python is good') - NullablePublicationThrough.objects.create(article=cls.nullable_target_article, publication=None) - - @skipUnlessDBFeature('supports_foreign_keys') - def test_count_join_optimization(self): - with CaptureQueriesContext(connection) as query: - self.article.publications.count() - self.assertNotIn('JOIN', query[0]['sql']) - self.assertEqual(self.nullable_target_article.publications.count(), 0) - - def test_count_join_optimization_disabled(self): - with mock.patch.object(connection.features, 'supports_foreign_keys', False), \ - CaptureQueriesContext(connection) as query: - self.article.publications.count() - self.assertIn('JOIN', query[0]['sql']) - - @skipUnlessDBFeature('supports_foreign_keys') - def test_exists_join_optimization(self): - with CaptureQueriesContext(connection) as query: - self.article.publications.exists() - self.assertNotIn('JOIN', query[0]['sql']) - self.assertIs(self.nullable_target_article.publications.exists(), False) - - def test_exists_join_optimization_disabled(self): - with mock.patch.object(connection.features, 'supports_foreign_keys', False), \ - CaptureQueriesContext(connection) as query: - self.article.publications.exists() - self.assertIn('JOIN', query[0]['sql']) |