summaryrefslogtreecommitdiff
path: root/django/db/models/sql/query.py
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2018-08-22 15:13:58 +0200
committerTim Graham <timograham@gmail.com>2018-08-22 09:13:58 -0400
commit50b8493581fea3d7137dd8db33bac7008868d23a (patch)
tree17e10260f66489ec5ecc60464e9fb94889c61aa2 /django/db/models/sql/query.py
parent233c70f0479beb3bff9027e6cff680882978fd4d (diff)
Refs #29654 -- Replaced three dots with ellipsis character in output strings.
Diffstat (limited to 'django/db/models/sql/query.py')
-rw-r--r--django/db/models/sql/query.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index f5f26b9426..74eec72291 100644
--- a/django/db/models/sql/query.py
+++ b/django/db/models/sql/query.py
@@ -614,7 +614,7 @@ class Query:
# really make sense (or return consistent value sets). Not worth
# the extra complexity when you can write a real query instead.
if self._extra and rhs._extra:
- raise ValueError("When merging querysets using 'or', you cannot have extra(select=...) on both sides.")
+ raise ValueError("When merging querysets using 'or', you cannot have extra(select=…) on both sides.")
self.extra.update(rhs.extra)
extra_select_mask = set()
if self.extra_select_mask is not None: