From b9b9ca334e335a2678f0ae560a9182ca5ed1bfcf Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Tue, 19 May 2009 12:44:17 +0000 Subject: Fixed #9308 -- Corrected the updated of nullable foreign key fields when deleting objects. Thanks to Bob Thomas for the fix, and markshep for the improvements on the test case. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10822 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/modeltests/delete/models.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/modeltests/delete/models.py b/tests/modeltests/delete/models.py index 49aab1fb1b..58b296d8d2 100644 --- a/tests/modeltests/delete/models.py +++ b/tests/modeltests/delete/models.py @@ -30,7 +30,7 @@ class D(DefaultRepr, models.Model): # D -> A # So, we must delete Ds first of all, then Cs then Bs then As. -# However, if we start at As, we might find Bs first (in which +# However, if we start at As, we might find Bs first (in which # case things will be nice), or find Ds first. # Some mutually dependent models, but nullable @@ -96,7 +96,7 @@ CyclicDependency: There is a cyclic dependency of items to be processed. >>> def clear_rel_obj_caches(models): ... for m in models: -... if hasattr(m._meta, '_related_objects_cache'): +... if hasattr(m._meta, '_related_objects_cache'): ... del m._meta._related_objects_cache # Nice order @@ -168,7 +168,16 @@ True >>> o.keys() [, ] +# temporarily replace the UpdateQuery class to verify that E.f is actually nulled out first +>>> import django.db.models.sql +>>> class LoggingUpdateQuery(django.db.models.sql.UpdateQuery): +... def clear_related(self, related_field, pk_list): +... print "CLEARING FIELD",related_field.name +... return super(LoggingUpdateQuery, self).clear_related(related_field, pk_list) +>>> original_class = django.db.models.sql.UpdateQuery +>>> django.db.models.sql.UpdateQuery = LoggingUpdateQuery >>> e1.delete() +CLEARING FIELD f >>> e2 = E() >>> e2.save() @@ -185,6 +194,9 @@ True [, ] >>> f2.delete() +CLEARING FIELD f +# Put this back to normal +>>> django.db.models.sql.UpdateQuery = original_class """ } -- cgit v1.3