diff options
| -rw-r--r-- | tests/modeltests/m2m_and_m2o/models.py | 4 | ||||
| -rw-r--r-- | tests/modeltests/m2m_and_m2o/tests.py | 15 |
2 files changed, 18 insertions, 1 deletions
diff --git a/tests/modeltests/m2m_and_m2o/models.py b/tests/modeltests/m2m_and_m2o/models.py index 0fea1a2e7b..6072bd4c5e 100644 --- a/tests/modeltests/m2m_and_m2o/models.py +++ b/tests/modeltests/m2m_and_m2o/models.py @@ -19,3 +19,7 @@ class Issue(models.Model): class Meta: ordering = ('num',) + +class UnicodeReferenceModel(models.Model): + others = models.ManyToManyField(u"UnicodeReferenceModel") + diff --git a/tests/modeltests/m2m_and_m2o/tests.py b/tests/modeltests/m2m_and_m2o/tests.py index dedf9cdf26..cb3dcc86bb 100644 --- a/tests/modeltests/m2m_and_m2o/tests.py +++ b/tests/modeltests/m2m_and_m2o/tests.py @@ -1,7 +1,7 @@ from django.db.models import Q from django.test import TestCase -from models import Issue, User +from models import Issue, User, UnicodeReferenceModel class RelatedObjectTests(TestCase): @@ -73,3 +73,16 @@ class RelatedObjectTests(TestCase): ], lambda i: i.num ) + +class RelatedObjectTests(TestCase): + def test_m2m_with_unicode_reference(self): + """ + Regression test for #6045: references to other models can be unicode + strings, providing they are directly convertible to ASCII. + """ + m1=UnicodeReferenceModel.objects.create() + m2=UnicodeReferenceModel.objects.create() + m2.others.add(m1) # used to cause an error (see ticket #6045) + m2.save() + list(m2.others.all()) # Force retrieval. + |