diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2009-03-02 06:08:02 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2009-03-02 06:08:02 +0000 |
| commit | 851461aa72cc94e7000c3c7713e1d9fb130e0fda (patch) | |
| tree | ac0effa9cf756402383ee408c7aeee550b22d7d4 /django/db/models/sql/where.py | |
| parent | a605a8fe085f207092f2e330cf1e738d58c75f70 (diff) | |
Fixed #10181 -- Handle an EmptyResultSet exception case properly in nested querysets.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9951 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/db/models/sql/where.py')
| -rw-r--r-- | django/db/models/sql/where.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/models/sql/where.py b/django/db/models/sql/where.py index 43ac42489a..a711103485 100644 --- a/django/db/models/sql/where.py +++ b/django/db/models/sql/where.py @@ -50,7 +50,7 @@ class WhereNode(tree.Node): if hasattr(obj, "process"): try: obj, params = obj.process(lookup_type, value) - except EmptyShortCircuit: + except (EmptyShortCircuit, EmptyResultSet): # There are situations where we want to short-circuit any # comparisons and make sure that nothing is returned. One # example is when checking for a NULL pk value, or the |