diff --git a/src/Model/River.py b/src/Model/River.py index 68afcb57..40c80759 100644 --- a/src/Model/River.py +++ b/src/Model/River.py @@ -547,12 +547,12 @@ class River(Graph): data['loaded_pid'] = set() + new._Pollutants = PollutantsList._db_load(execute, data) + new._Output_rk_adists = OutputRKAdistsList._db_load( execute, data ) - new._Pollutants = PollutantsList._db_load(execute, data) - new._InitialConditionsAdisTS = InitialConditionsAdisTSList._db_load( execute, data) diff --git a/src/Model/Scenario.py b/src/Model/Scenario.py index db953239..4bb4d6f3 100644 --- a/src/Model/Scenario.py +++ b/src/Model/Scenario.py @@ -93,21 +93,10 @@ class Scenario(SQLSubModel): @classmethod def _db_update(cls, execute, version, data=None): major, minor, release = version.strip().split(".") - if major == minor == "0": - if int(release) < 12: - cls._db_create(execute) - cls._db_add_default(execute) - if major == "0" and minor == "1": - if int(release) < 2: - execute( - "ALTER TABLE scenario " + - "ADD COLUMN x REAL NOT NULL DEFAULT 1000" - ) - execute( - f"ALTER TABLE scenario " + - "ADD COLUMN y REAL NOT NULL DEFAULT 1000" - ) + if major == "0" and int(minor) <= 2: + cls._db_create(execute) + cls._db_add_default(execute) return True