Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.1.X] Fixed #12247 -- Corrected the way update queries are processe…

…d when the update only refers to attributes on a base class. Thanks to jsmullyan for the report, and matiasb for the fix.

Backport of r12910 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12911 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 17636ef9991f7b051b8c8032f75b62c5ab073c7c 1 parent ac0aea8
@freakboy3742 freakboy3742 authored
View
2  django/db/models/sql/subqueries.py
@@ -284,7 +284,7 @@ def get_related_updates(self):
for model, values in self.related_updates.iteritems():
query = UpdateQuery(model, self.connection)
query.values = values
- if self.related_ids:
+ if self.related_ids is not None:
query.add_filter(('pk__in', self.related_ids))
result.append(query)
return result
View
13 tests/modeltests/update/models.py
@@ -21,6 +21,19 @@ def __unicode__(self):
return unicode(self.name)
+class A(models.Model):
+ x = models.IntegerField(default=10)
+
+class B(models.Model):
+ a = models.ForeignKey(A)
+ y = models.IntegerField(default=10)
+
+class C(models.Model):
+ y = models.IntegerField(default=10)
+
+class D(C):
+ a = models.ForeignKey(A)
+
__test__ = {'API_TESTS': """
>>> DataPoint(name="d0", value="apple").save()
>>> DataPoint(name="d2", value="banana").save()
View
49 tests/modeltests/update/tests.py
@@ -0,0 +1,49 @@
+from django.test import TestCase
+
+from models import A, B, D
+
+class SimpleTest(TestCase):
+ def setUp(self):
+ self.a1 = A.objects.create()
+ self.a2 = A.objects.create()
+ for x in range(20):
+ B.objects.create(a=self.a1)
+ D.objects.create(a=self.a1)
+
+ def test_nonempty_update(self):
+ """
+ Test that update changes the right number of rows for a nonempty queryset
+ """
+ num_updated = self.a1.b_set.update(y=100)
+ self.failUnlessEqual(num_updated, 20)
+ cnt = B.objects.filter(y=100).count()
+ self.failUnlessEqual(cnt, 20)
+
+ def test_empty_update(self):
+ """
+ Test that update changes the right number of rows for an empty queryset
+ """
+ num_updated = self.a2.b_set.update(y=100)
+ self.failUnlessEqual(num_updated, 0)
+ cnt = B.objects.filter(y=100).count()
+ self.failUnlessEqual(cnt, 0)
+
+ def test_nonempty_update_with_inheritance(self):
+ """
+ Test that update changes the right number of rows for an empty queryset
+ when the update affects only a base table
+ """
+ num_updated = self.a1.d_set.update(y=100)
+ self.failUnlessEqual(num_updated, 20)
+ cnt = D.objects.filter(y=100).count()
+ self.failUnlessEqual(cnt, 20)
+
+ def test_empty_update_with_inheritance(self):
+ """
+ Test that update changes the right number of rows for an empty queryset
+ when the update affects only a base table
+ """
+ num_updated = self.a2.d_set.update(y=100)
+ self.failUnlessEqual(num_updated, 0)
+ cnt = D.objects.filter(y=100).count()
+ self.failUnlessEqual(cnt, 0)
Please sign in to comment.
Something went wrong with that request. Please try again.