mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-11-29 15:01:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Refs #29654 -- Replaced three dots with ellipsis character in output strings.

Browse source
This commit is contained in:
Claude Paroz 2018-08-22 15:13:58 +02:00 • committed by Tim Graham
parent 233c70f047
commit 50b8493581
23 changed files with 60 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

2
django/db/models/sql/query.py
View file

@ -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: