[1.11.x] Fixed #28597 -- Fixed crash with the name of a model's autogenerated primary key in an Index's fields.

Backport of fb02ebe889eee292144f9157ed4ddcdcc139eba9 from master

2 files changed, 6 insertions, 2 deletions

diff --git a/tests/model_indexes/models.py b/tests/model_indexes/models.py
index 6d74ad8fa6..0fa998843e 100644
--- a/tests/model_indexes/models.py
+++ b/tests/model_indexes/models.py
@@ -5,9 +5,13 @@ class Book(models.Model):
     title = models.CharField(max_length=50)
     author = models.CharField(max_length=50)
     pages = models.IntegerField(db_column='page_count')
+    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 c0f5a84fdb..74c7cf45f4 100644
--- a/tests/model_indexes/tests.py
+++ b/tests/model_indexes/tests.py
@@ -85,7 +85,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]