summaryrefslogtreecommitdiff
path: root/django/db/models/sql
diff options
context:
space:
mode:
authorMariusz Felisiak <felisiak.mariusz@gmail.com>2021-03-10 09:16:28 +0100
committerGitHub <noreply@github.com>2021-03-10 09:16:28 +0100
commitba9a2b754452b542d3f472f0acce6f940911aced (patch)
tree3ef805503af0ff58dedba310ae18a0b1f14c8edd /django/db/models/sql
parent6f5dbe9dbe45b23b3befe4f1cd2ea13b6049ab96 (diff)
Refs #32508 -- Raised TypeError instead of using "assert" on unsupported operations for sliced querysets.
Diffstat (limited to 'django/db/models/sql')
-rw-r--r--django/db/models/sql/query.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index 5ca3f38e15..6c728d17bf 100644
--- a/django/db/models/sql/query.py
+++ b/django/db/models/sql/query.py
@@ -574,8 +574,8 @@ class Query(BaseExpression):
"""
assert self.model == rhs.model, \
"Cannot combine queries on two different base models."
- assert not self.is_sliced, \
- "Cannot combine queries once a slice has been taken."
+ if self.is_sliced:
+ raise TypeError('Cannot combine queries once a slice has been taken.')
assert self.distinct == rhs.distinct, \
"Cannot combine a unique query with a non-unique query."
assert self.distinct_fields == rhs.distinct_fields, \