Changeset 9208

Timestamp:

10/08/08 05:09:44 (3 months ago)

Author:

mtredinnick

Message:

Fixed #9319 -- Fixed a crash when using the same model field in multiple
unique_together constraints.

Files:

• django/trunk/django/forms/models.py (modified) (5 diffs)
• django/trunk/tests/regressiontests/model_forms_regress (added)
• django/trunk/tests/regressiontests/model_forms_regress/__init__.py (added)
• django/trunk/tests/regressiontests/model_forms_regress/models.py (added)

django/trunk/django/forms/models.py

@@ -15 +15 @@
-from widgets import media_property
-from formsets import BaseFormSet, formset_factory, DELETION_FIELD_NAME
+
+try:
+    set
+except NameError:
+    from sets import Set as set     # Python 2.3 fallback
-
-__all__ = (
@@ -220 +225 @@
-            if len(fields_on_form) == len(check):
-                unique_checks.append(check)
-
+
-        form_errors = []
-
+
-        # Gather a list of checks for fields declared as unique and add them to
-        # the list of checks. Again, skip fields not on the form.
@@ -236 +241 @@
-            if name in self.cleaned_data and f.unique and not is_null_pk:
-                unique_checks.append((name,))
-
+
-        # Don't run unique checks on fields that already have an error.
-        unique_checks = [check for check in unique_checks if not [x in self._errors for x in check if x in self._errors]]
-
+
+
-        for unique_check in unique_checks:
-            # Try to look up an existing object with the same values as this
-            # object's values for all the unique field.
-
+
-            lookup_kwargs = {}
-            for field_name in unique_check:
-                lookup_kwargs[field_name] = self.cleaned_data[field_name]
-
+
-            qs = self.instance.__class__._default_manager.filter(**lookup_kwargs)
-
- 
+
-            # instance (as opposed to creating a new one)
-            if self.instance.pk is not None:
-                qs = qs.exclude(pk=self.instance.pk)
-
+
-            # This cute trick with extra/values is the most efficient way to
-            # tell if a particular query returns any results.
-            if qs.extra(select={'a': 1}).values('a').order_by():
-                model_name = capfirst(self.instance._meta.verbose_name)
-
+
-                # A unique field
-                if len(unique_check) == 1:
@@ -279 +285 @@
-                         'field_label': unicode(field_labels)}
-                    )
-
-
+
+
+
-                for field_name in unique_check:
-
-
+
+
+
+
-        if form_errors:
-
+
+
-            raise ValidationError(form_errors)
-
@@ -472 +482 @@
-        new_obj = self.model(**kwargs)
-        return save_instance(form, new_obj, exclude=[self._pk_field.name], commit=commit)
-
+
-    def add_fields(self, form, index):
-        super(BaseInlineFormSet, self).add_fields(form, index)