Add function to rebuild topology relations

Author: davenquinn

mapboard/topology_manager/commands/rebuild_layer_constraints.py

@@ -0,0 +1,64 @@
+"""
+Rebuild check constraints for all layers in the topology. Sometimes, dumps and
+restores can invalidate constraints, requiring topogeometries to be rebuilt.
+"""
+from ..config import TopologyContext
+from psycopg.sql import Identifier, Literal
+from rich import print
+
+def rebuild_layer_constraints(ctx: TopologyContext):
+    layers = ctx.database.run_query(
+        """
+        SELECT l.*
+        FROM topology.layer l
+        JOIN topology.topology t
+          ON l.topology_id = t.id
+        WHERE t.name = :topo_name
+        """
+    ).all()
+
+    for l in layers:
+        # If the constraint exists and is validated, we skip it
+        table = Identifier(l.schema_name, l.table_name)
+        table_name = f"{l.schema_name}.{l.table_name}"
+        res = ctx.database.run_query(
+            """
+            SELECT conname, convalidated
+            FROM pg_constraint
+            WHERE conname = 'check_topogeom_topo'
+              AND conrelid = :table::regclass
+            """,
+            dict(table=table_name),
+        ).one_or_none()
+        _exists = res is not None
+        _valid = _exists and res.convalidated
+        print(f"[bold cyan]{table_name}[/bold cyan]:")
+        if _exists and _valid:
+            print(f"  valid, skipping")
+            continue
+        if _exists and not _valid:
+            print(f"  invalid")
+            ctx.database.run_sql("ALTER TABLE {table} DROP CONSTRAINT check_topogeom_topo", dict(table=table))
+
+        print(f"  rebuilding")
+
+        ctx.database.run_sql(
+            """
+            ALTER TABLE {table} ADD CONSTRAINT check_topogeom_topo
+                CHECK (
+                    (
+                        (({feature_column}).topology_id = {topology_id})
+                    AND (({feature_column}).layer_id = {layer_id})
+                    AND (({feature_column}).type = {feature_type})
+                    )
+                ) NOT VALID;
+            ALTER TABLE {table} VALIDATE CONSTRAINT check_topogeom_topo;
+            """,
+            dict(
+                feature_column=Identifier(l.feature_column),
+                table=table,
+                topology_id = Literal(l.topology_id),
+                layer_id = Literal(l.layer_id),
+                feature_type = Literal(l.feature_type)
+            )
+        )

mapboard/topology_manager/manager.py

@@ -9,6 +9,7 @@
 from .commands.create_tables import create_tables
 from .commands.check_setup import check_topology_setup
 from .commands.edge_relations import rebuild_edge_relations, validate_edge_relations
+from .commands.rebuild_layer_constraints import rebuild_layer_constraints
 
 
 class TopologyManager:
@@ -81,3 +82,7 @@ def validate_edge_relations(self):
     def rebuild_edge_relations(self):
         """Rebuild the cached __edge_relation table (repair out-of-sync triggers)."""
         return rebuild_edge_relations(self._ctx)
+
+    def rebuild_layer_constraints(self):
+        """Rebuild constraints on topology layers"""
+        return rebuild_layer_constraints(self._ctx)

tests/core/test_05_map_faces.py

@@ -128,6 +128,20 @@ def test_erase_and_consolidate_faces(self, mgr, db):
         assert n_faces(db) == 99
         assert n_face_primitives(db) == 98
 
+    def test_rebuild_relations(self, mgr, db):
+        """Test rebuilding the relations of a topolgy.
+
+        Note, this is somewhat arbitrary in terms of where in the test suite we run it,
+        but the point is to just ensure these functions work properly.
+        """
+        # Rebuild the relations
+        mgr.rebuild_edge_relations()
+        mgr.rebuild_layer_constraints()
+
+        # Check that we have the same number of faces and primitives
+        assert n_faces(db) == 99
+        assert n_face_primitives(db) == 98
+
 
 def test_change_map_face_type(mgr, db):
     """Test changing the type of a map face."""