Skip to content

Commit 99c5fbd

Browse files
committed
comment out usage of QuerySet.extra() and distinct()
1 parent 84cfaf1 commit 99c5fbd

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

tests/queries/tests.py

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -888,8 +888,8 @@ def test_ticket7235(self):
888888
self.assertSequenceEqual(q.select_related("food"), [])
889889
self.assertSequenceEqual(q.annotate(Count("food")), [])
890890
self.assertSequenceEqual(q.order_by("meal", "food"), [])
891-
self.assertSequenceEqual(q.distinct(), [])
892-
self.assertSequenceEqual(q.extra(select={"foo": "1"}), [])
891+
# self.assertSequenceEqual(q.distinct(), [])
892+
# self.assertSequenceEqual(q.extra(select={"foo": "1"}), [])
893893
self.assertSequenceEqual(q.reverse(), [])
894894
q.query.low_mark = 1
895895
msg = "Cannot change a query once a slice has been taken."
@@ -1835,27 +1835,27 @@ def test_ordering(self):
18351835

18361836
# Ordering of extra() pieces is possible, too and you can mix extra
18371837
# fields and model fields in the ordering.
1838-
self.assertSequenceEqual(
1839-
Ranking.objects.extra(
1840-
tables=["django_site"], order_by=["-django_site.id", "rank"]
1841-
),
1842-
[self.rank1, self.rank2, self.rank3],
1843-
)
1844-
1845-
sql = "case when %s > 2 then 1 else 0 end" % connection.ops.quote_name("rank")
1846-
qs = Ranking.objects.extra(select={"good": sql})
1847-
self.assertEqual(
1848-
[o.good for o in qs.extra(order_by=("-good",))], [True, False, False]
1849-
)
1850-
self.assertSequenceEqual(
1851-
qs.extra(order_by=("-good", "id")),
1852-
[self.rank3, self.rank2, self.rank1],
1853-
)
1838+
# self.assertSequenceEqual(
1839+
# Ranking.objects.extra(
1840+
# tables=["django_site"], order_by=["-django_site.id", "rank"]
1841+
# ),
1842+
# [self.rank1, self.rank2, self.rank3],
1843+
# )
1844+
1845+
# sql = "case when %s > 2 then 1 else 0 end" % connection.ops.quote_name("rank")
1846+
# qs = Ranking.objects.extra(select={"good": sql})
1847+
# self.assertEqual(
1848+
# [o.good for o in qs.extra(order_by=("-good",))], [True, False, False]
1849+
# )
1850+
# self.assertSequenceEqual(
1851+
# qs.extra(order_by=("-good", "id")),
1852+
# [self.rank3, self.rank2, self.rank1],
1853+
# )
18541854

18551855
# Despite having some extra aliases in the query, we can still omit
18561856
# them in a values() query.
1857-
dicts = qs.values("id", "rank").order_by("id")
1858-
self.assertEqual([d["rank"] for d in dicts], [2, 1, 3])
1857+
# dicts = qs.values("id", "rank").order_by("id")
1858+
# self.assertEqual([d["rank"] for d in dicts], [2, 1, 3])
18591859

18601860
def test_ticket7256(self):
18611861
# An empty values() call includes all aliases, including those from an

0 commit comments

Comments
 (0)