Ticket #13677: 13677.diff

django/forms/models.py

@@ -236 +236 @@
 class BaseModelForm(BaseForm):
     def __init__(self, data=None, files=None, auto_id='id_%s', prefix=None,
                  initial=None, error_class=ErrorList, label_suffix=':',
-                 empty_permitted=False, instance=None):
+                 empty_permitted=False, instance=None, using=None):
         opts = self._meta
         if instance is None:
             if opts.model is None:
@@ -259 +259 @@
         super(BaseModelForm, self).__init__(data, files, auto_id, prefix, object_data,
                                             error_class, label_suffix, empty_permitted)
 
+        # correct the choices queryset.using for choice fields
+        if using is None and instance is not None:
+            using = instance._state.db
+        if using is not None:
+            model_choice_fields = filter(lambda f: isinstance(f, ModelChoiceField), self.fields.values())
+            for field in model_choice_fields:
+                field.queryset = field.queryset.using(using)
+
     def _update_errors(self, message_dict):
         for k, v in message_dict.items():
             if k != NON_FIELD_ERRORS:
@@ -451 +459 @@
             kwargs['instance'] = self._existing_object(pk)
         if i < self.initial_form_count() and not kwargs.get('instance'):
             kwargs['instance'] = self.get_queryset()[i]
+        kwargs['using'] = self.get_queryset()._db
         return super(BaseModelFormSet, self)._construct_form(i, **kwargs)
 
     def get_queryset(self):

tests/regressiontests/multiple_database/tests.py

@@ -1759 +1759 @@
         b.authors.clear()
         self._write_to_default()
         self.assertEqual(receiver._database, "other")
+
+class ModelFormsetUsingTestCase(TestCase):
+    multi_db = True
+
+    def test_formset_using(self):
+        author = Person.objects.using('other').create(name="Marty Alchin")
+        editor = Person.objects.using('other').create(name="George Vilches")
+        b = Book.objects.using('other').create(title="Pro Django",
+                                published=datetime.date(2008, 12, 16),
+                                editor=editor)
+        b.authors.add(author)
+
+        from django import forms
+        from django.forms.models import modelformset_factory
+        class BookForm(forms.ModelForm):
+            class Meta:
+                model = Book
+        formset_class = modelformset_factory(Book, BookForm)
+        formset = formset_class(queryset=Book.objects.using('other').all())
+        for form in formset.forms:
+            databases = [i._state.db for i in form.fields['editor'].queryset]
+            databases.extend([i._state.db for i in form.fields['authors'].queryset])
+            self.assertEqual(set(databases), set(['other']))
+ No newline at end of file