DB: Fix DB update and set DB version to '0.1.7'.

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

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)
 

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)
 

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"

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)

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)
 

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

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

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

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"

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"

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()