Ticket #17594: formset-tweak-109-v1.patch

django/forms/models.py

@@ -591 +591 @@
     def save_existing_objects(self, commit=True):
         self.changed_objects = []
         self.deleted_objects = []
-        if not self.get_queryset():
+        if not self.initial_forms:
             return []
 
         saved_instances = []

tests/regressiontests/forms/tests/__init__.py

@@ -13 +13 @@
     CustomDateTimeInputFormatsTests, SimpleDateTimeFormatTests)
 from .media import FormsMediaTestCase, StaticFormsMediaTestCase
 from .models import (TestTicket12510, ModelFormCallableModelDefault,
-    FormsModelTestCase, RelatedModelFormTests)
+    FormsModelTestCase, RelatedModelFormTests, ModelFormsetTests)
 from .regressions import FormsRegressionsTestCase
 from .util import FormsUtilTestCase
 from .validators import TestFieldWithValidators

tests/regressiontests/forms/tests/models.py

@@ -6 +6 @@
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.db import models
 from django.forms import Form, ModelForm, FileField, ModelChoiceField
-from django.forms.models import ModelFormMetaclass
+from django.forms.models import ModelFormMetaclass, modelformset_factory
 from django.test import TestCase
 
 from ..models import (ChoiceOptionModel, ChoiceFieldModel, FileModel, Group,
-    BoundaryModel, Defaults)
+    BoundaryModel, Defaults, Cheese)
 
 
 class ChoiceFieldForm(ModelForm):
@@ -196 +196 @@
             model=A
 
         self.assertTrue(issubclass(ModelFormMetaclass('Form', (ModelForm,), {'Meta': Meta}), ModelForm))
+
+
+class ModelFormsetTests(TestCase):
+    def test_extraneous_query_is_not_run(self):
+        CheeseFormset = modelformset_factory(Cheese)
+        data = {u'test-TOTAL_FORMS': u'1',
+                u'test-INITIAL_FORMS': u'0',
+                u'test-MAX_NUM_FORMS': u'',
+                u'test-0-name': u'Say Cheese!', }
+        with self.assertNumQueries(1):
+            formset = CheeseFormset(data, prefix="test")
+            formset.save()