Ticket #11319: t11319-r11007.diff

tests/modeltests/custom_pk/models.py

@@ -133 +133 @@
 ...        print "Fail with %s" % type(e)
 Pass
 
-# Regression for #10785 -- Custom fields can be used for primary keys.
+# Regression for #10785, #11319 -- Custom fields can be used for primary keys.
 >>> new_bar = Bar.objects.create()
 >>> new_foo = Foo.objects.create(bar=new_bar)
 
-# FIXME: This still doesn't work, but will require some changes in
-# get_db_prep_lookup to fix it.
-# >>> f = Foo.objects.get(bar=new_bar.pk)
-# >>> f == new_foo
-# True
-# >>> f.bar == new_bar
-# True
+>>> f = Foo.objects.get(bar=new_bar.pk)
+>>> f == new_foo
+True
+>>> f.bar == new_bar
+True
 
 >>> f = Foo.objects.get(bar=new_bar)
 >>> f == new_foo

tests/regressiontests/queries/models.py

@@ -271 +271 @@
     def __unicode__(self):
         return self.name
 
+# Recursive ForeignKey using "to_field".
+class Node(models.Model):
+    num = models.IntegerField(unique=True)
+    parent = models.ForeignKey("self", to_field="num", null=True)
+
+    def __unicode__(self):
+        return unicode(self.num)
 
 __test__ = {'API_TESTS':"""
 >>> generic = NamedCategory.objects.create(name="Generic")
@@ -1173 +1180 @@
 >>> subq._result_cache is None
 True
 
+Filtering against a related object must use the to_field value, if it exists,
+not the pk (bug #11319).
+>>> a1 = Author.objects.get(name="a1")
+>>> Report.objects.filter(creator=a1)
+[<Report: r1>]
+>>> Author.objects.filter(report=r1)
+[<Author: a1>]
+
+>>> node1 = Node.objects.create(num=42)
+>>> node2 = Node.objects.create(num=1, parent=node1)
+>>> Node.objects.filter(node=node2).query.as_sql()
+>>> Node.objects.filter(node=node2)
+[<Node: 42>]
+>>> Node.objects.filter(parent=node1)
+[<Node: 1>]
+
 """}
 
 # In Python 2.3 and the Python 2.6 beta releases, exceptions raised in __len__
@@ -1241 +1264 @@
 []
 
 """
+