src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py

@@ -95,7 +95,7 @@ class BoundaryConditionAdisTS(SQLSubModel):
             if int(release) < 7:
                 cls._db_create(execute)
 
-        elif major == "0" and int(minor) < 2:
+        if major == "0" and int(minor) < 2:
             cls._db_update_to_0_2_0(execute, data)
 
         return True
@@ -149,7 +149,7 @@ class BoundaryConditionAdisTS(SQLSubModel):
         new = []
 
         table = execute(
-            "SELECT pamhyr_id, pollutant, type, node " +
+            "SELECT id, pollutant, type, node " +
             "FROM boundary_condition_adists"
         )
 

src/Model/D90AdisTS/D90AdisTS.py

@@ -72,7 +72,7 @@ class D90AdisTS(SQLSubModel):
             if int(release) < 6:
                 cls._db_create(execute)
 
-        elif major == "0" and int(minor) < 2:
+        if major == "0" and int(minor) < 2:
             cls._db_update_to_0_2_0(execute, data)
 
         return True
@@ -101,7 +101,7 @@ class D90AdisTS(SQLSubModel):
         new = []
 
         table = execute(
-            "SELECT pamhyr_id, name, d90, enabled " +
+            "SELECT id, name, d90, enabled " +
             "FROM d90_adists"
         )
 
@@ -129,7 +129,7 @@ class D90AdisTS(SQLSubModel):
         return new
 
     def _db_save(self, execute, data=None):
-        execute(f"DELETE FROM d90_adists WHERE pamhyr_id = {self.id}")
+        execute(f"DELETE FROM d90_adists WHERE id = {self.id}")
 
         d90 = -1.
         if self.d90 is not None:
@@ -138,7 +138,7 @@ class D90AdisTS(SQLSubModel):
         sql = (
             "INSERT INTO " +
             "d90_adists(" +
-            "pamhyr_id, name, d90, enabled" +
+            "id, name, d90, enabled" +
             ") " +
             "VALUES (" +
             f"{self.id}, '{self._db_format(self._name)}', " +

src/Model/DIFAdisTS/DIFAdisTS.py

@@ -78,7 +78,7 @@ class DIFAdisTS(SQLSubModel):
             if int(release) < 6:
                 cls._db_create(execute)
 
-        elif major == "0" and int(minor) < 2:
+        if major == "0" and int(minor) < 2:
             cls._db_update_to_0_2_0(execute, data)
 
         return True
@@ -107,7 +107,7 @@ class DIFAdisTS(SQLSubModel):
         new = []
 
         table = execute(
-            "SELECT pamhyr_id, name, method, dif, b, c, enabled " +
+            "SELECT id, name, method, dif, b, c, enabled " +
             "FROM dif_adists"
         )
 

src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py

@@ -82,7 +82,7 @@ class InitialConditionsAdisTS(SQLSubModel):
             if int(release) < 6:
                 cls._db_create(execute)
 
-        elif major == "0" and int(minor) < 2:
+        if major == "0" and int(minor) < 2:
             cls._db_update_to_0_2_0(execute, data)
 
         return True
@@ -99,10 +99,8 @@ class InitialConditionsAdisTS(SQLSubModel):
 
         execute(
             f"INSERT INTO {table}_tmp " +
-            "(pamhyr_id, pollutant, name, concentration, " +
-            "eg, em, ed, scenario) " +
-            "SELECT pamhyr_id, pollutant, name, concentration, " +
-            "eg, em, ed, scenario) " +
+            "(pamhyr_id, pollutant, reach, begin_rk, end_rk, scenario) " +
+            "SELECT pamhyr_id, pollutant, edge, begin_rk, end_rk, scenario) " +
             f"FROM {table}"
         )
 
@@ -116,8 +114,8 @@ class InitialConditionsAdisTS(SQLSubModel):
         new = []
 
         table = execute(
-            "SELECT pamhyr_id, pollutant, name, concentration, eg, em, ed, " +
-            "enabled, scenario " +
+            "SELECT id, pollutant, name, concentration, eg, em, ed, " +
+            "enabled " +
             "FROM initial_conditions_adists"
         )
 
@@ -178,7 +176,7 @@ class InitialConditionsAdisTS(SQLSubModel):
         sql = (
             "INSERT INTO " +
             "initial_conditions_adists(" +
-            "pamhyr_id, pollutant, name, concentration, " +
+            "id, pollutant, name, concentration, " +
             "eg, em, ed, enabled" +
             ") " +
             "VALUES (" +

src/Model/LateralContributionsAdisTS/LateralContributionAdisTS.py

@@ -97,7 +97,7 @@ class LateralContributionAdisTS(SQLSubModel):
             if int(release) < 7:
                 cls._db_create(execute)
 
-        elif major == "0" and int(minor) < 2:
+        if major == "0" and int(minor) < 2:
             cls._db_update_to_0_2_0(execute, data)
 
         return True
@@ -153,11 +153,8 @@ class LateralContributionAdisTS(SQLSubModel):
         scenario = data["scenario"]
         loaded = data['loaded_pid']
 
-        if scenario is None:
-            return new
-
         table = execute(
-            "SELECT pamhyr_id, pollutant, reach, begin_rk, end_rk " +
+            "SELECT id, pollutant, edge, begin_rk, end_rk " +
             "FROM lateral_contribution_adists" +
             f"WHERE scenario = {scenario.id} " +
             f"AND pamhyr_id NOT IN ({', '.join(map(str, loaded))}) "
@@ -176,8 +173,8 @@ class LateralContributionAdisTS(SQLSubModel):
                 lca.end_rk = row[4]
 
                 values = execute(
-                    "SELECT data0, data1 " +
-                    "FROM lateral_contribution_data_adists " +
+                    "SELECT data0," +
+                    " data1 FROM lateral_contribution_data_adists " +
                     f"WHERE scenario = {scenario.id} " +
                     f"AND pamhyr_id NOT IN ({', '.join(map(str, loaded))}) "
                     f"AND lca = '{lca.id}'"
@@ -204,12 +201,12 @@ class LateralContributionAdisTS(SQLSubModel):
 
         execute(
             f"DELETE FROM lateral_contribution_adists" +
-            f"WHERE pamhyr_id = {self.id} " +
+            f" WHERE id = {self.id} " +
             f"AND scenario = {self._status.scenario_id}"
         )
         execute(
             f"DELETE FROM lateral_contribution_data_adists" +
-            f"WHERE lca = {self.id} " +
+            f" WHERE lc = {self.id} " +
             f"AND scenario = {self._status.scenario_id}"
         )
 
@@ -231,7 +228,7 @@ class LateralContributionAdisTS(SQLSubModel):
 
             sql = (
                 "INSERT INTO " +
-                "lateral_contribution_data_adists(data0, data1, lca) " +
+                "lateral_contribution_data_adists(data0, data1, lc) " +
                 f"VALUES ('{data0}', {data1}, {self.id})"
             )
             execute(sql)

src/Model/OutputRKAdists/OutputRKAdists.py

@@ -100,7 +100,7 @@ class OutputRKAdists(SQLSubModel):
             if int(release) < 7:
                 cls._db_create(execute)
 
-        elif major == "0" and int(minor) <= 2:
+        if major == "0" and int(minor) <= 2:
             if int(release) <= 0:
                 cls._db_update_to_0_2_0(execute, data)
 
@@ -137,7 +137,7 @@ class OutputRKAdists(SQLSubModel):
         status = data["status"]
 
         table = execute(
-            "SELECT pamhyr_id, reach, rk, title " +
+            "SELECT id, reach, rk, title " +
             f"FROM OutputRKAdists"
         )
 
@@ -164,7 +164,7 @@ class OutputRKAdists(SQLSubModel):
 
         sql = (
             "INSERT INTO " +
-            "OutputRKAdists(pamhyr_id, reach, rk, title) " +
+            "OutputRKAdists(id, reach, rk, title) " +
             "VALUES (" +
             f"{self.id}, {self._reach}, {self._rk}, " +
             f"'{self._db_format(self._title)}'" +

src/Model/OutputRKAdists/OutputRKListAdists.py

@@ -40,7 +40,7 @@ class OutputRKAdistsList(PamhyrModelList):
         # Delete previous data
         execute(
             "DELETE FROM OutputRKAdists" +
-            f"WHERE scenario = {self._status.scenario_id}"
+            f"AND scenario = {self._status.scenario_id}"
         )
 
         for sl in self._lst:

src/Model/River.py

@@ -100,7 +100,7 @@ class RiverNode(Node):
     def _db_update(cls, execute, version, data=None):
         major, minor, release = version.strip().split(".")
 
-        if major == "0" and int(minor) < 2:
+        if major == minor == "0":
             cls._db_update_to_0_2_0(execute, data=data)
 
         if major == "0" and minor == "1":

src/Model/Study.py

@@ -277,10 +277,10 @@ class Study(SQLModel):
                 "INSERT INTO info VALUES ('study_release', '0')"
             )
 
-        if major == "0" and int(minor) <= 2:
+        if major == "0" and int(minor) <= 1:
             self._add_into_info_if_not_exists('current_scenario', '0')
 
-        if major == "0" and int(minor) < 2:
+        if major == "0" and int(minor) < 1:
             # Need to temporary disable the sqlite foreign keys
             # checking to update db dans change the table id fk to
             # table pamhyr_id fk
@@ -290,7 +290,7 @@ class Study(SQLModel):
 
         ok = self._update_submodel(version[0], data={})
 
-        if major == "0" and int(minor) < 2:
+        if major == "0" and int(minor) < 1:
             # Reactivate foreign keys checking
             self.execute(
                 "PRAGMA foreign_keys = ON;"