diff --git a/src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py b/src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py index a08f7c14..1752d1ff 100644 --- a/src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py +++ b/src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py @@ -83,6 +83,11 @@ class BoundaryConditionAdisTS(SQLSubModel): @classmethod def _db_update(cls, execute, version, data=None): + major, minor, release = version.strip().split(".") + if major == "0" and int(minor) <= 1: + if int(release) < 7: + cls._db_create(execute) + return True @classmethod diff --git a/src/Model/D90AdisTS/D90AdisTS.py b/src/Model/D90AdisTS/D90AdisTS.py index aee9ef86..728673a9 100644 --- a/src/Model/D90AdisTS/D90AdisTS.py +++ b/src/Model/D90AdisTS/D90AdisTS.py @@ -72,7 +72,7 @@ class D90AdisTS(SQLSubModel): @classmethod def _db_update(cls, execute, version, data=None): major, minor, release = version.strip().split(".") - if major == 0 and minor < 1: + if major == "0" and int(minor) <= 1: if int(release) < 6: cls._db_create(execute) diff --git a/src/Model/DIFAdisTS/DIFAdisTS.py b/src/Model/DIFAdisTS/DIFAdisTS.py index b65c1032..30224b0a 100644 --- a/src/Model/DIFAdisTS/DIFAdisTS.py +++ b/src/Model/DIFAdisTS/DIFAdisTS.py @@ -79,7 +79,7 @@ class DIFAdisTS(SQLSubModel): @classmethod def _db_update(cls, execute, version, data=None): major, minor, release = version.strip().split(".") - if major == 0 and minor < 1: + if major == "0" and int(minor) <= 1: if int(release) < 6: cls._db_create(execute) diff --git a/src/Model/Friction/Friction.py b/src/Model/Friction/Friction.py index 7eb453a7..eac1f1b2 100644 --- a/src/Model/Friction/Friction.py +++ b/src/Model/Friction/Friction.py @@ -81,7 +81,7 @@ class Friction(SQLSubModel): cls._db_update_to_0_1_0(execute, data) if major == "0" and minor == "1": - if release < 2: + if int(release) < 2: execute( "ALTER TABLE friction " + "ADD COLUMN deleted BOOLEAN NOT NULL DEFAULT FALSE" diff --git a/src/Model/Friction/FrictionList.py b/src/Model/Friction/FrictionList.py index d18004fc..d76bcac2 100644 --- a/src/Model/Friction/FrictionList.py +++ b/src/Model/Friction/FrictionList.py @@ -41,7 +41,6 @@ class FrictionList(PamhyrModelList): @classmethod def _db_update(cls, execute, version, data=None): if version == "0.0.0": - logger.info(f"Update friction TABLE from {version}") cls._db_update_0_0_1(execute, version) return cls._update_submodel(execute, version, data) diff --git a/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py b/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py index 906f7392..d312f99c 100644 --- a/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py +++ b/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py @@ -82,7 +82,7 @@ class InitialConditionsAdisTS(SQLSubModel): @classmethod def _db_update(cls, execute, version, data=None): major, minor, release = version.strip().split(".") - if major == 0 and minor < 1: + if major == "0" and int(minor) <= 1: if int(release) < 6: cls._db_create(execute) diff --git a/src/Model/LateralContributionsAdisTS/LateralContributionAdisTS.py b/src/Model/LateralContributionsAdisTS/LateralContributionAdisTS.py index 522dc072..5f80f140 100644 --- a/src/Model/LateralContributionsAdisTS/LateralContributionAdisTS.py +++ b/src/Model/LateralContributionsAdisTS/LateralContributionAdisTS.py @@ -85,6 +85,11 @@ class LateralContributionAdisTS(SQLSubModel): @classmethod def _db_update(cls, execute, version, data=None): + major, minor, release = version.strip().split(".") + if major == "0" and int(minor) <= 1: + if int(release) < 7: + cls._db_create(execute) + return True @classmethod diff --git a/src/Model/OutputRKAdists/OutputRKAdists.py b/src/Model/OutputRKAdists/OutputRKAdists.py index f2728f76..ea385e3f 100644 --- a/src/Model/OutputRKAdists/OutputRKAdists.py +++ b/src/Model/OutputRKAdists/OutputRKAdists.py @@ -83,7 +83,6 @@ class OutputRKAdists(SQLSubModel): @classmethod def _db_create(cls, execute): - sql = ( "CREATE TABLE OutputRKAdists(" + "id INTEGER NOT NULL PRIMARY KEY, " + @@ -100,6 +99,11 @@ class OutputRKAdists(SQLSubModel): @classmethod def _db_update(cls, execute, version, data=None): + major, minor, release = version.strip().split(".") + if major == "0" and int(minor) <= 1: + if int(release) < 7: + cls._db_create(execute) + return True @classmethod diff --git a/src/Model/Pollutants/Pollutants.py b/src/Model/Pollutants/Pollutants.py index 17e81cab..3cad65f5 100644 --- a/src/Model/Pollutants/Pollutants.py +++ b/src/Model/Pollutants/Pollutants.py @@ -99,6 +99,11 @@ class Pollutants(SQLSubModel): @classmethod def _db_update(cls, execute, version, data=None): + major, minor, release = version.strip().split(".") + if major == "0" and int(minor) <= 1: + if int(release) < 7: + cls._db_create(execute) + return True @classmethod diff --git a/src/Model/REPLine/REPLine.py b/src/Model/REPLine/REPLine.py index 4a5844b2..fd78b12e 100644 --- a/src/Model/REPLine/REPLine.py +++ b/src/Model/REPLine/REPLine.py @@ -134,8 +134,8 @@ class REPLine(SQLSubModel): else: cls._db_update_to_0_0_14(execute, data) - if major == "0" and minor == "1": - if release < 2: + if major == "0" and int(minor) <= 1: + if int(release) < 2: execute( "ALTER TABLE rep_lines " + "ADD COLUMN deleted BOOLEAN NOT NULL DEFAULT FALSE" diff --git a/src/Model/Reservoir/Reservoir.py b/src/Model/Reservoir/Reservoir.py index 8b44625c..2210cdff 100644 --- a/src/Model/Reservoir/Reservoir.py +++ b/src/Model/Reservoir/Reservoir.py @@ -66,8 +66,8 @@ class Data(SQLSubModel): if int(release) > 5: cls._db_update_to_0_1_0(execute, data) - if major == "0" and minor == "1": - if release < 2: + if major == "0" and int(minor) <= 1: + if int(release) < 2: execute( "ALTER TABLE reservoir_data " + "ADD COLUMN deleted BOOLEAN NOT NULL DEFAULT FALSE" @@ -244,7 +244,7 @@ class Reservoir(SQLSubModel): cls._db_update_to_0_1_0(execute, data) if major == "0" and minor == "1": - if release < 2: + if int(release) < 2: execute( "ALTER TABLE additional_files " + "ADD COLUMN deleted BOOLEAN NOT NULL DEFAULT FALSE" diff --git a/src/Model/Study.py b/src/Model/Study.py index 8d5337c6..2c50b853 100644 --- a/src/Model/Study.py +++ b/src/Model/Study.py @@ -44,7 +44,7 @@ class Study(SQLModel): def __init__(self, filename=None, init_new=True): # Metadata - self._version = "0.1.2" + self._version = "0.1.7" self.creation_date = datetime.now() self.last_modification_date = datetime.now() self.last_save_date = datetime.now()