src/Model/Scenario.py

@@ -30,13 +30,13 @@ class Scenario(SQLSubModel):
     _id_cnt = 0
     _sub_classes = []
 
-    tables_with_deleted_column = [
+    related_tables = [
         # Adists
         "output_rk_adists",
         "boundary_condition_adists", "boundary_condition_data_adists",
         "lateral_contribution_adists", "lateral_contribution_data_adists",
         "initial_conditions_adists",
-        "d90_adists",
+        "d90_adists", "dif_adists",
         "pollutants", "pollutants_characteristics",
         # Hydraulic
         "additional_files",
@@ -44,21 +44,16 @@ class Scenario(SQLSubModel):
         "lateral_contribution", "lateral_contribution_data",
         "friction", "stricklers",
         "hydraulic_structures",
-        "hydraulic_structures_basic",
+        "hydraulic_structures_basic", "hydraulic_structures_basic_value",
         "initial_conditions",
         "sedimentary_layer", "sedimentary_layer_layer",
         "reservoir", "reservoir_data",
         "rep_lines",
+        "solver_parameter",
         "geometry_pointXYZ", "geometry_profileXYZ",
         "river_reach", "river_node",
     ]
 
-    related_tables = tables_with_deleted_column + [
-        "dif_adists",
-        "solver_parameter",
-        "hydraulic_structures_basic_value",
-    ]
-
     def __init__(self,
                  id: int = -1,
                  name: str = "",
@@ -215,21 +210,19 @@ class Scenario(SQLSubModel):
 
     def get_parent_branch(self):
         def aux(scenario, acc):
-            if scenario is None:
+            if scenario.parent == None:
-                return acc
+                return [scenario.id] + acc
 
             return aux(scenario.parent, [scenario.id] + acc)
 
         return aux(self, [])
 
     def drop_deleted_data(self, execute):
-        tables = self.tables_with_deleted_column
+        tables = self.related_tables
         branch = self.get_parent_branch()
 
         for table in tables:
-            if self.parent is None:
+            if self.parent == None:
-                # This scenario is the default scenario, so we can
-                # delete all data marked as deleted
                 execute(
                     f"DELETE FROM {table} " +
                     f"WHERE scenario = {self.id} " +
@@ -237,8 +230,6 @@ class Scenario(SQLSubModel):
                 )
                 continue
 
-            # Select pamhyr_id for each deleted data in this scenario
-            # who do not exists into parents scenarios
             ids = execute(
                 f"""
                   SELECT pamhyr_id FROM {table}
@@ -251,20 +242,21 @@ class Scenario(SQLSubModel):
                   )
                 """, fetch_one=False
             )
-            if ids is None or len(ids) == 0:
+            if ids == None or len(ids) == 0:
                 continue
 
             logger.debug(
-                f"(s{self.id}) Drop deleted data into '{table}' : {ids}"
+                f"Drop deleted data into '{table}' : {ids}"
             )
 
             execute(
                 f"DELETE FROM {table} " +
                 f"WHERE scenario = {self.id} " +
-                "AND pamhyr_id IN " +
+                f"AND pamhyr_id IN ({', '.join(map(lambda x: str(x[0]), ids))})"
-                f"({', '.join(map(lambda x: str(x[0]), ids))})"
             )
 
+        return True
+
     @property
     def id(self):
         return self._id

src/Model/Study.py

@@ -449,13 +449,6 @@ class Study(SQLModel):
             [self.scenarios, self._river],
             data=progress
         )
-
-        # Clear DB for each scenarios
-        for scenar in self.scenarios.lst:
-            scenar.drop_deleted_data(self.execute)
-
-        progress()
-
         self.commit()
 
     def sql_save_request_count(self, *args, **kargs):
@@ -466,7 +459,7 @@ class Study(SQLModel):
             [self.scenarios, self._river]
         )
         logger.debug(cnt)
-        return cnt + 8
+        return cnt + 7
 
     def close(self):
         """Close db connection
@@ -525,8 +518,7 @@ class Study(SQLModel):
         data["study"] = self
         river._db_load_results(sql_exec, data=data)
 
-        # FIXME: Disable scenario cache to save memory usage
+        self._river_scenario_cache[scenario] = river
-        # self._river_scenario_cache[scenario] = river
         self.status.scenario = old_scenario
 
         return river