Changeset 6213

Timestamp:

09/14/07 15:36:53 (1 year ago)

Author:

adrian

Message:

Fixed #5460 -- unique_together now accepts a single tuple for convenience. Thanks, Deryck Hodge

Files:

• django/trunk/django/db/models/options.py (modified) (1 diff)
• django/trunk/docs/model-api.txt (modified) (1 diff)

django/trunk/django/db/models/options.py

@@ -53 +53 @@
-            for attr_name in DEFAULT_NAMES:
-                setattr(self, attr_name, meta_attrs.pop(attr_name, getattr(self, attr_name)))
+
+            # unique_together can be either a tuple of tuples, or a single
+            # tuple of two strings. Normalize it to a tuple of tuples, so that
+            # calling code can uniformly expect that.
+            ut = meta_attrs.pop('unique_together', getattr(self, 'unique_together'))
+            if ut and not isinstance(ut[0], (tuple, list)):
+                ut = (ut,)
+            setattr(self, 'unique_together', ut)
+
-            # verbose_name_plural is a special case because it uses a 's'
-            # by default.
-            setattr(self, 'verbose_name_plural', meta_attrs.pop('verbose_name_plural', string_concat(self.verbose_name, 's')))
+
-            # Any leftover attributes must be invalid.
-            if meta_attrs != {}:

django/trunk/docs/model-api.txt

@@ -1226 +1226 @@
-level (i.e., the appropriate ``UNIQUE`` statements are included in the
-``CREATE TABLE`` statement).
+
+**New in Django development version**
+
+For convenience, unique_together can be a single list when dealing
+with a single set of fields::
+
+        unique_together = ("driver", "restaurant")
-
-``verbose_name``