summaryrefslogtreecommitdiff
path: root/tests/model_indexes
diff options
context:
space:
mode:
authorMariusz Felisiak <felisiak.mariusz@gmail.com>2017-09-17 08:26:18 +0200
committerTim Graham <timograham@gmail.com>2017-09-18 14:06:00 -0400
commitfb02ebe889eee292144f9157ed4ddcdcc139eba9 (patch)
treea4fda2469ea51439add018a530eeab0a1611e0b9 /tests/model_indexes
parent94cd8efc50c717cd00244f4b2233f971a53b205e (diff)
downloaddjango-fb02ebe889eee292144f9157ed4ddcdcc139eba9.tar.gz
Fixed #28597 -- Fixed crash with the name of a model's autogenerated primary key in an Index's fields.
Diffstat (limited to 'tests/model_indexes')
-rw-r--r--tests/model_indexes/models.py5
-rw-r--r--tests/model_indexes/tests.py2
2 files changed, 5 insertions, 2 deletions
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]