Changeset 6868

Timestamp:

12/03/07 15:10:55 (7 months ago)

Author:

mtredinnick

Message:

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

Files:

• django/branches/queryset-refactor/django/db/models/sql/where.py (modified) (2 diffs)

django/branches/queryset-refactor/django/db/models/sql/where.py

@@ -43 +43 @@
-        result = []
-        result_params = []
+        empty = True
-        for child in node.children:
-            if hasattr(child, 'as_sql'):
@@ -61 +62 @@
-                        # We can bail out early in this particular case (only).
-                        raise
-
+
+
+
+
-            if sql:
-                result.append(format % sql)
-                result_params.extend(params)
+        if empty:
+            raise EmptyResultSet
-        conn = ' %s ' % node.connector
-        return conn.join(result), result_params