Fixed #30397 -- Added app_label/class interpolation for names of indexes and constraints.

2 files changed, 23 insertions, 4 deletions

diff --git a/tests/model_indexes/models.py b/tests/model_indexes/models.py
index 6f7548261f..42651cd868 100644
--- a/tests/model_indexes/models.py
+++ b/tests/model_indexes/models.py
@@ -7,20 +7,26 @@ class Book(models.Model):
     pages = models.IntegerField(db_column='page_count')
     shortcut = models.CharField(max_length=50, db_tablespace='idx_tbls')
     isbn = models.CharField(max_length=50, db_tablespace='idx_tbls')
+    barcode = models.CharField(max_length=31)
 
     class Meta:
         indexes = [
             models.Index(fields=['title']),
             models.Index(fields=['isbn', 'id']),
+            models.Index(fields=['barcode'], name='%(app_label)s_%(class)s_barcode_idx'),
         ]
 
 
 class AbstractModel(models.Model):
     name = models.CharField(max_length=50)
+    shortcut = models.CharField(max_length=3)
 
     class Meta:
         abstract = True
-        indexes = [models.Index(fields=['name'])]
+        indexes = [
+            models.Index(fields=['name']),
+            models.Index(fields=['shortcut'], name='%(app_label)s_%(class)s_idx'),
+        ]
 
 
 class ChildModel1(AbstractModel):
diff --git a/tests/model_indexes/tests.py b/tests/model_indexes/tests.py
index 5180d8cee9..ade27e1a4b 100644
--- a/tests/model_indexes/tests.py
+++ b/tests/model_indexes/tests.py
@@ -134,13 +134,26 @@ class SimpleIndexesTests(SimpleTestCase):
 
     def test_name_set(self):
         index_names = [index.name for index in Book._meta.indexes]
-        self.assertCountEqual(index_names, ['model_index_title_196f42_idx', 'model_index_isbn_34f975_idx'])
+        self.assertCountEqual(
+            index_names,
+            [
+                'model_index_title_196f42_idx',
+                'model_index_isbn_34f975_idx',
+                'model_indexes_book_barcode_idx',
+            ],
+        )
 
     def test_abstract_children(self):
         index_names = [index.name for index in ChildModel1._meta.indexes]
-        self.assertEqual(index_names, ['model_index_name_440998_idx'])
+        self.assertEqual(
+            index_names,
+            ['model_index_name_440998_idx', 'model_indexes_childmodel1_idx'],
+        )
         index_names = [index.name for index in ChildModel2._meta.indexes]
-        self.assertEqual(index_names, ['model_index_name_b6c374_idx'])
+        self.assertEqual(
+            index_names,
+            ['model_index_name_b6c374_idx', 'model_indexes_childmodel2_idx'],
+        )
 
 
 class IndexesTests(TestCase):