Changeset 7791

Timestamp:

06/30/08 01:24:21 (2 months ago)

Author:

mtredinnick

Message:

Fixed #7314 -- Changed the way extra() bits are handled when QuerySets? are merged.

Also added a section to the documentation to indicate why it's probably not a
good idea to rely on this feature for complex stuff. Garbage in, garbage out
applies even to Django code.

Thanks to erik for the test case for this one.

Files:

• django/trunk/django/db/models/sql/query.py (modified) (1 diff)
• django/trunk/docs/db-api.txt (modified) (1 diff)
• django/trunk/tests/regressiontests/extra_regress (added)
• django/trunk/tests/regressiontests/extra_regress/__init__.py (added)
• django/trunk/tests/regressiontests/extra_regress/models.py (added)

django/trunk/django/db/models/sql/query.py

@@ -367 +367 @@
-                self.select.append(item)
-        self.select_fields = rhs.select_fields[:]
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        # Ordering uses the 'rhs' ordering, unless it has none, in which case

django/trunk/docs/db-api.txt

@@ -443 +443 @@
-Note, however, that the first of these will raise ``IndexError`` while the
-second will raise ``DoesNotExist`` if no objects match the given criteria.
+
+Combining QuerySets
+-------------------
+
+If you have two ``QuerySet`` instances that act on the same model, you can
+combine them using ``&`` and ``|`` to get the items that are in both result
+sets or in either results set, respectively. For example::
+
+    Entry.objects.filter(pubdate__gte=date1) & \
+            Entry.objects.filter(headline__startswith="What")
+
+will combine the two queries into a single SQL query. Of course, in this case
+you could have achieved the same result using multiple filters on the same
+``QuerySet``, but sometimes the ability to combine individual ``QuerySet``
+instance is useful.
+
+Be careful, if you are using ``extra()`` to add custom handling to your
+``QuerySet`` however. All the ``extra()`` components are merged and the result
+may or may not make sense. If you are using custom SQL fragments in your
+``extra()`` calls, Django will not inspect these fragments to see if they need
+to be rewritten because of changes in the merged query. So test the effects
+carefully. Also realise that if you are combining two ``QuerySets`` with
+``|``, you cannot use ``extra(select=...)`` or ``extra(where=...)`` on *both*
+``QuerySets``. You can only use those calls on one or the other (Django will
+raise a ``ValueError`` if you try to use this incorrectly).
-
-QuerySet methods that return new QuerySets