refactor(db)!: finalize pooled WNDB v2 migration

app/native/wndb/commands/cascade.py

@@ -7,7 +7,7 @@ from ..model.reservoirs import unset_reservoir_by_pattern
 from ..model.tanks import unset_tank_by_curve
 from ..model.pumps import unset_pump_by_curve, unset_pump_by_pattern
 from ..model.tags import delete_tag_by_node, delete_tag_by_link
-from ..model.demands import delete_demand_by_junction, unset_demand_by_pattern
+from ..model.demands import delete_demand_by_junction
 from ..model.status import delete_status_by_link
 from ..model.energy import delete_pump_energy_by_pump, unset_pump_energy_by_pattern, unset_pump_energy_by_curve
 from ..model.emitters import delete_emitter_by_junction
@@ -167,7 +167,6 @@ def expand_pattern_delete(name: str, cs: ChangeSet) -> ChangeSet:
 
     result.merge(unset_reservoir_by_pattern(name, id))
     result.merge(unset_pump_by_pattern(name, id))
-    result.merge(unset_demand_by_pattern(name, id))
     result.merge(unset_pump_energy_by_pattern(name, id))
     result.merge(unset_source_by_pattern(name, id))
     result.merge(cs)
@@ -191,7 +190,7 @@ def expand_curve_delete(name: str, cs: ChangeSet) -> ChangeSet:
     return result
 
 
-def expand_legacy_options_update(cs: ChangeSet) -> ChangeSet:
+def expand_v2_options_update(cs: ChangeSet) -> ChangeSet:
     cs.operations[0]['operation'] = API_UPDATE
     cs.operations[0]['type'] = 'option'
     new_cs = cs
@@ -239,6 +238,6 @@ _DELETE_REWRITERS: dict[str, DeleteRewriter] = {
 }
 
 _UPDATE_REWRITERS: dict[str, UpdateRewriter] = {
-    "option": expand_legacy_options_update,
+    "option": expand_v2_options_update,
     "option_v3": expand_v3_options_update,
 }

app/native/wndb/commands/executor.py

@@ -2,13 +2,14 @@
 
 from collections.abc import Callable
 
-from ..core.connection import project_transaction
 from ..core.database import (
     API_ADD,
     API_DELETE,
     API_UPDATE,
     ChangeSet,
-    refresh_materialized_views,
+    changes_affect_materialized_views,
+    model_mutation_transaction,
+    refresh_materialized_views_after_commit,
 )
 from ..gis.backdrop import set_backdrop
 from ..gis.labels import add_label, delete_label, set_label
@@ -131,7 +132,7 @@ def _execute_delete_command(name: str, change_set: ChangeSet) -> ChangeSet:
 
 
 def execute_batch_commands(name: str, change_set: ChangeSet) -> ChangeSet:
-    with project_transaction(name):
+    with model_mutation_transaction(name):
         rewritten = ChangeSet()
         for operation in change_set.operations:
             rewritten.merge(expand_command(name, ChangeSet(operation)))
@@ -146,8 +147,8 @@ def execute_batch_commands(name: str, change_set: ChangeSet) -> ChangeSet:
             elif operation_type == API_DELETE:
                 result.merge(_execute_delete_command(name, ChangeSet(operation)))
 
-    if rewritten.operations:
-        refresh_materialized_views(name)
+    if changes_affect_materialized_views(rewritten):
+        refresh_materialized_views_after_commit(name)
     return result