From 63ba472cc4a0ce34d28af74d11e8037a1b3d0f96 Mon Sep 17 00:00:00 2001 From: Karen Tracey Date: Sat, 12 Nov 2011 19:06:39 +0000 Subject: [PATCH] Fix #13864: Removed database error raised when force_update is requsted on save of an inherited model with no fields of its own. Thanks fva, gregmuellegger, and markb1. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17088 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- AUTHORS | 1 + django/db/models/base.py | 7 ++--- .../modeltests/force_insert_update/models.py | 10 +++++++ tests/modeltests/force_insert_update/tests.py | 27 +++++++++++++++++-- 4 files changed, 40 insertions(+), 5 deletions(-) diff --git a/AUTHORS b/AUTHORS index 0a48176631..8224cda639 100644 --- a/AUTHORS +++ b/AUTHORS @@ -87,6 +87,7 @@ answer newbie questions, and generally made Django that much better: Julian Bez Arvis Bickovskis Natalia Bidart + Mark Biggers Paul Bissex Simon Blanchard David Blewett diff --git a/django/db/models/base.py b/django/db/models/base.py index b5ce39e3d5..ebd67bef05 100644 --- a/django/db/models/base.py +++ b/django/db/models/base.py @@ -526,9 +526,10 @@ class Model(object): # It does already exist, so do an UPDATE. if force_update or non_pks: values = [(f, None, (raw and getattr(self, f.attname) or f.pre_save(self, False))) for f in non_pks] - rows = manager.using(using).filter(pk=pk_val)._update(values) - if force_update and not rows: - raise DatabaseError("Forced update did not affect any rows.") + if values: + rows = manager.using(using).filter(pk=pk_val)._update(values) + if force_update and not rows: + raise DatabaseError("Forced update did not affect any rows.") else: record_exists = False if not pk_set or not record_exists: diff --git a/tests/modeltests/force_insert_update/models.py b/tests/modeltests/force_insert_update/models.py index db4c5d29f3..c356312606 100644 --- a/tests/modeltests/force_insert_update/models.py +++ b/tests/modeltests/force_insert_update/models.py @@ -9,6 +9,16 @@ class Counter(models.Model): name = models.CharField(max_length = 10) value = models.IntegerField() +class InheritedCounter(Counter): + tag = models.CharField(max_length=10) + +class ProxyCounter(Counter): + class Meta: + proxy = True + +class SubCounter(Counter): + pass + class WithCustomPK(models.Model): name = models.IntegerField(primary_key=True) value = models.IntegerField() diff --git a/tests/modeltests/force_insert_update/tests.py b/tests/modeltests/force_insert_update/tests.py index ea0e55f4c2..a5b2dcebb5 100644 --- a/tests/modeltests/force_insert_update/tests.py +++ b/tests/modeltests/force_insert_update/tests.py @@ -3,14 +3,15 @@ from __future__ import absolute_import from django.db import transaction, IntegrityError, DatabaseError from django.test import TestCase -from .models import Counter, WithCustomPK +from .models import (Counter, WithCustomPK, InheritedCounter, ProxyCounter, + SubCounter) class ForceTests(TestCase): def test_force_update(self): c = Counter.objects.create(name="one", value=1) - # The normal case + # The normal case c.value = 2 c.save() # Same thing, via an update @@ -38,3 +39,25 @@ class ForceTests(TestCase): # the data isn't in the database already. obj = WithCustomPK(name=1, value=1) self.assertRaises(DatabaseError, obj.save, force_update=True) + + +class InheritanceTests(TestCase): + def test_force_update_on_inherited_model(self): + a = InheritedCounter(name="count", value=1, tag="spam") + a.save() + a.save(force_update=True) + + def test_force_update_on_proxy_model(self): + a = ProxyCounter(name="count", value=1) + a.save() + a.save(force_update=True) + + def test_force_update_on_inherited_model_without_fields(self): + ''' + Issue 13864: force_update fails on subclassed models, if they don't + specify custom fields. + ''' + a = SubCounter(name="count", value=1) + a.save() + a.value = 2 + a.save(force_update=True)