Fixed #27097 -- Added index type introspection to built-in db backends.

2 files changed, 9 insertions, 7 deletions

diff --git a/tests/introspection/tests.py b/tests/introspection/tests.py
index 766e51dea7..68d621d762 100644
--- a/tests/introspection/tests.py
+++ b/tests/introspection/tests.py
@@ -184,13 +184,14 @@ class IntrospectionTests(TransactionTestCase):
         self.assertNotIn('first_name', indexes)
         self.assertIn('id', indexes)
 
-    @skipUnlessDBFeature('can_introspect_index_type')
     def test_get_constraints_index_types(self):
         with connection.cursor() as cursor:
             constraints = connection.introspection.get_constraints(cursor, Article._meta.db_table)
+        index = {}
         for key, val in constraints.items():
-            if val['index'] and not (val['primary_key'] or val['unique']):
-                self.assertEqual(val['type'], 'btree')
+            if val['columns'] == ['headline', 'pub_date']:
+                index = val
+        self.assertEqual(index['type'], 'btree')
 
     @skipUnlessDBFeature('supports_index_column_ordering')
     def test_get_constraints_indexes_orders(self):
diff --git a/tests/postgres_tests/test_indexes.py b/tests/postgres_tests/test_indexes.py
index 8c15f01d47..235d72c532 100644
--- a/tests/postgres_tests/test_indexes.py
+++ b/tests/postgres_tests/test_indexes.py
@@ -44,13 +44,14 @@ class SchemaTests(PostgreSQLTestCase):
         # Ensure the table is there and doesn't have an index.
         self.assertNotIn('field', self.get_constraints(IntegerArrayModel._meta.db_table))
         # Add the index
-        index = GinIndex(fields=['field'], name='integer_array_model_field_gin')
+        index_name = 'integer_array_model_field_gin'
+        index = GinIndex(fields=['field'], name=index_name)
         with connection.schema_editor() as editor:
             editor.add_index(IntegerArrayModel, index)
-        self.assertIn('integer_array_model_field_gin', self.get_constraints(IntegerArrayModel._meta.db_table))
         constraints = self.get_constraints(IntegerArrayModel._meta.db_table)
-        self.assertEqual(constraints['integer_array_model_field_gin']['type'], 'gin')
+        # Check gin index was added
+        self.assertEqual(constraints[index_name]['type'], 'gin')
         # Drop the index
         with connection.schema_editor() as editor:
             editor.remove_index(IntegerArrayModel, index)
-        self.assertNotIn('integer_array_model_field_gin', self.get_constraints(IntegerArrayModel._meta.db_table))
+        self.assertNotIn(index_name, self.get_constraints(IntegerArrayModel._meta.db_table))