3 files changed, 58 insertions, 0 deletions
diff --git a/parts/django/tests/regressiontests/model_inheritance_select_related/__init__.py b/parts/django/tests/regressiontests/model_inheritance_select_related/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/parts/django/tests/regressiontests/model_inheritance_select_related/__init__.py
diff --git a/parts/django/tests/regressiontests/model_inheritance_select_related/models.py b/parts/django/tests/regressiontests/model_inheritance_select_related/models.py
new file mode 100644
index 0000000..5851e46
--- /dev/null
+++ b/parts/django/tests/regressiontests/model_inheritance_select_related/models.py
@@ -0,0 +1,29 @@
+"""
+Regression tests for the interaction between model inheritance and
+select_related().
+"""
+
+from django.db import models
+
+class Place(models.Model):
+    name = models.CharField(max_length=50)
+
+    class Meta:
+        ordering = ('name',)
+
+    def __unicode__(self):
+        return u"%s the place" % self.name
+
+class Restaurant(Place):
+    serves_sushi = models.BooleanField()
+    serves_steak = models.BooleanField()
+
+    def __unicode__(self):
+        return u"%s the restaurant" % self.name
+
+class Person(models.Model):
+    name = models.CharField(max_length=50)
+    favorite_restaurant = models.ForeignKey(Restaurant)
+
+    def __unicode__(self):
+        return self.name
diff --git a/parts/django/tests/regressiontests/model_inheritance_select_related/tests.py b/parts/django/tests/regressiontests/model_inheritance_select_related/tests.py
new file mode 100644
index 0000000..e1ed609
--- /dev/null
+++ b/parts/django/tests/regressiontests/model_inheritance_select_related/tests.py
@@ -0,0 +1,29 @@
+from operator import attrgetter
+
+from django.test import TestCase
+
+from models import Restaurant, Person
+
+
+class ModelInheritanceSelectRelatedTests(TestCase):
+    def test_inherited_select_related(self):
+        # Regression test for #7246
+        r1 = Restaurant.objects.create(
+            name="Nobu", serves_sushi=True, serves_steak=False
+        )
+        r2 = Restaurant.objects.create(
+            name="Craft", serves_sushi=False, serves_steak=True
+        )
+        p1 = Person.objects.create(name="John", favorite_restaurant=r1)
+        p2 = Person.objects.create(name="Jane", favorite_restaurant=r2)
+
+        self.assertQuerysetEqual(
+            Person.objects.order_by("name").select_related(), [
+                "Jane",
+                "John",
+            ],
+            attrgetter("name")
+        )
+
+        jane = Person.objects.order_by("name").select_related("favorite_restaurant")[0]
+        self.assertEqual(jane.favorite_restaurant.name, "Craft")