3 files changed, 120 insertions, 0 deletions
diff --git a/tests/m2m_and_m2o/__init__.py b/tests/m2m_and_m2o/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/m2m_and_m2o/__init__.py
diff --git a/tests/m2m_and_m2o/models.py b/tests/m2m_and_m2o/models.py
new file mode 100644
index 0000000000..99c7b01017
--- /dev/null
+++ b/tests/m2m_and_m2o/models.py
@@ -0,0 +1,30 @@
+"""
+29. Many-to-many and many-to-one relationships to the same table
+
+Make sure to set ``related_name`` if you use relationships to the same table.
+"""
+from __future__ import unicode_literals
+
+from django.db import models
+from django.utils import six
+from django.utils.encoding import python_2_unicode_compatible
+
+
+class User(models.Model):
+    username = models.CharField(max_length=20)
+
+@python_2_unicode_compatible
+class Issue(models.Model):
+    num = models.IntegerField()
+    cc = models.ManyToManyField(User, blank=True, related_name='test_issue_cc')
+    client = models.ForeignKey(User, related_name='test_issue_client')
+
+    def __str__(self):
+        return six.text_type(self.num)
+
+    class Meta:
+        ordering = ('num',)
+
+class UnicodeReferenceModel(models.Model):
+    others = models.ManyToManyField("UnicodeReferenceModel")
+
diff --git a/tests/m2m_and_m2o/tests.py b/tests/m2m_and_m2o/tests.py
new file mode 100644
index 0000000000..77f2eb3b09
--- /dev/null
+++ b/tests/m2m_and_m2o/tests.py
@@ -0,0 +1,90 @@
+from __future__ import absolute_import
+
+from django.db.models import Q
+from django.test import TestCase
+
+from .models import Issue, User, UnicodeReferenceModel
+
+
+class RelatedObjectTests(TestCase):
+    def test_m2m_and_m2o(self):
+        r = User.objects.create(username="russell")
+        g = User.objects.create(username="gustav")
+
+        i1 = Issue(num=1)
+        i1.client = r
+        i1.save()
+
+        i2 = Issue(num=2)
+        i2.client = r
+        i2.save()
+        i2.cc.add(r)
+
+        i3 = Issue(num=3)
+        i3.client = g
+        i3.save()
+        i3.cc.add(r)
+
+        self.assertQuerysetEqual(
+            Issue.objects.filter(client=r.id), [
+                1,
+                2,
+            ],
+            lambda i: i.num
+        )
+        self.assertQuerysetEqual(
+            Issue.objects.filter(client=g.id), [
+                3,
+            ],
+            lambda i: i.num
+        )
+        self.assertQuerysetEqual(
+            Issue.objects.filter(cc__id__exact=g.id), []
+        )
+        self.assertQuerysetEqual(
+            Issue.objects.filter(cc__id__exact=r.id), [
+                2,
+                3,
+            ],
+            lambda i: i.num
+        )
+
+        # These queries combine results from the m2m and the m2o relationships.
+        # They're three ways of saying the same thing.
+        self.assertQuerysetEqual(
+            Issue.objects.filter(Q(cc__id__exact = r.id) | Q(client=r.id)), [
+                1,
+                2,
+                3,
+            ],
+            lambda i: i.num
+        )
+        self.assertQuerysetEqual(
+            Issue.objects.filter(cc__id__exact=r.id) | Issue.objects.filter(client=r.id), [
+                1,
+                2,
+                3,
+            ],
+            lambda i: i.num
+        )
+        self.assertQuerysetEqual(
+            Issue.objects.filter(Q(client=r.id) | Q(cc__id__exact=r.id)), [
+                1,
+                2,
+                3,
+            ],
+            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.
+