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

Merge pull request #813 from HiddenData/ticket-19263 

fixes #19263 - EmptyResultSet in subquery causes incorrect SQL
This commit is contained in:
Honza Král 2013-02-23 15:05:24 -08:00
parent 692902b227 2b76f19f2b
commit fc38d6a92b
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/db/models/sql/where.py
View File

@ -204,6 +204,10 @@ class WhereNode(tree.Node):
raise EmptyResultSet raise EmptyResultSet
if extra: if extra:
return ('%s IN %s' % (field_sql, extra), params) return ('%s IN %s' % (field_sql, extra), params)
if not params:
# Empty params would generate invalid sql in subquery
raise EmptyResultSet
max_in_list_size = connection.ops.max_in_list_size() max_in_list_size = connection.ops.max_in_list_size()
if max_in_list_size and len(params) > max_in_list_size: if max_in_list_size and len(params) > max_in_list_size:
# Break up the params list into an OR of manageable chunks. # Break up the params list into an OR of manageable chunks.

15
tests/regressiontests/queries/tests.py
View File

@ -2021,6 +2021,9 @@ class WeirdQuerysetSlicingTests(BaseQuerysetTest):
Article.objects.create(name='three', created=datetime.datetime.now()) Article.objects.create(name='three', created=datetime.datetime.now())
Article.objects.create(name='four', created=datetime.datetime.now()) Article.objects.create(name='four', created=datetime.datetime.now())
food = Food.objects.create(name='spam')
Eaten.objects.create(meal='spam with eggs', food=food)
def test_tickets_7698_10202(self): def test_tickets_7698_10202(self):
# People like to slice with '0' as the high-water mark. # People like to slice with '0' as the high-water mark.
self.assertQuerysetEqual(Article.objects.all()[0:0], []) self.assertQuerysetEqual(Article.objects.all()[0:0], [])
@ -2036,6 +2039,18 @@ class WeirdQuerysetSlicingTests(BaseQuerysetTest):
# ticket #12192 # ticket #12192
self.assertNumQueries(0, lambda: list(Number.objects.all()[1:1])) self.assertNumQueries(0, lambda: list(Number.objects.all()[1:1]))
def test_empty_sliced_subquery(self):
# ticket #19263 - testing subqueries
self.assertEqual(
Eaten.objects.filter(food__in=Food.objects.all()[0:0]).count(),
0)
def test_empty_sliced_subquery_exclude(self):
# ticket #19263 - testing subqueries
self.assertEqual(
Eaten.objects.exclude(food__in=Food.objects.all()[0:0]).count(),
1)
class EscapingTests(TestCase): class EscapingTests(TestCase):
def test_ticket_7302(self): def test_ticket_7302(self):