Ticket #5460: unique_together_single_tuple.diff

django/db/models/options.py

@@ -52 +52 @@
             del meta_attrs['__doc__']
             for attr_name in DEFAULT_NAMES:
                 setattr(self, attr_name, meta_attrs.pop(attr_name, getattr(self, attr_name)))
+            # Normalize unique_together to a tuple of tuples
+            ut = meta_attrs.pop('unique_together', getattr(self, 'unique_together'))
+            if ut and not isinstance(ut[0], tuple):
+                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')))

docs/model-api.txt

@@ -1224 +1224 @@
 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``
 ----------------