diff options
Diffstat (limited to 'django/db/models/sql/query.py')
| -rw-r--r-- | django/db/models/sql/query.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index 242b2a1f3f..2b1f6757ba 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -682,7 +682,8 @@ class Query(BaseExpression): # 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." + "When merging querysets using 'or', you cannot have " + "extra(select=...) on both sides." ) self.extra.update(rhs.extra) extra_select_mask = set() |