From fb02ebe889eee292144f9157ed4ddcdcc139eba9 Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Sun, 17 Sep 2017 08:26:18 +0200 Subject: Fixed #28597 -- Fixed crash with the name of a model's autogenerated primary key in an Index's fields. --- tests/model_indexes/models.py | 5 ++++- tests/model_indexes/tests.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/model_indexes/models.py b/tests/model_indexes/models.py index 69116b2650..fbee67a152 100644 --- a/tests/model_indexes/models.py +++ b/tests/model_indexes/models.py @@ -9,7 +9,10 @@ class Book(models.Model): isbn = models.CharField(max_length=50, db_tablespace='idx_tbls') class Meta: - indexes = [models.indexes.Index(fields=['title'])] + indexes = [ + models.indexes.Index(fields=['title']), + models.indexes.Index(fields=['isbn', 'id']), + ] class AbstractModel(models.Model): diff --git a/tests/model_indexes/tests.py b/tests/model_indexes/tests.py index 381f4fdcf8..5f1743439c 100644 --- a/tests/model_indexes/tests.py +++ b/tests/model_indexes/tests.py @@ -89,7 +89,7 @@ class IndexesTests(SimpleTestCase): def test_name_set(self): index_names = [index.name for index in Book._meta.indexes] - self.assertEqual(index_names, ['model_index_title_196f42_idx']) + self.assertCountEqual(index_names, ['model_index_title_196f42_idx', 'model_index_isbn_34f975_idx']) def test_abstract_children(self): index_names = [index.name for index in ChildModel1._meta.indexes] -- cgit v1.3