From 936bfc753ac9c6302ac812020b2d5657b373a4e6 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Rouby Date: Tue, 23 Sep 2025 10:23:20 +0200 Subject: [PATCH] Results: Simplify db load. --- src/Model/Results/Results.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Model/Results/Results.py b/src/Model/Results/Results.py index dd04dfb6..60af8b85 100644 --- a/src/Model/Results/Results.py +++ b/src/Model/Results/Results.py @@ -119,16 +119,13 @@ class Results(SQLSubModel): study = data['study'] status = data['status'] scenario = data["scenario"] - loaded = data['loaded_pid'] values = execute( "SELECT pamhyr_id, solver_name, solver_type, " + "study_revision, creation_data, nb_timestamps, timestamps, " + "scenario " + "FROM results " + - f"WHERE scenario = {scenario.id} " + - f"AND pamhyr_id NOT IN ({', '.join(map(str, loaded))}) " + - "ORDER BY ind ASC" + f"WHERE scenario = {scenario.id}" ) for v in values: @@ -155,9 +152,9 @@ class Results(SQLSubModel): ts = struct.unpack(sf, timestamp_bytes) new_results.set("timestamps", ts) + data["timestamps"] = ts new_results._river = River._db_load(execute, data) - loaded.add(pid) new.append(new_results) return new