From 44c3a91d72b857808142309152f6a3a3274a503f Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Rouby Date: Thu, 28 May 2026 09:56:16 +0200 Subject: [PATCH 1/2] AdisTS: Fix db version update (again) for 0.0.11 --- .../BoundaryConditionAdisTS.py | 12 ++---------- src/Model/D90AdisTS/D90AdisTS.py | 6 +----- src/Model/D90AdisTS/D90AdisTSSpec.py | 7 +------ src/Model/DIFAdisTS/DIFAdisTS.py | 6 +----- src/Model/DIFAdisTS/DIFAdisTSSpec.py | 6 +----- .../InitialConditionsAdisTS.py | 6 +----- .../InitialConditionsAdisTSSpec.py | 6 +----- .../LateralContributionAdisTS.py | 12 ++---------- src/Model/OutputRKAdists/OutputRKAdists.py | 6 +----- src/Model/Pollutants/Pollutants.py | 12 ++---------- 10 files changed, 13 insertions(+), 66 deletions(-) diff --git a/src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py b/src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py index 363bd685..f4648d93 100644 --- a/src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py +++ b/src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py @@ -71,11 +71,7 @@ class Data(SQLSubModel): major, minor, release = version.strip().split(".") created = False if major == "0" and minor == "0": - cls._db_create(execute) - created = True - - if major == "0" and minor == "1": - if int(release) < 7: + if int(release) < 11: cls._db_create(execute) created = True @@ -253,11 +249,7 @@ class BoundaryConditionAdisTS(SQLSubModel): created = False if major == "0" and minor == "0": - cls._db_create(execute) - created = True - - if major == "0" and minor == "1": - if int(release) < 7: + if int(release) < 11: cls._db_create(execute) created = True diff --git a/src/Model/D90AdisTS/D90AdisTS.py b/src/Model/D90AdisTS/D90AdisTS.py index 4a3ae645..f0efa4a3 100644 --- a/src/Model/D90AdisTS/D90AdisTS.py +++ b/src/Model/D90AdisTS/D90AdisTS.py @@ -74,11 +74,7 @@ class D90AdisTS(SQLSubModel): created = False if major == "0" and minor == "0": - cls._db_create(execute) - created = True - - if major == "0" and minor == "1": - if int(release) < 6: + if int(release) < 11: cls._db_create(execute) created = True diff --git a/src/Model/D90AdisTS/D90AdisTSSpec.py b/src/Model/D90AdisTS/D90AdisTSSpec.py index 5a47b02d..9938338a 100644 --- a/src/Model/D90AdisTS/D90AdisTSSpec.py +++ b/src/Model/D90AdisTS/D90AdisTSSpec.py @@ -72,13 +72,8 @@ class D90AdisTSSpec(SQLSubModel): major, minor, release = version.strip().split(".") created = False - if major == "0" and minor == "0": - cls._db_create(execute) - created = True - - if major == "0" and minor == "1": - if int(release) < 6: + if int(release) < 11: cls._db_create(execute) created = True diff --git a/src/Model/DIFAdisTS/DIFAdisTS.py b/src/Model/DIFAdisTS/DIFAdisTS.py index bdbaf36c..0f0a0d40 100644 --- a/src/Model/DIFAdisTS/DIFAdisTS.py +++ b/src/Model/DIFAdisTS/DIFAdisTS.py @@ -80,11 +80,7 @@ class DIFAdisTS(SQLSubModel): created = False if major == "0" and minor == "0": - cls._db_create(execute) - created = True - - if major == "0" and minor == "1": - if int(release) < 6: + if int(release) < 11: cls._db_create(execute) created = True diff --git a/src/Model/DIFAdisTS/DIFAdisTSSpec.py b/src/Model/DIFAdisTS/DIFAdisTSSpec.py index 8dd897fc..167a85f8 100644 --- a/src/Model/DIFAdisTS/DIFAdisTSSpec.py +++ b/src/Model/DIFAdisTS/DIFAdisTSSpec.py @@ -84,11 +84,7 @@ class DIFAdisTSSpec(SQLSubModel): created = False if major == "0" and minor == "0": - cls._db_create(execute) - created = True - - if major == "0" and minor == "1": - if int(release) < 6: + if int(release) < 11: cls._db_create(execute) created = True diff --git a/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py b/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py index e7ea2646..72c1b7b9 100644 --- a/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py +++ b/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py @@ -82,11 +82,7 @@ class InitialConditionsAdisTS(SQLSubModel): created = False if major == "0" and minor == "0": - cls._db_create(execute) - created = True - - if major == "0" and minor == "1": - if int(release) < 6: + if int(release) < 11: cls._db_create(execute) created = True diff --git a/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTSSpec.py b/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTSSpec.py index 7feb2f59..b00e16e0 100644 --- a/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTSSpec.py +++ b/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTSSpec.py @@ -80,11 +80,7 @@ class ICAdisTSSpec(SQLSubModel): created = False if major == "0" and minor == "0": - cls._db_create(execute) - created = True - - if major == "0" and minor == "1": - if int(release) < 7: + if int(release) < 11: cls._db_create(execute) created = True diff --git a/src/Model/LateralContributionsAdisTS/LateralContributionAdisTS.py b/src/Model/LateralContributionsAdisTS/LateralContributionAdisTS.py index a1d64a76..2b6be0d5 100644 --- a/src/Model/LateralContributionsAdisTS/LateralContributionAdisTS.py +++ b/src/Model/LateralContributionsAdisTS/LateralContributionAdisTS.py @@ -70,11 +70,7 @@ class Data(SQLSubModel): created = False if major == "0" and minor == "0": - cls._db_create(execute) - created = True - - if major == "0" and minor == "1": - if int(release) < 7: + if int(release) < 11: cls._db_create(execute) created = True @@ -248,11 +244,7 @@ class LateralContributionAdisTS(SQLSubModel): created = False if major == "0" and minor == "0": - cls._db_create(execute) - created = True - - if major == "0" and minor == "1": - if int(release) < 7: + if int(release) < 11: cls._db_create(execute) created = True diff --git a/src/Model/OutputRKAdists/OutputRKAdists.py b/src/Model/OutputRKAdists/OutputRKAdists.py index 8a24c468..18a79360 100644 --- a/src/Model/OutputRKAdists/OutputRKAdists.py +++ b/src/Model/OutputRKAdists/OutputRKAdists.py @@ -98,11 +98,7 @@ class OutputRKAdists(SQLSubModel): created = False if major == "0" and minor == "0": - cls._db_create(execute) - created = True - - if major == "0" and minor == "1": - if int(release) < 7: + if int(release) < 11: cls._db_create(execute) created = True diff --git a/src/Model/Pollutants/Pollutants.py b/src/Model/Pollutants/Pollutants.py index 080a4dfc..40b1f5f2 100644 --- a/src/Model/Pollutants/Pollutants.py +++ b/src/Model/Pollutants/Pollutants.py @@ -153,11 +153,7 @@ class PollutantCharacteristics(SQLSubModel): created = False if major == "0" and minor == "0": - cls._db_create(execute) - created = True - - if major == "0" and minor == "1": - if int(release) < 7: + if int(release) < 11: cls._db_create(execute) created = True @@ -387,11 +383,7 @@ class Pollutants(SQLSubModel): created = False if major == "0" and minor == "0": - cls._db_create(execute) - created = True - - if major == "0" and minor == "1": - if int(release) < 7: + if int(release) < 11: cls._db_create(execute) created = True From 7e080767da9ecac9bc21f5182c7682bf6a27aa3b Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Rouby Date: Thu, 28 May 2026 10:19:12 +0200 Subject: [PATCH 2/2] AdistTS: d90: Fix update to 0.2.*. --- src/Model/D90AdisTS/D90AdisTSSpec.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Model/D90AdisTS/D90AdisTSSpec.py b/src/Model/D90AdisTS/D90AdisTSSpec.py index 9938338a..1c07ae23 100644 --- a/src/Model/D90AdisTS/D90AdisTSSpec.py +++ b/src/Model/D90AdisTS/D90AdisTSSpec.py @@ -95,8 +95,10 @@ class D90AdisTSSpec(SQLSubModel): execute( f"INSERT INTO {table_new}_tmp " + - "(pamhyr_id, name, d90, enabled, scenario) " + - "SELECT pamhyr_id, name, d90, enabled, scenario " + + "(pamhyr_id, d90_default, name, reach, " + + " start_rk, end_rk, d90, enabled, scenario) " + + "SELECT pamhyr_id, d90_default, name, reach, " + + " start_rk, end_rk, d90, enabled, scenario " + f"FROM {table}" ) @@ -109,7 +111,7 @@ class D90AdisTSSpec(SQLSubModel): def _db_update_to_0_2_0_set_d90_pid(cls, execute, data): pid_d90 = data["id2pid"]["d90_adists"] els = execute( - f"SELECT pamhyr_id, d90 FROM d90_adists_spec" + f"SELECT pamhyr_id, d90_default FROM d90_adists_spec" ) for row in els: @@ -121,8 +123,8 @@ class D90AdisTSSpec(SQLSubModel): continue execute( - f"UPDATE d90_adists_spec" + - f"SET d90 = {pid_d90[d90_id]} " + + f"UPDATE d90_adists_spec " + + f"SET d90_default = {pid_d90[d90_id]} " + f"WHERE pamhyr_id = {pid}" )