innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #33435 -- Fixed invalid SQL generatered by Subquery.as_sql().

This commit is contained in:
My-Name-Is-Nabil 2022-01-15 01:38:31 +02:00 committed by Mariusz Felisiak
parent b55ebe3241
commit f37face331
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/db/models/expressions.py
View File

@ -1149,7 +1149,8 @@ class Subquery(BaseExpression, Combinable):
def __init__(self, queryset, output_field=None, **extra): def __init__(self, queryset, output_field=None, **extra):
# Allow the usage of both QuerySet and sql.Query objects. # Allow the usage of both QuerySet and sql.Query objects.
self.query = getattr(queryset, 'query', queryset) self.query = getattr(queryset, 'query', queryset).clone()
self.query.subquery = True
self.extra = extra self.extra = extra
super().__init__(output_field) super().__init__(output_field)

9
tests/expressions/tests.py
View File

@ -537,6 +537,15 @@ class BasicExpressionsTests(TestCase):
qs.query.annotations['small_company'], qs.query.annotations['small_company'],
) )
def test_subquery_sql(self):
employees = Employee.objects.all()
employees_subquery = Subquery(employees)
self.assertIs(employees_subquery.query.subquery, True)
self.assertIs(employees.query.subquery, False)
compiler = employees_subquery.query.get_compiler(connection=connection)
sql, _ = employees_subquery.as_sql(compiler, connection)
self.assertIn('(SELECT ', sql)
def test_in_subquery(self): def test_in_subquery(self):
# This is a contrived test (and you really wouldn't write this query), # This is a contrived test (and you really wouldn't write this query),
# but it is a succinct way to test the __in=Subquery() construct. # but it is a succinct way to test the __in=Subquery() construct.