mirror of
https://github.com/django/django.git
synced 2025-10-24 06:06:09 +00:00
Refs #33990 -- Renamed TransactionTestCase.assertQuerysetEqual() to assertQuerySetEqual().
Co-Authored-By: Michael Howitz <mh@gocept.com>
This commit is contained in:
Gregor Gärtner
committed by
Mariusz Felisiak
Mariusz Felisiak
parent
d795259ea9
commit
f0c06f8ab7
@@ -103,7 +103,7 @@ class WindowFunctionTests(TestCase):
|
||||
qs = Employee.objects.annotate(
|
||||
rank=Window(expression=DenseRank(), order_by=order_by),
|
||||
)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
qs,
|
||||
[
|
||||
("Jones", 45000, "Accounting", datetime.date(2005, 11, 1), 1),
|
||||
@@ -137,7 +137,7 @@ class WindowFunctionTests(TestCase):
|
||||
order_by=[F("hire_date").asc()],
|
||||
)
|
||||
).order_by("department", "department_sum")
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
qs,
|
||||
[
|
||||
("Jones", "Accounting", 45000, 45000),
|
||||
@@ -173,7 +173,7 @@ class WindowFunctionTests(TestCase):
|
||||
order_by=F("hire_date__year").asc(),
|
||||
)
|
||||
)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
qs,
|
||||
[
|
||||
("Jones", 45000, "Accounting", datetime.date(2005, 11, 1), 1),
|
||||
@@ -212,7 +212,7 @@ class WindowFunctionTests(TestCase):
|
||||
order_by=F("pk").asc(),
|
||||
)
|
||||
).order_by("pk")
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
qs,
|
||||
[
|
||||
("Jones", "Accounting", 1),
|
||||
@@ -242,7 +242,7 @@ class WindowFunctionTests(TestCase):
|
||||
expression=RowNumber(),
|
||||
)
|
||||
).order_by("pk")
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
qs,
|
||||
[
|
||||
("Jones", "Accounting", 1),
|
||||
@@ -269,7 +269,7 @@ class WindowFunctionTests(TestCase):
|
||||
partition_by="department",
|
||||
)
|
||||
).order_by("department", "-salary", "name")
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
qs,
|
||||
[
|
||||
("Adams", 50000, "Accounting", 44250.00),
|
||||
@@ -306,7 +306,7 @@ class WindowFunctionTests(TestCase):
|
||||
order_by=[F("salary").asc(), F("name").asc()],
|
||||
)
|
||||
).order_by("department", F("salary").asc(), F("name").asc())
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
qs,
|
||||
[
|
||||
("Williams", 37000, "Accounting", None),
|
||||
@@ -333,7 +333,7 @@ class WindowFunctionTests(TestCase):
|
||||
order_by=[F("bonus").asc(), F("name").asc()],
|
||||
)
|
||||
).order_by("department", F("bonus").asc(), F("name").asc())
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
qs,
|
||||
[
|
||||
("Williams", 92.5, "Accounting", None),
|
||||
@@ -360,7 +360,7 @@ class WindowFunctionTests(TestCase):
|
||||
order_by=F("hire_date").asc(),
|
||||
)
|
||||
).order_by("department", "hire_date")
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
qs,
|
||||
[
|
||||
("Jones", 45000, "Accounting", datetime.date(2005, 11, 1), 45000),
|
||||
@@ -393,7 +393,7 @@ class WindowFunctionTests(TestCase):
|
||||
order_by=F("hire_date").asc(),
|
||||
)
|
||||
)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
qs,
|
||||
[
|
||||
(
|
||||
@@ -531,7 +531,7 @@ class WindowFunctionTests(TestCase):
|
||||
order_by=[F("salary").asc(), F("name").asc()],
|
||||
)
|
||||
).order_by("department", "salary", "name")
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
qs,
|
||||
[
|
||||
("Williams", "Accounting", 37000, 37000),
|
||||
@@ -562,7 +562,7 @@ class WindowFunctionTests(TestCase):
|
||||
partition_by=ExtractYear("hire_date"),
|
||||
)
|
||||
).order_by(ExtractYear("hire_date"), "salary")
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
qs,
|
||||
[
|
||||
("Jones", "Accounting", 45000, 2005, 100000),
|
||||
@@ -599,7 +599,7 @@ class WindowFunctionTests(TestCase):
|
||||
)
|
||||
).order_by("salary", "name")
|
||||
# Round result of cume_dist because Oracle uses greater precision.
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
qs,
|
||||
[
|
||||
("Moore", "IT", 34000, 0.0833333333),
|
||||
@@ -631,7 +631,7 @@ class WindowFunctionTests(TestCase):
|
||||
partition_by=F("department"),
|
||||
)
|
||||
).order_by("department", "hire_date", "name")
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
qs,
|
||||
[
|
||||
("Jones", "Accounting", datetime.date(2005, 11, 1), 45000, None),
|
||||
@@ -670,7 +670,7 @@ class WindowFunctionTests(TestCase):
|
||||
partition_by="department",
|
||||
)
|
||||
).order_by("department", F("hire_date").asc(), F("name").desc())
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
qs,
|
||||
[
|
||||
("Jones", 45000, "Accounting", datetime.date(2005, 11, 1), 45000),
|
||||
@@ -707,7 +707,7 @@ class WindowFunctionTests(TestCase):
|
||||
order_by=F("hire_date").asc(),
|
||||
)
|
||||
)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
qs,
|
||||
[
|
||||
("Jones", 45000, "Accounting", datetime.date(2005, 11, 1), 37000),
|
||||
@@ -758,7 +758,7 @@ class WindowFunctionTests(TestCase):
|
||||
order_by="-salary",
|
||||
)
|
||||
).order_by("ntile", "-salary", "name")
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
qs,
|
||||
[
|
||||
("Miller", "Management", 100000, 1),
|
||||
@@ -789,7 +789,7 @@ class WindowFunctionTests(TestCase):
|
||||
)
|
||||
).order_by("percent_rank")
|
||||
# Round to account for precision differences among databases.
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
qs,
|
||||
[
|
||||
("Moore", "IT", 34000, 0.0),
|
||||
@@ -838,7 +838,7 @@ class WindowFunctionTests(TestCase):
|
||||
partition_by=[F("department"), F("hire_date__year")],
|
||||
)
|
||||
).order_by("department", "hire_date", "name")
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
qs,
|
||||
[
|
||||
("Jones", 45000, "Accounting", datetime.date(2005, 11, 1), 45000),
|
||||
@@ -876,7 +876,7 @@ class WindowFunctionTests(TestCase):
|
||||
order_by=[F("hire_date").asc(), F("name").asc()],
|
||||
)
|
||||
).order_by("department", "sum")
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
qs,
|
||||
[
|
||||
("Jones", 45000, "Accounting", datetime.date(2005, 11, 1), 45000),
|
||||
@@ -921,25 +921,25 @@ class WindowFunctionTests(TestCase):
|
||||
),
|
||||
).order_by("department", "name")
|
||||
# Direct window reference.
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
qs.filter(department_salary_rank=1),
|
||||
["Adams", "Wilkinson", "Miller", "Johnson", "Smith"],
|
||||
lambda employee: employee.name,
|
||||
)
|
||||
# Through a combined expression containing a window.
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
qs.filter(department_avg_age_diff__gt=0),
|
||||
["Jenson", "Jones", "Williams", "Miller", "Smith"],
|
||||
lambda employee: employee.name,
|
||||
)
|
||||
# Intersection of multiple windows.
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
qs.filter(department_salary_rank=1, department_avg_age_diff__gt=0),
|
||||
["Miller"],
|
||||
lambda employee: employee.name,
|
||||
)
|
||||
# Union of multiple windows.
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
qs.filter(Q(department_salary_rank=1) | Q(department_avg_age_diff__gt=0)),
|
||||
[
|
||||
"Adams",
|
||||
@@ -1021,7 +1021,7 @@ class WindowFunctionTests(TestCase):
|
||||
Window(Avg("age"), partition_by="department") - F("age")
|
||||
),
|
||||
).order_by("department", "name")
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
qs.filter(department_avg_age_diff__gt=0),
|
||||
["Jenson", "Jones", "Williams", "Miller", "Smith"],
|
||||
lambda employee: employee.name,
|
||||
@@ -1038,7 +1038,7 @@ class WindowFunctionTests(TestCase):
|
||||
.filter(department_avg_age_diff__gt=0)
|
||||
.order_by("department", "name")
|
||||
)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
qs,
|
||||
["Jenson", "Jones", "Williams", "Miller", "Smith"],
|
||||
lambda employee: employee.name,
|
||||
@@ -1056,19 +1056,19 @@ class WindowFunctionTests(TestCase):
|
||||
),
|
||||
).order_by("department", "name")
|
||||
# Direct window reference.
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
qs.exclude(department_salary_rank__gt=1),
|
||||
["Adams", "Wilkinson", "Miller", "Johnson", "Smith"],
|
||||
lambda employee: employee.name,
|
||||
)
|
||||
# Through a combined expression containing a window.
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
qs.exclude(department_avg_age_diff__lte=0),
|
||||
["Jenson", "Jones", "Williams", "Miller", "Smith"],
|
||||
lambda employee: employee.name,
|
||||
)
|
||||
# Union of multiple windows.
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
qs.exclude(
|
||||
Q(department_salary_rank__gt=1) | Q(department_avg_age_diff__lte=0)
|
||||
),
|
||||
@@ -1076,7 +1076,7 @@ class WindowFunctionTests(TestCase):
|
||||
lambda employee: employee.name,
|
||||
)
|
||||
# Intersection of multiple windows.
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
qs.exclude(department_salary_rank__gt=1, department_avg_age_diff__lte=0),
|
||||
[
|
||||
"Adams",
|
||||
@@ -1144,7 +1144,7 @@ class WindowFunctionTests(TestCase):
|
||||
A query filtering against a window function have its limit applied
|
||||
after window filtering takes place.
|
||||
"""
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
Employee.objects.annotate(
|
||||
department_salary_rank=Window(
|
||||
Rank(), partition_by="department", order_by="-salary"
|
||||
@@ -1179,7 +1179,7 @@ class WindowFunctionTests(TestCase):
|
||||
)
|
||||
)
|
||||
self.assertIn("RANGE BETWEEN 2 PRECEDING AND 2 FOLLOWING", str(qs.query))
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
qs,
|
||||
[
|
||||
("Williams", 37000, "Accounting", datetime.date(2009, 6, 1), 37000),
|
||||
@@ -1218,7 +1218,7 @@ class WindowFunctionTests(TestCase):
|
||||
self.assertIn(
|
||||
"RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING", str(qs.query)
|
||||
)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
qs,
|
||||
[
|
||||
("Jones", "Accounting", 45000, datetime.date(2005, 11, 1), 165000),
|
||||
@@ -1260,7 +1260,7 @@ class WindowFunctionTests(TestCase):
|
||||
.values("hire_date")[:1],
|
||||
),
|
||||
).order_by("department", "name")
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
qs,
|
||||
[
|
||||
("Adams", "Accounting", datetime.date(2005, 11, 1)),
|
||||
@@ -1297,7 +1297,7 @@ class WindowFunctionTests(TestCase):
|
||||
)
|
||||
).order_by("sum", "hire_date")
|
||||
self.assertIn("ROWS BETWEEN UNBOUNDED PRECEDING AND 3 FOLLOWING", str(qs.query))
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
qs,
|
||||
[
|
||||
("Miller", 100000, "Management", datetime.date(2005, 6, 1), 280000),
|
||||
@@ -1430,7 +1430,7 @@ class WindowFunctionTests(TestCase):
|
||||
order_by=[order_by],
|
||||
)
|
||||
).order_by("value__department", "department_sum")
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
qs,
|
||||
[
|
||||
("Brown", "HR", 50000, 50000),
|
||||
|
||||
Reference in New Issue
Block a user