diff options
Diffstat (limited to 'tests/queries')
| -rw-r--r-- | tests/queries/test_explain.py | 6 | ||||
| -rw-r--r-- | tests/queries/test_qs_combinators.py | 2 | ||||
| -rw-r--r-- | tests/queries/tests.py | 20 |
3 files changed, 14 insertions, 14 deletions
diff --git a/tests/queries/test_explain.py b/tests/queries/test_explain.py index 2acd6a685c..ab845f992a 100644 --- a/tests/queries/test_explain.py +++ b/tests/queries/test_explain.py @@ -20,7 +20,7 @@ class ExplainTests(TestCase): Tag.objects.filter(name="test").annotate(Count("children")), Tag.objects.filter(name="test").values_list("name"), Tag.objects.order_by().union(Tag.objects.order_by().filter(name="test")), - Tag.objects.all().select_for_update().filter(name="test"), + Tag.objects.select_for_update().filter(name="test"), ] supported_formats = connection.features.supported_explain_formats all_formats = ( @@ -60,7 +60,7 @@ class ExplainTests(TestCase): @skipUnlessDBFeature("validates_explain_options") def test_unknown_options(self): with self.assertRaisesMessage(ValueError, "Unknown options: test, test2"): - Tag.objects.all().explain(test=1, test2=1) + Tag.objects.explain(test=1, test2=1) def test_unknown_format(self): msg = "DOES NOT EXIST is not a recognized format." @@ -69,7 +69,7 @@ class ExplainTests(TestCase): sorted(connection.features.supported_explain_formats) ) with self.assertRaisesMessage(ValueError, msg): - Tag.objects.all().explain(format="does not exist") + Tag.objects.explain(format="does not exist") @unittest.skipUnless(connection.vendor == "postgresql", "PostgreSQL specific") def test_postgres_options(self): diff --git a/tests/queries/test_qs_combinators.py b/tests/queries/test_qs_combinators.py index 000185bbe6..5aa5f6c8d1 100644 --- a/tests/queries/test_qs_combinators.py +++ b/tests/queries/test_qs_combinators.py @@ -110,7 +110,7 @@ class QuerySetSetOperationTests(TestCase): self.assertEqual(len(qs3.union(qs3)), 0) def test_empty_qs_union_with_ordered_qs(self): - qs1 = Number.objects.all().order_by("num") + qs1 = Number.objects.order_by("num") qs2 = Number.objects.none().union(qs1).order_by("num") self.assertEqual(list(qs1), list(qs2)) diff --git a/tests/queries/tests.py b/tests/queries/tests.py index 5fc3fe0096..594afe25b6 100644 --- a/tests/queries/tests.py +++ b/tests/queries/tests.py @@ -1787,7 +1787,7 @@ class Queries5Tests(TestCase): [self.rank3, self.rank2, self.rank1], ) self.assertSequenceEqual( - Ranking.objects.all().order_by("rank"), + Ranking.objects.order_by("rank"), [self.rank1, self.rank2, self.rank3], ) @@ -1944,9 +1944,9 @@ class NullableRelOrderingTests(TestCase): s = SingleObject.objects.create(name="s") r = RelatedObject.objects.create(single=s, f=1) p2 = Plaything.objects.create(name="p2", others=r) - qs = Plaything.objects.all().filter(others__isnull=False).order_by("pk") + qs = Plaything.objects.filter(others__isnull=False).order_by("pk") self.assertNotIn("JOIN", str(qs.query)) - qs = Plaything.objects.all().filter(others__f__isnull=False).order_by("pk") + qs = Plaything.objects.filter(others__f__isnull=False).order_by("pk") self.assertIn("INNER", str(qs.query)) qs = qs.order_by("others__single__name") # The ordering by others__single__pk will add one new join (to single) @@ -2219,16 +2219,16 @@ class QuerysetOrderedTests(unittest.TestCase): def test_cleared_default_ordering(self): self.assertIs(Tag.objects.all().ordered, True) - self.assertIs(Tag.objects.all().order_by().ordered, False) + self.assertIs(Tag.objects.order_by().ordered, False) def test_explicit_ordering(self): - self.assertIs(Annotation.objects.all().order_by("id").ordered, True) + self.assertIs(Annotation.objects.order_by("id").ordered, True) def test_empty_queryset(self): self.assertIs(Annotation.objects.none().ordered, True) def test_order_by_extra(self): - self.assertIs(Annotation.objects.all().extra(order_by=["id"]).ordered, True) + self.assertIs(Annotation.objects.extra(order_by=["id"]).ordered, True) def test_annotated_ordering(self): qs = Annotation.objects.annotate(num_notes=Count("notes")) @@ -2685,7 +2685,7 @@ class QuerySetSupportsPythonIdioms(TestCase): ] def get_ordered_articles(self): - return Article.objects.all().order_by("name") + return Article.objects.order_by("name") def test_can_get_items_using_index_and_slice_notation(self): self.assertEqual(self.get_ordered_articles()[0].name, "Article 1") @@ -2839,7 +2839,7 @@ class EscapingTests(TestCase): r_a = ReservedName.objects.create(name="a", order=42) r_b = ReservedName.objects.create(name="b", order=37) self.assertSequenceEqual( - ReservedName.objects.all().order_by("order"), + ReservedName.objects.order_by("order"), [r_b, r_a], ) self.assertSequenceEqual( @@ -2983,7 +2983,7 @@ class ConditionalTests(TestCase): # ... but you can still order in a non-recursive fashion among linked # fields (the previous test failed because the default ordering was # recursive). - self.assertQuerysetEqual(LoopX.objects.all().order_by("y__x__y__x__id"), []) + self.assertQuerysetEqual(LoopX.objects.order_by("y__x__y__x__id"), []) # When grouping without specifying ordering, we add an explicit "ORDER BY NULL" # portion in MySQL to prevent unnecessary sorting. @@ -4175,7 +4175,7 @@ class RelatedLookupTypeTests(TestCase): pob.save() self.assertSequenceEqual( ObjectB.objects.filter( - objecta__in=ObjectB.objects.all().values_list("num") + objecta__in=ObjectB.objects.values_list("num") ).order_by("pk"), [ob, pob], ) |