mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-06 10:49:17 +00:00
Code Issues 32 Releases Wiki Activity

queryset-refactor: Fixed disjunctions of empty result sets. Refs #6074.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@6868 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2007-12-03 21:10:55 +00:00
parent 57a4b882ae
commit 8e6126fbc2
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,6 +42,7 @@ class WhereNode(tree.Node):
return None, [] return None, []
result = [] result = []
result_params = [] result_params = []
empty = True
for child in node.children: for child in node.children:
if hasattr(child, 'as_sql'): if hasattr(child, 'as_sql'):
sql, params = child.as_sql(qn=qn) sql, params = child.as_sql(qn=qn)
@ -60,10 +61,15 @@ class WhereNode(tree.Node):
if self.connector == AND and not node.negated: if self.connector == AND and not node.negated:
# We can bail out early in this particular case (only). # We can bail out early in this particular case (only).
raise raise
sql = None elif node.negated:
empty = False
continue
empty = False
if sql: if sql:
result.append(format % sql) result.append(format % sql)
result_params.extend(params) result_params.extend(params)
if empty:
raise EmptyResultSet
conn = ' %s ' % node.connector conn = ' %s ' % node.connector
return conn.join(result), result_params return conn.join(result), result_params