Changeset 7172

Timestamp:

02/28/08 07:31:11 (9 months ago)

Author:

mtredinnick

Message:

queryset-refactor: Head off any attempts to use unique_together across inherited models.

We don't support check constraints and triggers, so trying to do this would be
optimistic at best.

Files:

• django/branches/queryset-refactor/django/core/management/validation.py (modified) (1 diff)
• django/branches/queryset-refactor/docs/model-api.txt (modified) (1 diff)

django/branches/queryset-refactor/django/core/management/validation.py

@@ -233 +233 @@
-                    if isinstance(f.rel, models.ManyToManyRel):
-                        e.add(opts, '"unique_together" refers to %s. ManyToManyFields are not supported in unique_together.' % f.name)
+                    if f not in opts.local_fields:
+                        e.add(opts, '"unique_together" refers to %s. This is not in the same model as the unique_together statement.' % f.name)
-
-    return len(e.errors)

django/branches/queryset-refactor/docs/model-api.txt

@@ -1166 +1166 @@
-level (i.e., the appropriate ``UNIQUE`` statements are included in the
-``CREATE TABLE`` statement).
+
+All the fields specified in ``unique_together`` must be part of the current
+model. If you are using `model inheritance`_, you cannot refer to fields from
+any parent classes in ``unique_together``.
-
-**New in Django development version**