Support cascade deletion

api/s7_valves.py

@@ -1,4 +1,4 @@
-from .operation import *
+from .database import *
 from .s0_base import *
 
 
@@ -60,7 +60,7 @@ class Valve(object):
         return { 'type': self.type, 'id': self.id }
 
 
-def set_valve_cache(name: str, cs: ChangeSet) -> DbChangeSet:
+def set_valve_cmd(name: str, cs: ChangeSet) -> DbChangeSet:
     old = Valve(get_valve(name, cs.operations[0]['id']))
     raw_new = get_valve(name, cs.operations[0]['id'])
 
@@ -81,10 +81,10 @@ def set_valve_cache(name: str, cs: ChangeSet) -> DbChangeSet:
 
 
 def set_valve(name: str, cs: ChangeSet) -> ChangeSet:
-    return execute_command(name, set_valve_cache(name, cs))
+    return execute_command(name, set_valve_cmd(name, cs))
 
 
-def add_valve_cache(name: str, cs: ChangeSet) -> DbChangeSet:
+def add_valve_cmd(name: str, cs: ChangeSet) -> DbChangeSet:
     new = Valve(cs.operations[0])
 
     redo_sql = f"insert into _link (id, type) values ({new.f_id}, {new.f_type});"
@@ -100,10 +100,10 @@ def add_valve_cache(name: str, cs: ChangeSet) -> DbChangeSet:
 
 
 def add_valve(name: str, cs: ChangeSet) -> ChangeSet:
-    return execute_command(name, add_valve_cache(name, cs))
+    return execute_command(name, add_valve_cmd(name, cs))
 
 
-def delete_valve_cache(name: str, cs: ChangeSet) -> DbChangeSet:
+def delete_valve_cmd(name: str, cs: ChangeSet) -> DbChangeSet:
     old = Valve(get_valve(name, cs.operations[0]['id']))
 
     redo_sql = f"delete from valves where id = {old.f_id};"
@@ -119,7 +119,7 @@ def delete_valve_cache(name: str, cs: ChangeSet) -> DbChangeSet:
 
 
 def delete_valve(name: str, cs: ChangeSet) -> ChangeSet:
-    return execute_command(name, delete_valve_cache(name, cs))
+    return execute_command(name, delete_valve_cmd(name, cs))
 
 
 class InpValve:
@@ -165,3 +165,13 @@ def inp_out_valve(name: str) -> list[str]:
         desc = ';'
         lines.append(f'{id} {node1} {node2} {diameter} {v_type} {setting} {minor_loss} {desc}')
     return lines
+
+
+'''def delete_valve_by_node(name: str, node: str) -> ChangeSet:
+    cs = ChangeSet()
+
+    rows = read_all(name, f"select id from valves where node1 = '{node}' or node2 = '{node}'")
+    for row in rows:
+        cs.append(g_delete_prefix | {'type': 'valve', 'id': row['id']})
+
+    return cs'''