Ticket #18320: django-ticket18320.2.diff

django/db/backends/__init__.py

@@ -328 +328 @@
 
     can_use_chunked_reads = True
     can_return_id_from_insert = False
+    query_needed_to_fetch_return_id = False
+    
     has_bulk_insert = False
     uses_autocommit = False
     uses_savepoints = False

tests/regressiontests/model_formsets_regress/tests.py

@@ -1 +1 @@
 from __future__ import absolute_import
 
 from django import forms
+from django.db import connection
 from django.forms.formsets import BaseFormSet, DELETION_FIELD_NAME
 from django.forms.util import ErrorDict, ErrorList
 from django.forms.models import modelform_factory, inlineformset_factory, modelformset_factory, BaseModelFormSet
@@ -255 +256 @@
                 u'test-INITIAL_FORMS': u'0',
                 u'test-MAX_NUM_FORMS': u'',
                 u'test-0-name': u'Random Place', }
-        with self.assertNumQueries(1):
+        expected_num_queries = 1
+        if connection.features.query_needed_to_fetch_return_id:
+            expected_num_queries = 2
+        with self.assertNumQueries(expected_num_queries):
             formset = Formset(data, prefix="test")
             formset.save()