Author: russellm
Date: 2009-04-12 21:59:40 -0500 (Sun, 12 Apr 2009)
New Revision: 10550
Modified:
django/trunk/django/db/models/fields/related.py
django/trunk/tests/regressiontests/m2m_regress/models.py
Log:
Fixed #10237 -- Corrected the handling of self-referential m2m fields when
using multi-table inheritance. Thanks to Justin Lilly for the report and patch.
Modified: django/trunk/django/db/models/fields/related.py
===================================================================
--- django/trunk/django/db/models/fields/related.py 2009-04-12 07:19:56 UTC
(rev 10549)
+++ django/trunk/django/db/models/fields/related.py 2009-04-13 02:59:40 UTC
(rev 10550)
@@ -582,7 +582,7 @@
model=rel_model,
core_filters={'%s__pk' % self.field.related_query_name():
instance._get_pk_val()},
instance=instance,
- symmetrical=(self.field.rel.symmetrical and instance.__class__ ==
rel_model),
+ symmetrical=(self.field.rel.symmetrical and isinstance(instance,
rel_model)),
join_table=qn(self.field.m2m_db_table()),
source_col_name=qn(self.field.m2m_column_name()),
target_col_name=qn(self.field.m2m_reverse_name())
Modified: django/trunk/tests/regressiontests/m2m_regress/models.py
===================================================================
--- django/trunk/tests/regressiontests/m2m_regress/models.py 2009-04-12
07:19:56 UTC (rev 10549)
+++ django/trunk/tests/regressiontests/m2m_regress/models.py 2009-04-13
02:59:40 UTC (rev 10550)
@@ -26,6 +26,13 @@
def __unicode__(self):
return self.name
+# Two models both inheriting from a base model with a self-referential m2m
field
+class SelfReferChild(SelfRefer):
+ pass
+
+class SelfReferChildSibling(SelfRefer):
+ pass
+
__test__ = {"regressions": """
# Multiple m2m references to the same model or a different model must be
# distinguished when accessing the relations through an instance attribute.
@@ -57,7 +64,20 @@
>>> SelfRefer.objects.filter(porcupine='fred')
Traceback (most recent call last):
...
-FieldError: Cannot resolve keyword 'porcupine' into field. Choices are: id,
name, references, related
+FieldError: Cannot resolve keyword 'porcupine' into field. Choices are: id,
name, references, related, selfreferchild, selfreferchildsibling
+# Test to ensure that the relationship between two inherited models
+# with a self-referential m2m field maintains symmetry
+>>> sr_child = SelfReferChild(name="Hanna")
+>>> sr_child.save()
+
+>>> sr_sibling = SelfReferChildSibling(name="Beth")
+>>> sr_sibling.save()
+>>> sr_child.related.add(sr_sibling)
+>>> sr_child.related.all()
+[<SelfRefer: Beth>]
+>>> sr_sibling.related.all()
+[<SelfRefer: Hanna>]
+
"""
}
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
