Create indexes defined in Meta.indexes for materialized views

Author: mikicz

django_pgviews/models.py

@@ -68,12 +68,7 @@ def run_backlog(self, backlog, *, force, update, materialized_views_check_sql_ch
             try:
                 if isinstance(view_cls(), MaterializedView):
                     status = create_materialized_view(
-                        connection,
-                        view_cls._meta.db_table,
-                        view_cls.get_sql(),
-                        concurrent_index=view_cls._concurrent_index,
-                        with_data=view_cls.with_data,
-                        check_sql_changed=materialized_views_check_sql_changed,
+                        connection, view_cls, check_sql_changed=materialized_views_check_sql_changed
                     )
                 else:
                     status = create_view(
@@ -106,7 +101,7 @@ def run_backlog(self, backlog, *, force, update, materialized_views_check_sql_ch
                 elif status == "FORCED":
                     msg = "forced overwrite of existing schema"
                 elif status == "FORCE_REQUIRED":
-                    msg = "exists with incompatible schema, " "--force required to update"
+                    msg = "exists with incompatible schema, --force required to update"
                 else:
                     msg = status
 

django_pgviews/view.py

@@ -96,9 +96,7 @@ def _drop_mat_view(cursor, view_name):
 
 
 @transaction.atomic()
-def create_materialized_view(
-    connection, view_name, view_query: ViewSQL, concurrent_index=None, with_data=True, check_sql_changed=False
-):
+def create_materialized_view(connection, view_cls, check_sql_changed=False):
     """
     Create a materialized view on a connection.
 
@@ -110,6 +108,16 @@ def create_materialized_view(
     already with the same SQL, if there is, it will not do anything. Otherwise the materialized view gets dropped
     and recreated.
     """
+    view_name = view_cls._meta.db_table
+    view_query = view_cls.get_sql()
+    concurrent_index = view_cls._concurrent_index
+
+    try:
+        schema_name = connection.schema_name
+        schema_name_log = f"schema {schema_name}"
+    except AttributeError:
+        schema_name_log = "default schema"
+
     vschema, vname = _schema_and_name(connection, view_name)
 
     cursor_wrapper = connection.cursor()
@@ -146,13 +154,24 @@ def create_materialized_view(
 
         if view_exists:
             _drop_mat_view(cursor, view_name)
+            log.info("pgview dropped materialized view %s (%s)", view_name, schema_name_log)
+
+        _create_mat_view(cursor, view_name, query, view_query.params, with_data=view_cls.with_data)
+        log.info("pgview created materialized view %s (%s)", view_name, schema_name_log)
 
-        _create_mat_view(cursor, view_name, query, view_query.params, with_data=with_data)
         if concurrent_index is not None:
             index_sub_name = "_".join([s.strip() for s in concurrent_index.split(",")])
             cursor.execute(
                 "CREATE UNIQUE INDEX {0}_{1}_index ON {0} ({2})".format(view_name, index_sub_name, concurrent_index)
             )
+            log.info("pgview created concurrent index on view %s (%s)", view_name, schema_name_log)
+
+        if view_cls._meta.indexes:
+            schema_editor = connection.schema_editor()
+
+            for index in view_cls._meta.indexes:
+                schema_editor.add_index(view_cls, index)
+                log.info("pgview created index %s on view %s (%s)", index.name, view_name, schema_name_log)
 
         if view_exists:
             return "UPDATED"

tests/test_project/test_project/viewtest/models.py

@@ -63,6 +63,10 @@ class MaterializedRelatedViewWithIndex(view.ReadOnlyMaterializedView):
     sql = """SELECT id AS model_id, id FROM viewtest_testmodel"""
     model = models.ForeignKey(TestModel, on_delete=models.DO_NOTHING)
 
+    class Meta:
+        managed = False
+        indexes = [models.Index(fields=["model"])]
+
 
 class CustomSchemaView(view.ReadOnlyView):
     sql = """SELECT id AS model_id, id FROM viewtest_testmodel"""

tests/test_project/test_project/viewtest/tests.py

@@ -132,6 +132,28 @@ def test_materialized_view(self):
             "Materialized view should have updated concurrently",
         )
 
+    def test_materialized_view_indexes(self):
+        args = [
+            models.MaterializedRelatedViewWithIndex._meta.db_table,
+            "viewtest_materializedrelatedviewwithindex_id_index",
+        ]
+
+        with connection.cursor() as cursor:
+            cursor.execute(
+                "SELECT COUNT(*) FROM pg_indexes WHERE tablename = %s AND indexname = %s",
+                args,
+            )
+            id_index_count = cursor.fetchone()[0]
+
+            cursor.execute(
+                "SELECT COUNT(*) FROM pg_indexes WHERE tablename = %s AND indexname != %s",
+                args,
+            )
+            other_index_count = cursor.fetchone()[0]
+
+        self.assertEqual(id_index_count, 1)
+        self.assertEqual(other_index_count, 1)
+
     def test_materialized_view_with_no_data(self):
         """
         Test a materialized view with no data works correctly