diff -r 5ff1fc726848 -r c6bca38c1cbf parts/django/tests/regressiontests/many_to_one_regress/tests.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/parts/django/tests/regressiontests/many_to_one_regress/tests.py	Sat Jan 08 11:20:57 2011 +0530
@@ -0,0 +1,105 @@
+from django.db import models
+from django.test import TestCase
+
+from models import First, Second, Third, Parent, Child, Category, Record, Relation
+
+class ManyToOneRegressionTests(TestCase):
+    def test_object_creation(self):
+        Third.objects.create(id='3', name='An example')
+        parent = Parent(name='fred')
+        parent.save()
+        Child.objects.create(name='bam-bam', parent=parent)
+
+    def test_fk_assignment_and_related_object_cache(self):
+        # Tests of ForeignKey assignment and the related-object cache (see #6886).
+
+        p = Parent.objects.create(name="Parent")
+        c = Child.objects.create(name="Child", parent=p)
+
+        # Look up the object again so that we get a "fresh" object.
+        c = Child.objects.get(name="Child")
+        p = c.parent
+
+        # Accessing the related object again returns the exactly same object.
+        self.assertTrue(c.parent is p)
+
+        # But if we kill the cache, we get a new object.
+        del c._parent_cache
+        self.assertFalse(c.parent is p)
+
+        # Assigning a new object results in that object getting cached immediately.
+        p2 = Parent.objects.create(name="Parent 2")
+        c.parent = p2
+        self.assertTrue(c.parent is p2)
+
+        # Assigning None succeeds if field is null=True.
+        p.bestchild = None
+        self.assertTrue(p.bestchild is None)
+
+        # bestchild should still be None after saving.
+        p.save()
+        self.assertTrue(p.bestchild is None)
+
+        # bestchild should still be None after fetching the object again.
+        p = Parent.objects.get(name="Parent")
+        self.assertTrue(p.bestchild is None)
+
+        # Assigning None fails: Child.parent is null=False.
+        self.assertRaises(ValueError, setattr, c, "parent", None)
+
+        # You also can't assign an object of the wrong type here
+        self.assertRaises(ValueError, setattr, c, "parent", First(id=1, second=1))
+
+        # Nor can you explicitly assign None to Child.parent during object
+        # creation (regression for #9649).
+        self.assertRaises(ValueError, Child, name='xyzzy', parent=None)
+        self.assertRaises(ValueError, Child.objects.create, name='xyzzy', parent=None)
+
+        # Creation using keyword argument should cache the related object.
+        p = Parent.objects.get(name="Parent")
+        c = Child(parent=p)
+        self.assertTrue(c.parent is p)
+
+        # Creation using keyword argument and unsaved related instance (#8070).
+        p = Parent()
+        c = Child(parent=p)
+        self.assertTrue(c.parent is p)
+
+        # Creation using attname keyword argument and an id will cause the
+        # related object to be fetched.
+        p = Parent.objects.get(name="Parent")
+        c = Child(parent_id=p.id)
+        self.assertFalse(c.parent is p)
+        self.assertEqual(c.parent, p)
+
+    def test_multiple_foreignkeys(self):
+        # Test of multiple ForeignKeys to the same model (bug #7125).
+        c1 = Category.objects.create(name='First')
+        c2 = Category.objects.create(name='Second')
+        c3 = Category.objects.create(name='Third')
+        r1 = Record.objects.create(category=c1)
+        r2 = Record.objects.create(category=c1)
+        r3 = Record.objects.create(category=c2)
+        r4 = Record.objects.create(category=c2)
+        r5 = Record.objects.create(category=c3)
+        r = Relation.objects.create(left=r1, right=r2)
+        r = Relation.objects.create(left=r3, right=r4)
+        r = Relation.objects.create(left=r1, right=r3)
+        r = Relation.objects.create(left=r5, right=r2)
+        r = Relation.objects.create(left=r3, right=r2)
+
+        q1 = Relation.objects.filter(left__category__name__in=['First'], right__category__name__in=['Second'])
+        self.assertQuerysetEqual(q1, ["<Relation: First - Second>"])
+
+        q2 = Category.objects.filter(record__left_set__right__category__name='Second').order_by('name')
+        self.assertQuerysetEqual(q2, ["<Category: First>", "<Category: Second>"])
+
+        p = Parent.objects.create(name="Parent")
+        c = Child.objects.create(name="Child", parent=p)
+        self.assertRaises(ValueError, Child.objects.create, name="Grandchild", parent=c)
+
+    def test_fk_instantiation_outside_model(self):
+        # Regression for #12190 -- Should be able to instantiate a FK outside
+        # of a model, and interrogate its related field.
+        cat = models.ForeignKey(Category)
+        self.assertEqual('id', cat.rel.get_related_field().name)