summaryrefslogtreecommitdiff
path: root/django/db/models/sql/query.py
diff options
context:
space:
mode:
authorSimon Charette <charette.s@gmail.com>2019-03-06 01:24:41 -0500
committerTim Graham <timograham@gmail.com>2019-03-21 20:42:26 -0400
commit3a505c70e7b228bf1212c067a8f38271ca86ce09 (patch)
treed611279d7709467797ffcf9836bdb4109a7f2f03 /django/db/models/sql/query.py
parent35431298226165986ad07e91f9d3aca721ff38ec (diff)
Refs #27149, #29542 -- Simplified subquery parentheses wrapping logic.
Diffstat (limited to 'django/db/models/sql/query.py')
-rw-r--r--django/db/models/sql/query.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index c192530573..3aa3c0b512 100644
--- a/django/db/models/sql/query.py
+++ b/django/db/models/sql/query.py
@@ -1022,7 +1022,10 @@ class Query(BaseExpression):
return clone
def as_sql(self, compiler, connection):
- return self.get_compiler(connection=connection).as_sql()
+ sql, params = self.get_compiler(connection=connection).as_sql()
+ if self.subquery:
+ sql = '(%s)' % sql
+ return sql, params
def resolve_lookup_value(self, value, can_reuse, allow_joins, simple_col):
if hasattr(value, 'resolve_expression'):