Reservoir: Prepare db update 0.1.0.

src/Model/BoundaryCondition/BoundaryCondition.py

@@ -52,10 +52,10 @@ class Data(SQLSubModel):
             ind INTEGER NOT NULL,
             data0 TEXT NOT NULL,
             data1 TEXT NOT NULL,
-            lc INTEGER,
+            bc INTEGER,
             {Scenario.create_db_add_scenario()},
             {Scenario.create_db_add_scenario_fk()},
-            FOREIGN KEY(lc) REFERENCES boundary_condition(pamhyr_id),
+            FOREIGN KEY(bc) REFERENCES boundary_condition(pamhyr_id),
             PRIMARY KEY(pamhyr_id, scenario)
           )
         """)
@@ -67,22 +67,25 @@ class Data(SQLSubModel):
         major, minor, release = version.strip().split(".")
 
         if major == "0" and int(minor) < 1:
-            cls._db_update_to_0_1_0(execute)
+            cls._db_update_to_0_1_0(execute, data)
 
         return cls._update_submodel(execute, version, data)
 
     @classmethod
-    def _db_update_to_0_1_0(cls, execute):
+    def _db_update_to_0_1_0(cls, execute, data):
         table = "boundary_condition_data"
 
-        cls.update_db_add_pamhyr_id(execute, table)
+        cls.update_db_add_pamhyr_id(
+            execute, table,
+            data=data
+        )
         Scenario.update_db_add_scenario(execute, table)
 
         cls._db_create(execute, ext="_tmp")
         execute(
             f"INSERT INTO {table} " +
-            "(pamhyr_id, ind, data0, data1, lc, scenario) " +
-            "SELECT pamhyr_id, ind, data0, data1, lc, scenario " +
+            "(pamhyr_id, ind, data0, data1, bc, scenario) " +
+            "SELECT pamhyr_id, ind, data0, data1, bc, scenario " +
             f"FROM {table}"
         )
 
@@ -92,12 +95,12 @@ class Data(SQLSubModel):
     @classmethod
     def _db_load(cls, execute, data=None):
         new = []
-        lc = data["lc"]
+        bc = data["bc"]
 
         values = execute(
             "SELECT pamhyr_id, ind, data0, data1 " +
             "FROM boundary_condition_data " +
-            f"WHERE lc = {lc._pamhyr_id} " +
+            f"WHERE bc = {bc._pamhyr_id} " +
             "ORDER BY ind ASC"
         )
 
@@ -111,12 +114,12 @@ class Data(SQLSubModel):
 
             nd = cls(
                 id=pid,
-                types=lc._types,
+                types=bc._types,
                 status=data['status']
             )
             nd._data = [data0, data1]
 
-            new.append((ind, nd))
+            new.append(nd)
 
         return new
 
@@ -125,12 +128,12 @@ class Data(SQLSubModel):
         ind = data["ind"]
         data0 = self._db_format(str(self[0]))
         data1 = self._db_format(str(self[1]))
-        lc = data["lc"]
+        bc = data["bc"]
 
         sql = (
             "INSERT INTO " +
             "boundary_condition_data(pamhyr_id, ind, data0, data1, bc) " +
-            f"VALUES ({pid}, {ind}, '{data0}', {data1}, {lc._pamhyr_id})"
+            f"VALUES ({pid}, {ind}, '{data0}', {data1}, {bc._pamhyr_id})"
         )
         execute(sql)