From 1dd92cb0890b230186428dac19b19181b5a1a71c Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Rouby Date: Fri, 26 Sep 2025 15:12:19 +0200 Subject: [PATCH] Results: Fix db update from 0.2.0. --- src/Model/OutputRKAdists/OutputRKAdists.py | 2 +- src/Model/Results/Results.py | 3 ++- src/Model/Results/River/River.py | 3 ++- src/Model/Scenario.py | 2 +- src/Model/Study.py | 4 ++-- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/Model/OutputRKAdists/OutputRKAdists.py b/src/Model/OutputRKAdists/OutputRKAdists.py index 9a0cd8ea..c66e5e6e 100644 --- a/src/Model/OutputRKAdists/OutputRKAdists.py +++ b/src/Model/OutputRKAdists/OutputRKAdists.py @@ -102,7 +102,7 @@ class OutputRKAdists(SQLSubModel): cls._db_create(execute) created = True - if major == "0" and int(minor) <= 2: + if major == "0" and int(minor) < 2: if not created: cls._db_update_to_0_2_0(execute, data) diff --git a/src/Model/Results/Results.py b/src/Model/Results/Results.py index e027b67f..780b6f8d 100644 --- a/src/Model/Results/Results.py +++ b/src/Model/Results/Results.py @@ -118,7 +118,8 @@ class Results(SQLSubModel): major, minor, release = version.strip().split(".") if major == "0" and int(minor) <= 2: - cls._db_create(execute) + if int(release) < 1: + cls._db_create(execute) return cls._update_submodel(execute, version, data) diff --git a/src/Model/Results/River/River.py b/src/Model/Results/River/River.py index 1b58d2a6..240008de 100644 --- a/src/Model/Results/River/River.py +++ b/src/Model/Results/River/River.py @@ -107,7 +107,8 @@ class Profile(SQLSubModel): major, minor, release = version.strip().split(".") if major == "0" and int(minor) <= 2: - cls._db_create(execute) + if int(release) < 1: + cls._db_create(execute) return cls._update_submodel(execute, version, data) diff --git a/src/Model/Scenario.py b/src/Model/Scenario.py index 645371cc..8ceb8161 100644 --- a/src/Model/Scenario.py +++ b/src/Model/Scenario.py @@ -94,7 +94,7 @@ class Scenario(SQLSubModel): def _db_update(cls, execute, version, data=None): major, minor, release = version.strip().split(".") - if major == "0" and int(minor) <= 2: + if major == "0" and int(minor) < 2: cls._db_create(execute) cls._db_add_default(execute) diff --git a/src/Model/Study.py b/src/Model/Study.py index 47d4a83e..8b2e66fe 100644 --- a/src/Model/Study.py +++ b/src/Model/Study.py @@ -38,7 +38,7 @@ logger = logging.getLogger() class Study(SQLModel): - _version = "0.2.0" + _version = "0.2.1" _sub_classes = [ Scenario, @@ -276,7 +276,7 @@ class Study(SQLModel): "INSERT INTO info VALUES ('study_release', '0')" ) - if major == "0" and int(minor) <= 2: + if major == "0" and int(minor) < 2: self._add_into_info_if_not_exists('current_scenario', '0') if major == "0" and int(minor) < 2: