Fixed #14043 -- Made sure nullable o2o delete works as expected
There was an old complaint about nullable one-to-one field cascading even when the o2o field was saved to None value before the deletion. Added an test to verify this doesn't happen. Also some PEP 8 cleanup.
This commit is contained in:
parent
e55ca60903
commit
b53ed351b3
|
@ -25,7 +25,7 @@ class OneToOneRegressionTests(TestCase):
|
||||||
# The bug in #9023: if you access the one-to-one relation *before*
|
# The bug in #9023: if you access the one-to-one relation *before*
|
||||||
# setting to None and deleting, the cascade happens anyway.
|
# setting to None and deleting, the cascade happens anyway.
|
||||||
self.p1.undergroundbar
|
self.p1.undergroundbar
|
||||||
bar.place.name='foo'
|
bar.place.name = 'foo'
|
||||||
bar.place = None
|
bar.place = None
|
||||||
bar.save()
|
bar.save()
|
||||||
self.p1.delete()
|
self.p1.delete()
|
||||||
|
@ -40,7 +40,7 @@ class OneToOneRegressionTests(TestCase):
|
||||||
Check that we create models via the m2m relation if the remote model
|
Check that we create models via the m2m relation if the remote model
|
||||||
has a OneToOneField.
|
has a OneToOneField.
|
||||||
"""
|
"""
|
||||||
f = Favorites(name = 'Fred')
|
f = Favorites(name='Fred')
|
||||||
f.save()
|
f.save()
|
||||||
f.restaurants = [self.r1]
|
f.restaurants = [self.r1]
|
||||||
self.assertQuerysetEqual(
|
self.assertQuerysetEqual(
|
||||||
|
@ -114,7 +114,7 @@ class OneToOneRegressionTests(TestCase):
|
||||||
misbehaving. We test both (primary_key=True & False) cases here to
|
misbehaving. We test both (primary_key=True & False) cases here to
|
||||||
prevent any reappearance of the problem.
|
prevent any reappearance of the problem.
|
||||||
"""
|
"""
|
||||||
t = Target.objects.create()
|
Target.objects.create()
|
||||||
|
|
||||||
self.assertQuerysetEqual(
|
self.assertQuerysetEqual(
|
||||||
Target.objects.filter(pointer=None),
|
Target.objects.filter(pointer=None),
|
||||||
|
@ -235,3 +235,11 @@ class OneToOneRegressionTests(TestCase):
|
||||||
b = UndergroundBar.objects.create()
|
b = UndergroundBar.objects.create()
|
||||||
with self.assertNumQueries(0), self.assertRaises(ValueError):
|
with self.assertNumQueries(0), self.assertRaises(ValueError):
|
||||||
p.undergroundbar = b
|
p.undergroundbar = b
|
||||||
|
|
||||||
|
def test_nullable_o2o_delete(self):
|
||||||
|
u = UndergroundBar.objects.create(place=self.p1)
|
||||||
|
u.place_id = None
|
||||||
|
u.save()
|
||||||
|
self.p1.delete()
|
||||||
|
self.assertTrue(UndergroundBar.objects.filter(pk=u.pk).exists())
|
||||||
|
self.assertIsNone(UndergroundBar.objects.get(pk=u.pk).place)
|
||||||
|
|
Loading…
Reference in New Issue