Commit 225c413b authored by Joseph Kocherhans's avatar Joseph Kocherhans
Browse files

Fixed #12647. Allow unique_together checks be specified as lists as well as... 

Fixed #12647. Allow unique_together checks be specified as lists as well as tuples. Thanks, Honza Král.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12403 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 8f4540b2

django/db/models/base.py

+1 −1
Original line number Diff line number Diff line
@@ -683,7 +683,7 @@ class Model(object): 
                if name in exclude:

                    break

            else:

                unique_checks.append(check)

                unique_checks.append(tuple(check))



        # These are checks for the unique_for_<date/year/month>.

        date_checks = []

tests/modeltests/validation/models.py

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ class UniqueTogetherModel(models.Model): 
    efield = models.EmailField()



    class Meta:

        unique_together = (('ifield', 'cfield',), ('ifield', 'efield'))

        unique_together = (('ifield', 'cfield',), ['ifield', 'efield'])



class UniqueForDateModel(models.Model):

    start_date = models.DateField()

tests/modeltests/validation/test_unique.py

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ class GetUniqueCheckTests(unittest.TestCase): 
            m._get_unique_checks()

        )



    def test_unique_together_gets_picked_up(self):

    def test_unique_together_gets_picked_up_and_converted_to_tuple(self):

        m = UniqueTogetherModel()

        self.assertEqual(

            ([('ifield', 'cfield',),('ifield', 'efield'), ('id',), ], []),