Changeset 8426

Timestamp:

08/17/08 15:07:59 (5 months ago)

Author:

mtredinnick

Message:

Changed the (internal) way extra(select=.., select_params=...) handling is done
so that parameters stay with their select items. This means that merging and
trimming of those items is handled correctly.

Refs #7957, #7961. Fixed #8191.

Files:

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

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

@@ -12 +12 @@
-from django.utils.tree import Node
-from django.utils.datastructures import SortedDict
+from django.utils.encoding import force_unicode
-from django.db import connection
-from django.db.models import signals
@@ -78 +79 @@
-        # These are for extensions. The contents are more or less appended
-        # verbatim to the appropriate clause.
-
-
+
-        self.extra_tables = ()
-        self.extra_where = ()
@@ -182 +182 @@
-        obj.max_depth = self.max_depth
-        obj.extra_select = self.extra_select.copy()
-        obj.extra_select_params = self.extra_select_params
-        obj.extra_tables = self.extra_tables
-        obj.extra_where = self.extra_where
@@ -227 +226 @@
-                    distinct=False)
-            obj.select = []
-{}
+SortedDict()
-        obj.add_count_column()
-        data = obj.execute_sql(SINGLE)
@@ -260 +259 @@
-
-        where, w_params = self.where.as_sql(qn=self.quote_name_unless_alias)
-
+
+
+
-
-        result = ['SELECT']
@@ -414 +415 @@
-        qn = self.quote_name_unless_alias
-        qn2 = self.connection.ops.quote_name
-
+[0]
-        aliases = set(self.extra_select.keys())
-        if with_aliases:
@@ -1511 +1512 @@
-        self.select_fields = [None]
-        self.extra_select = {}
-        self.extra_select_params = ()
-
-    def add_select_related(self, fields):
@@ -1534 +1534 @@
-        """
-        if select:
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if where:
-            self.extra_where += tuple(where)

django/trunk/docs/db-api.txt

@@ -1015 +1015 @@
-            select_params=('one', 'two'))
-
+    The only thing to be careful about when using select parameters in
+    ``extra()`` is to avoid using the substring ``"%%s"`` (that's *two*
+    percent characters before the ``s``) in the select strings. Django's
+    tracking of parameters looks for ``%s`` and an escaped ``%`` character
+    like this isn't detected. That will lead to incorrect results.
+
-``where`` / ``tables``
-    You can define explicit SQL ``WHERE`` clauses -- perhaps to perform

django/trunk/tests/regressiontests/extra_regress/models.py

@@ -1 +1 @@
-import copy
-
+from django.contrib.auth.models import User
-from django.db import models
-from django.db.models.query import Q
+from django.utils.datastructures import SortedDict
-
-
@@ -24 +26 @@
-
-__test__ = {"API_TESTS": """
-##
+
-
->>> rm = RevisionableModel.objects.create(title='First Revision')
@@ -53 +55 @@
-[<RevisionableModel: Second Revision (2, 1)>]
-
+>>> u = User.objects.create_user(username="fred", password="secret", email="fred@example.com")
+
+# General regression tests: extra select parameters should stay tied to their
+# corresponding select portions. Applies when portions are updated or otherwise
+# moved around.
+>>> qs = User.objects.extra(select=SortedDict((("alpha", "%s"), ("beta", "2"), ("gamma", "%s"))), select_params=(1, 3))
+>>> qs = qs.extra(select={"beta": 4})
+>>> qs = qs.extra(select={"alpha": "%s"}, select_params=[5])
+>>> result = {'alpha': 5, 'beta': 4, 'gamma': 3}
+>>> list(qs.filter(id=u.id).values('alpha', 'beta', 'gamma')) == [result]
+True
+
+# Regression test for #7957: Combining extra() calls should leave the
+# corresponding parameters associated with the right extra() bit. I.e. internal
+# dictionary must remain sorted.
+>>> User.objects.extra(select={"alpha": "%s"}, select_params=(1,)).extra(select={"beta": "%s"}, select_params=(2,))[0].alpha
+1
+>>> User.objects.extra(select={"beta": "%s"}, select_params=(1,)).extra(select={"alpha": "%s"}, select_params=(2,))[0].alpha
+2
+
+# Regression test for #7961: When not using a portion of an extra(...) in a
+# query, remove any corresponding parameters from the query as well.
+>>> list(User.objects.extra(select={"alpha": "%s"}, select_params=(-6,)).filter(id=u.id).values_list('id', flat=True)) == [u.id]
+True
+
-"""}