Changeset 8608

Timestamp:

08/27/08 00:22:33 (3 months ago)

Author:

mtredinnick

Message:

Fixed #5937 -- When filtering on generic relations, restrict the target objects to those with the right content type.

This isn't a complete solution to this class of problem, but it will do for
1.0, which only has generic relations as a multicolumn type. A more general
multicolumn solution will be available after that release.

Files:

• django/trunk/django/contrib/contenttypes/generic.py (modified) (1 diff)
• django/trunk/django/db/models/sql/query.py (modified) (10 diffs)
• django/trunk/tests/modeltests/generic_relations/models.py (modified) (8 diffs)

django/trunk/django/contrib/contenttypes/generic.py

@@ -166 +166 @@
-        # same db_type as well.
-        return None
+
+    def extra_filters(self, pieces, pos):
+        """
+        Return an extra filter to the queryset so that the results are filtered
+        on the appropriate content type.
+        """
+        ContentType = get_model("contenttypes", "contenttype")
+        content_type = ContentType.objects.get_for_model(self.model)
+        prefix = "__".join(pieces[:pos + 1])
+        return "%s__%s" % (prefix, self.content_type_field_name), content_type
-
-class ReverseGenericRelatedObjectsDescriptor(object):

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

@@ -648 +648 @@
-        if not alias:
-            alias = self.get_initial_alias()
- = self.setup_joins(pieces, opt
-
+, extra = self.setup_joins(piece
+opts, 
-        alias = joins[-1]
-        col = target.column
@@ -1007 +1007 @@
-
-    def add_filter(self, filter_expr, connector=AND, negate=False, trim=False,
-
+, process_extras=True
-        """
-        Add a single filter to the query. The 'filter_expr' is a pair:
@@ -1027 +1027 @@
-        if we would otherwise force the creation of new aliases for a join
-        (needed for nested Q-filters). The set is updated by this method.
+
+        If 'process_extras' is set, any extra filters returned from the table
+        joining process will be processed. This parameter is set to False
+        during the processing of extra filters to avoid infinite recursion.
-        """
-        arg, value = filter_expr
@@ -1054 +1058 @@
-
-        try:
- = self.setup_joins(parts, opts,
-
+, extra_filters = self.setup_joins(
+parts, opts, 
-        except MultiJoin, e:
-            self.split_exclude(filter_expr, LOOKUP_SEP.join(parts[:e.level]))
@@ -1153 +1157 @@
-        if can_reuse is not None:
-            can_reuse.update(join_list)
+        if process_extras:
+            for filter in extra_filters:
+                self.add_filter(filter, negate=negate, can_reuse=can_reuse,
+                        process_extras=False)
-
-    def add_q(self, q_object, used_aliases=None):
@@ -1208 +1216 @@
-        dupe_set = set()
-        exclusions = set()
+        extra_filters = []
-        for pos, name in enumerate(names):
-            try:
@@ -1263 +1272 @@
-                        ()))
-
+            if hasattr(field, 'extra_filters'):
+                extra_filters.append(field.extra_filters(names, pos))
-            if direct:
-                if m2m:
@@ -1366 +1377 @@
-            raise FieldError("Join on field %r not permitted." % name)
-
-
+, extra_filters
-
-    def update_dupe_avoidance(self, opts, col, alias):
@@ -1438 +1449 @@
-        try:
-            for name in field_names:
-
+, u4
-                        name.split(LOOKUP_SEP), opts, alias, False, allow_m2m,
-                        True)
@@ -1602 +1613 @@
-        opts = self.model._meta
-        alias = self.get_initial_alias()
-
+, extra
-                start.split(LOOKUP_SEP), opts, alias, False)
-        alias = joins[last[-1]]

django/trunk/tests/modeltests/generic_relations/models.py

@@ -83 +83 @@
->>> bacon = Vegetable(name="Bacon", is_yucky=False)
->>> quartz = Mineral(name="Quartz", hardness=7)
-lion, platypus
+platypus, lion
-...     o.save()
-
@@ -96 +96 @@
->>> lion.tags.create(tag="hairy")
-<TaggedItem: hairy>
+>>> platypus.tags.create(tag="fatty")
+<TaggedItem: fatty>
-
->>> lion.tags.all()
@@ -125 +127 @@
->>> tag1.save()
->>> platypus.tags.all()
-
+fatty>, <TaggedItem: 
->>> TaggedItem.objects.filter(content_type__pk=ctype.id, object_id=quartz.id)
-[<TaggedItem: clearish>]
+
+# Queries across generic relations respect the content types. Even though there are two TaggedItems with a tag of "fatty", this query only pulls out the one with the content type related to Animals.
+>>> Animal.objects.filter(tags__tag='fatty')
+[<Animal: Platypus>]
-
-# If you delete an object with an explicit Generic relation, the related
@@ -133 +139 @@
-# Original list of tags:
->>> [(t.tag, t.content_type, t.object_id) for t in TaggedItem.objects.all()]
-hairy', <ContentType: animal>, 1), (u'salty', <ContentType: vegetable>, 2), (u'shiny', <ContentType: animal>, 2), (u'yellow', <ContentType: animal>, 1
+fatty', <ContentType: animal>, 1), (u'hairy', <ContentType: animal>, 2), (u'salty', <ContentType: vegetable>, 2), (u'shiny', <ContentType: animal>, 1), (u'yellow', <ContentType: animal>, 2
-
->>> lion.delete()
->>> [(t.tag, t.content_type, t.object_id) for t in TaggedItem.objects.all()]
-salty', <ContentType: vegetable>, 2), (u'shiny', <ContentType: animal>, 2
+fatty', <ContentType: animal>, 1), (u'salty', <ContentType: vegetable>, 2), (u'shiny', <ContentType: animal>, 1
-
-# If Generic Relation is not explicitly defined, any related objects
@@ -143 +149 @@
->>> quartz.delete()
->>> [(t.tag, t.content_type, t.object_id) for t in TaggedItem.objects.all()]
-salty', <ContentType: vegetable>, 2), (u'shiny', <ContentType: animal>, 2
+fatty', <ContentType: animal>, 1), (u'salty', <ContentType: vegetable>, 2), (u'shiny', <ContentType: animal>, 1
-
-# If you delete a tag, the objects using the tag are unaffected
@@ -152 +158 @@
-[<TaggedItem: salty>]
->>> [(t.tag, t.content_type, t.object_id) for t in TaggedItem.objects.all()]
-
+
+
+
-
->>> ctype = ContentType.objects.get_for_model(lion)
@@ -193 +201 @@
-[<Comparison: tiger is stronger than None>]
-
+
-# GenericInlineFormSet tests ##################################################
-
@@ -208 +217 @@
-...     print form.as_p()
-<p><label for="id_generic_relations-taggeditem-content_type-object_id-0-tag">Tag:</label> <input id="id_generic_relations-taggeditem-content_type-object_id-0-tag" type="text" name="generic_relations-taggeditem-content_type-object_id-0-tag" value="shiny" maxlength="50" /></p>
-5
+...
-<p><label for="id_generic_relations-taggeditem-content_type-object_id-1-tag">Tag:</label> <input id="id_generic_relations-taggeditem-content_type-object_id-1-tag" type="text" name="generic_relations-taggeditem-content_type-object_id-1-tag" maxlength="50" /></p>
-<p><label for="id_generic_relations-taggeditem-content_type-object_id-1-DELETE">Delete:</label> <input type="checkbox" name="generic_relations-taggeditem-content_type-object_id-1-DELETE" id="id_generic_relations-taggeditem-content_type-object_id-1-DELETE" /><input type="hidden" name="generic_relations-taggeditem-content_type-object_id-1-id" id="id_generic_relations-taggeditem-content_type-object_id-1-id" /></p>