From 00c9ecde521d821151f755a312483ec67bcb8af3 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Rouby Date: Tue, 12 Aug 2025 16:23:19 +0200 Subject: [PATCH] Scenarios: Change update version number for scenarios from 0.1.0 to 0.2.0. --- src/Model/BoundaryCondition/BoundaryCondition.py | 14 +++++++------- src/Model/DIFAdisTS/DIFAdisTSSpec.py | 2 +- src/Model/Friction/Friction.py | 10 +++++----- src/Model/Geometry/PointXYZ.py | 12 ++++++------ src/Model/Geometry/ProfileXYZ.py | 10 +++++----- .../Basic/HydraulicStructures.py | 8 ++++---- src/Model/HydraulicStructures/Basic/Value.py | 8 ++++---- .../HydraulicStructures/HydraulicStructures.py | 8 ++++---- src/Model/InitialConditions/InitialConditions.py | 6 +++--- .../InitialConditionsAdisTS.py | 1 - .../InitialConditionsAdisTSSpec.py | 1 + .../LateralContribution/LateralContribution.py | 14 +++++++------- src/Model/Reservoir/Reservoir.py | 14 +++++++------- src/Model/River.py | 12 ++++++------ src/Model/SedimentLayer/SedimentLayer.py | 12 ++++++------ src/Model/Stricklers/Stricklers.py | 4 ++-- src/Model/Tools/PamhyrDB.py | 4 ++-- 17 files changed, 70 insertions(+), 70 deletions(-) diff --git a/src/Model/BoundaryCondition/BoundaryCondition.py b/src/Model/BoundaryCondition/BoundaryCondition.py index 57d63040..e4e4900d 100644 --- a/src/Model/BoundaryCondition/BoundaryCondition.py +++ b/src/Model/BoundaryCondition/BoundaryCondition.py @@ -72,7 +72,7 @@ class Data(SQLSubModel): major, minor, release = version.strip().split(".") if major == "0" and int(minor) < 1: - cls._db_update_to_0_1_0(execute, data) + cls._db_update_to_0_2_0(execute, data) if major == "0" and minor == "1": if int(release) < 2: @@ -84,7 +84,7 @@ class Data(SQLSubModel): return cls._update_submodel(execute, version, data) @classmethod - def _db_update_to_0_1_0(cls, execute, data): + def _db_update_to_0_2_0(cls, execute, data): table = "boundary_condition_data" bcs = data['id2pid']['boundary_condition'] @@ -105,10 +105,10 @@ class Data(SQLSubModel): execute(f"DROP TABLE {table}") execute(f"ALTER TABLE {table}_tmp RENAME TO {table}") - cls._db_update_to_0_1_0_set_bc_pid(execute, table, bcs) + cls._db_update_to_0_2_0_set_bc_pid(execute, table, bcs) @classmethod - def _db_update_to_0_1_0_set_bc_pid(cls, execute, table, bcs): + def _db_update_to_0_2_0_set_bc_pid(cls, execute, table, bcs): els = execute( f"SELECT pamhyr_id, bc FROM {table}" ) @@ -249,7 +249,7 @@ class BoundaryCondition(SQLSubModel): major, minor, release = version.strip().split(".") if major == minor == "0": - cls._db_update_to_0_1_0(execute, data) + cls._db_update_to_0_2_0(execute, data) if major == "0" and minor == "1": if int(release) < 2: @@ -261,7 +261,7 @@ class BoundaryCondition(SQLSubModel): return cls._update_submodel(execute, version, data) @classmethod - def _db_update_to_0_1_0(cls, execute, data): + def _db_update_to_0_2_0(cls, execute, data): table = "boundary_condition" nodes = data['id2pid']['river_node'] @@ -281,7 +281,7 @@ class BoundaryCondition(SQLSubModel): execute(f"DROP TABLE {table}") execute(f"ALTER TABLE {table}_tmp RENAME TO {table}") - cls._db_update_to_0_1_0_set_node_pid(execute, table, nodes) + cls._db_update_to_0_2_0_set_node_pid(execute, table, nodes) @classmethod def _get_ctor_from_type(cls, t): diff --git a/src/Model/DIFAdisTS/DIFAdisTSSpec.py b/src/Model/DIFAdisTS/DIFAdisTSSpec.py index ac6e237b..d8f4c4f0 100644 --- a/src/Model/DIFAdisTS/DIFAdisTSSpec.py +++ b/src/Model/DIFAdisTS/DIFAdisTSSpec.py @@ -55,7 +55,7 @@ class DIFAdisTSSpec(SQLSubModel): DIFAdisTSSpec._id_cnt = max(DIFAdisTSSpec._id_cnt + 1, self.id) @classmethod - def _db_create(cls, execute): + def _db_create(cls, execute, ext=""): execute(f""" CREATE TABLE dif_adists_spec{ext}( {cls.create_db_add_pamhyr_id()}, diff --git a/src/Model/Friction/Friction.py b/src/Model/Friction/Friction.py index eac1f1b2..bd29ae85 100644 --- a/src/Model/Friction/Friction.py +++ b/src/Model/Friction/Friction.py @@ -78,7 +78,7 @@ class Friction(SQLSubModel): "RENAME COLUMN begin_kp TO begin_rk") execute("ALTER TABLE friction RENAME COLUMN end_kp TO end_rk") - cls._db_update_to_0_1_0(execute, data) + cls._db_update_to_0_2_0(execute, data) if major == "0" and minor == "1": if int(release) < 2: @@ -90,7 +90,7 @@ class Friction(SQLSubModel): return cls._update_submodel(execute, version, data) @classmethod - def _db_update_to_0_1_0(cls, execute, data): + def _db_update_to_0_2_0(cls, execute, data): table = "friction" reachs = data['id2pid']['river_reach'] stricklers = data['id2pid']['stricklers'] @@ -112,11 +112,11 @@ class Friction(SQLSubModel): execute(f"DROP TABLE {table}") execute(f"ALTER TABLE {table}_tmp RENAME TO {table}") - cls._db_update_to_0_1_0_set_reach_pid(execute, table, reachs) - cls._db_update_to_0_1_0_set_stricklers_pid(execute, table, stricklers) + cls._db_update_to_0_2_0_set_reach_pid(execute, table, reachs) + cls._db_update_to_0_2_0_set_stricklers_pid(execute, table, stricklers) @classmethod - def _db_update_to_0_1_0_set_stricklers_pid(cls, execute, table, + def _db_update_to_0_2_0_set_stricklers_pid(cls, execute, table, stricklers): els = execute( f"SELECT pamhyr_id, begin_strickler, end_strickler FROM {table}" diff --git a/src/Model/Geometry/PointXYZ.py b/src/Model/Geometry/PointXYZ.py index 38303df1..08d59d32 100644 --- a/src/Model/Geometry/PointXYZ.py +++ b/src/Model/Geometry/PointXYZ.py @@ -81,7 +81,7 @@ class PointXYZ(Point, SQLSubModel): """ ) - cls._db_update_to_0_1_0(execute, data) + cls._db_update_to_0_2_0(execute, data) if major == "0" and minor == "1": if int(release) < 2: @@ -93,7 +93,7 @@ class PointXYZ(Point, SQLSubModel): return cls._update_submodel(execute, version, data) @classmethod - def _db_update_to_0_1_0(cls, execute, data): + def _db_update_to_0_2_0(cls, execute, data): table = "geometry_pointXYZ" id2pid = data['id2pid'] profiles = id2pid['geometry_profileXYZ'] @@ -113,14 +113,14 @@ class PointXYZ(Point, SQLSubModel): execute(f"DROP TABLE {table}") execute(f"ALTER TABLE {table}_tmp RENAME TO {table}") - cls._db_update_to_0_1_0_set_profile_pid(execute, table, profiles) + cls._db_update_to_0_2_0_set_profile_pid(execute, table, profiles) if 'sedimentary_layer' in id2pid: sl = id2pid['sedimentary_layer'] - cls._db_update_to_0_1_0_set_sl_pid(execute, table, sl) + cls._db_update_to_0_2_0_set_sl_pid(execute, table, sl) @classmethod - def _db_update_to_0_1_0_set_profile_pid(cls, execute, table, profiles): + def _db_update_to_0_2_0_set_profile_pid(cls, execute, table, profiles): els = execute( f"SELECT pamhyr_id, profile FROM {table}" ) @@ -143,7 +143,7 @@ class PointXYZ(Point, SQLSubModel): ) @classmethod - def _db_update_to_0_1_0_set_sl_pid(cls, execute, table, sl): + def _db_update_to_0_2_0_set_sl_pid(cls, execute, table, sl): els = execute( f"SELECT pamhyr_id, sl FROM {table}" ) diff --git a/src/Model/Geometry/ProfileXYZ.py b/src/Model/Geometry/ProfileXYZ.py index 2781b773..18ebe64b 100644 --- a/src/Model/Geometry/ProfileXYZ.py +++ b/src/Model/Geometry/ProfileXYZ.py @@ -137,7 +137,7 @@ class ProfileXYZ(Profile, SQLSubModel): """ ) - cls._db_update_to_0_1_0(execute, data) + cls._db_update_to_0_2_0(execute, data) if major == "0" and minor == "1": if int(release) < 2: @@ -149,7 +149,7 @@ class ProfileXYZ(Profile, SQLSubModel): return cls._update_submodel(execute, version, data) @classmethod - def _db_update_to_0_1_0(cls, execute, data): + def _db_update_to_0_2_0(cls, execute, data): table = "geometry_profileXYZ" id2pid = data['id2pid'] reachs = id2pid['river_reach'] @@ -173,11 +173,11 @@ class ProfileXYZ(Profile, SQLSubModel): execute(f"DROP TABLE {table}") execute(f"ALTER TABLE {table}_tmp RENAME TO {table}") - cls._db_update_to_0_1_0_set_reach_pid(execute, table, reachs) + cls._db_update_to_0_2_0_set_reach_pid(execute, table, reachs) if 'sedimentary_layer' in id2pid: sl = id2pid['sedimentary_layer'] - cls._db_update_to_0_1_0_set_sl_pid(execute, table, sl) + cls._db_update_to_0_2_0_set_sl_pid(execute, table, sl) @classmethod def _db_update_cleanup_points(cls, execute): @@ -198,7 +198,7 @@ class ProfileXYZ(Profile, SQLSubModel): ) @classmethod - def _db_update_to_0_1_0_set_sl_pid(cls, execute, table, sl): + def _db_update_to_0_2_0_set_sl_pid(cls, execute, table, sl): els = execute( f"SELECT pamhyr_id, sl FROM {table}" ) diff --git a/src/Model/HydraulicStructures/Basic/HydraulicStructures.py b/src/Model/HydraulicStructures/Basic/HydraulicStructures.py index 771629f9..36b90970 100644 --- a/src/Model/HydraulicStructures/Basic/HydraulicStructures.py +++ b/src/Model/HydraulicStructures/Basic/HydraulicStructures.py @@ -78,7 +78,7 @@ class BasicHS(SQLSubModel): cls._db_create(execute) return True else: - cls._db_update_to_0_1_0(execute, data) + cls._db_update_to_0_2_0(execute, data) if major == "0" and minor == "1": if int(release) < 2: @@ -90,12 +90,12 @@ class BasicHS(SQLSubModel): return cls._update_submodel(execute, version, data) @classmethod - def _db_update_to_0_1_0(cls, execute, data): + def _db_update_to_0_2_0(cls, execute, data): table = "hydraulic_structures_basic" hs = data['id2pid']['hydraulic_structures'] cls.update_db_add_pamhyr_id(execute, table, data) - cls._db_update_to_0_1_0_set_hs_pid(execute, table, hs) + cls._db_update_to_0_2_0_set_hs_pid(execute, table, hs) Scenario.update_db_add_scenario(execute, table) cls._db_create(execute, ext="_tmp") @@ -111,7 +111,7 @@ class BasicHS(SQLSubModel): execute(f"ALTER TABLE {table}_tmp RENAME TO {table}") @classmethod - def _db_update_to_0_1_0_set_hs_pid(cls, execute, table, hs): + def _db_update_to_0_2_0_set_hs_pid(cls, execute, table, hs): els = execute( f"SELECT pamhyr_id, hs FROM {table}" ) diff --git a/src/Model/HydraulicStructures/Basic/Value.py b/src/Model/HydraulicStructures/Basic/Value.py index cf4bf40b..c78b56e0 100644 --- a/src/Model/HydraulicStructures/Basic/Value.py +++ b/src/Model/HydraulicStructures/Basic/Value.py @@ -62,17 +62,17 @@ class BHSValue(SQLSubModel): cls._db_create(execute) return True else: - cls._db_update_to_0_1_0(execute, data) + cls._db_update_to_0_2_0(execute, data) return cls._update_submodel(execute, version, data) @classmethod - def _db_update_to_0_1_0(cls, execute, data): + def _db_update_to_0_2_0(cls, execute, data): table = "hydraulic_structures_basic_value" bhs = data['id2pid']['hydraulic_structures_basic'] cls.update_db_add_pamhyr_id(execute, table, data) - cls._db_update_to_0_1_0_set_bhs_pid(execute, table, bhs) + cls._db_update_to_0_2_0_set_bhs_pid(execute, table, bhs) Scenario.update_db_add_scenario(execute, table) cls._db_create(execute, ext="_tmp") @@ -88,7 +88,7 @@ class BHSValue(SQLSubModel): execute(f"ALTER TABLE {table}_tmp RENAME TO {table}") @classmethod - def _db_update_to_0_1_0_set_bhs_pid(cls, execute, table, bhs): + def _db_update_to_0_2_0_set_bhs_pid(cls, execute, table, bhs): els = execute( f"SELECT pamhyr_id, bhs FROM {table}" ) diff --git a/src/Model/HydraulicStructures/HydraulicStructures.py b/src/Model/HydraulicStructures/HydraulicStructures.py index ec364fb8..0e95be9a 100644 --- a/src/Model/HydraulicStructures/HydraulicStructures.py +++ b/src/Model/HydraulicStructures/HydraulicStructures.py @@ -100,7 +100,7 @@ class HydraulicStructure(SQLSubModel): """ ) - cls._db_update_to_0_1_0(execute, data) + cls._db_update_to_0_2_0(execute, data) if major == "0" and minor == "1": if rl < 1: @@ -115,12 +115,12 @@ class HydraulicStructure(SQLSubModel): return cls._update_submodel(execute, version, data) @classmethod - def _db_update_to_0_1_0(cls, execute, data): + def _db_update_to_0_2_0(cls, execute, data): table = "hydraulic_structures" reachs = data['id2pid']['river_reach'] cls.update_db_add_pamhyr_id(execute, table, data) - cls._db_update_to_0_1_0_set_reach_pid(execute, table, reachs) + cls._db_update_to_0_2_0_set_reach_pid(execute, table, reachs) cls._db_update_to_0_1_1( execute, data, origin_version="0.0.*" @@ -143,7 +143,7 @@ class HydraulicStructure(SQLSubModel): execute(f"ALTER TABLE {table}_tmp RENAME TO {table}") @classmethod - def _db_update_to_0_1_0_set_reach_pid(cls, execute, table, reachs): + def _db_update_to_0_2_0_set_reach_pid(cls, execute, table, reachs): els = execute( f"SELECT pamhyr_id, input_reach, output_reach FROM {table}" ) diff --git a/src/Model/InitialConditions/InitialConditions.py b/src/Model/InitialConditions/InitialConditions.py index ddaa0b1a..16cd946f 100644 --- a/src/Model/InitialConditions/InitialConditions.py +++ b/src/Model/InitialConditions/InitialConditions.py @@ -89,7 +89,7 @@ class Data(SQLSubModel): "ALTER TABLE initial_conditions RENAME COLUMN kp TO rk" ) - cls._db_update_to_0_1_0(execute, data) + cls._db_update_to_0_2_0(execute, data) if major == "0" and minor == "1": if int(release) < 1: @@ -103,12 +103,12 @@ class Data(SQLSubModel): return cls._update_submodel(execute, version, data) @classmethod - def _db_update_to_0_1_0(cls, execute, data): + def _db_update_to_0_2_0(cls, execute, data): table = "initial_conditions" reachs = data['id2pid']['river_reach'] cls.update_db_add_pamhyr_id(execute, table, data) - cls._db_update_to_0_1_0_set_reach_pid(execute, table, reachs) + cls._db_update_to_0_2_0_set_reach_pid(execute, table, reachs) cls._db_update_to_0_1_1( execute, data, origin_version="0.0.*" diff --git a/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py b/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py index 3cd911b0..9b8de57b 100644 --- a/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py +++ b/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py @@ -109,7 +109,6 @@ class InitialConditionsAdisTS(SQLSubModel): cls._db_update_to_0_2_0_set_reach_pid(execute, table, reachs) - @classmethod def _db_load(cls, execute, data=None): new = [] diff --git a/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTSSpec.py b/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTSSpec.py index 45ceb73a..3953e99f 100644 --- a/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTSSpec.py +++ b/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTSSpec.py @@ -22,6 +22,7 @@ from tools import trace, timer from Model.Tools.PamhyrDB import SQLSubModel from Model.Except import NotImplementedMethodeError +from Model.Scenario import Scenario logger = logging.getLogger() diff --git a/src/Model/LateralContribution/LateralContribution.py b/src/Model/LateralContribution/LateralContribution.py index b600e7b8..31624da8 100644 --- a/src/Model/LateralContribution/LateralContribution.py +++ b/src/Model/LateralContribution/LateralContribution.py @@ -73,7 +73,7 @@ class Data(SQLSubModel): major, minor, release = version.strip().split(".") if major == minor == "0": - cls._db_update_to_0_1_0(execute, data) + cls._db_update_to_0_2_0(execute, data) if major == "0" and minor == "1": if int(release) < 2: @@ -85,7 +85,7 @@ class Data(SQLSubModel): return cls._update_submodel(execute, version, data) @classmethod - def _db_update_to_0_1_0(cls, execute, data=None): + def _db_update_to_0_2_0(cls, execute, data=None): table = "lateral_contribution_data" lcs = data['id2pid']['lateral_contribution'] @@ -103,10 +103,10 @@ class Data(SQLSubModel): execute(f"DROP TABLE {table}") execute(f"ALTER TABLE {table}_tmp RENAME TO {table}") - cls._db_update_to_0_1_0_set_lc_pid(execute, table, lcs) + cls._db_update_to_0_2_0_set_lc_pid(execute, table, lcs) @classmethod - def _db_update_to_0_1_0_set_lc_pid(cls, execute, table, lcs): + def _db_update_to_0_2_0_set_lc_pid(cls, execute, table, lcs): els = execute( f"SELECT pamhyr_id, lc FROM {table}" ) @@ -270,7 +270,7 @@ class LateralContribution(SQLSubModel): """ ) - cls._db_update_to_0_1_0(execute, data) + cls._db_update_to_0_2_0(execute, data) if major == "0" and minor == "1": if int(release) < 2: @@ -282,7 +282,7 @@ class LateralContribution(SQLSubModel): return cls._update_submodel(execute, version, data) @classmethod - def _db_update_to_0_1_0(cls, execute, data): + def _db_update_to_0_2_0(cls, execute, data): table = "lateral_contribution" reachs = data['id2pid']['river_reach'] @@ -301,7 +301,7 @@ class LateralContribution(SQLSubModel): execute(f"DROP TABLE {table}") execute(f"ALTER TABLE {table}_tmp RENAME TO {table}") - cls._db_update_to_0_1_0_set_reach_pid(execute, table, reachs) + cls._db_update_to_0_2_0_set_reach_pid(execute, table, reachs) @classmethod def _get_ctor_from_type(cls, t): diff --git a/src/Model/Reservoir/Reservoir.py b/src/Model/Reservoir/Reservoir.py index 2210cdff..83f87f4c 100644 --- a/src/Model/Reservoir/Reservoir.py +++ b/src/Model/Reservoir/Reservoir.py @@ -64,7 +64,7 @@ class Data(SQLSubModel): if major == minor == "0": if int(release) > 5: - cls._db_update_to_0_1_0(execute, data) + cls._db_update_to_0_2_0(execute, data) if major == "0" and int(minor) <= 1: if int(release) < 2: @@ -76,7 +76,7 @@ class Data(SQLSubModel): return cls._update_submodel(execute, version, data) @classmethod - def _db_update_to_0_1_0(cls, execute, data): + def _db_update_to_0_2_0(cls, execute, data): table = "reservoir_data" id2pid = data['id2pid'] @@ -99,12 +99,12 @@ class Data(SQLSubModel): if 'reservoir' in id2pid: reservoirs = id2pid['reservoir'] - cls._db_update_to_0_1_0_set_reservoir_pid( + cls._db_update_to_0_2_0_set_reservoir_pid( execute, table, reservoirs ) @classmethod - def _db_update_to_0_1_0_set_reservoir_pid(cls, execute, table, reservoirs): + def _db_update_to_0_2_0_set_reservoir_pid(cls, execute, table, reservoirs): bcs = execute( f"SELECT pamhyr_id, reservoir FROM {table}" ) @@ -241,7 +241,7 @@ class Reservoir(SQLSubModel): cls._db_create(execute) return True - cls._db_update_to_0_1_0(execute, data) + cls._db_update_to_0_2_0(execute, data) if major == "0" and minor == "1": if int(release) < 2: @@ -253,12 +253,12 @@ class Reservoir(SQLSubModel): return cls._update_submodel(execute, version, data) @classmethod - def _db_update_to_0_1_0(cls, execute, data): + def _db_update_to_0_2_0(cls, execute, data): table = "reservoir" nodes = data['id2pid']['river_node'] cls.update_db_add_pamhyr_id(execute, table, data=data) - cls._db_update_to_0_1_0_set_node_pid(execute, table, nodes) + cls._db_update_to_0_2_0_set_node_pid(execute, table, nodes) Scenario.update_db_add_scenario(execute, table) print(execute(f"SELECT * FROM {table}")) diff --git a/src/Model/River.py b/src/Model/River.py index cb4696a6..b51d61b6 100644 --- a/src/Model/River.py +++ b/src/Model/River.py @@ -101,7 +101,7 @@ class RiverNode(Node): major, minor, release = version.strip().split(".") if major == minor == "0": - cls._db_update_to_0_1_0(execute, data=data) + cls._db_update_to_0_2_0(execute, data=data) if major == "0" and minor == "1": if int(release) < 2: @@ -113,7 +113,7 @@ class RiverNode(Node): return cls._update_submodel(execute, version, data) @classmethod - def _db_update_to_0_1_0(cls, execute, data=None): + def _db_update_to_0_2_0(cls, execute, data=None): table = "river_node" cls.update_db_add_pamhyr_id(execute, table, data) @@ -250,7 +250,7 @@ class RiverReach(Edge): major, minor, release = version.strip().split(".") if major == minor == "0": - cls._db_update_to_0_1_0(execute, data) + cls._db_update_to_0_2_0(execute, data) if major == "0" and minor == "1": if int(release) < 2: @@ -262,7 +262,7 @@ class RiverReach(Edge): return cls._update_submodel(execute, version, data) @classmethod - def _db_update_to_0_1_0(cls, execute, data=None): + def _db_update_to_0_2_0(cls, execute, data=None): table = "river_reach" nodes = data['id2pid']['river_node'] @@ -282,10 +282,10 @@ class RiverReach(Edge): execute(f"DROP TABLE {table}") execute(f"ALTER TABLE {table}_tmp RENAME TO {table}") - cls._db_update_to_0_1_0_set_node_pid(execute, table, nodes) + cls._db_update_to_0_2_0_set_node_pid(execute, table, nodes) @classmethod - def _db_update_to_0_1_0_set_node_pid(cls, execute, table, nodes): + def _db_update_to_0_2_0_set_node_pid(cls, execute, table, nodes): bcs = execute( f"SELECT pamhyr_id, node1, node2 FROM {table}" ) diff --git a/src/Model/SedimentLayer/SedimentLayer.py b/src/Model/SedimentLayer/SedimentLayer.py index fbf007ae..9918a9ff 100644 --- a/src/Model/SedimentLayer/SedimentLayer.py +++ b/src/Model/SedimentLayer/SedimentLayer.py @@ -130,7 +130,7 @@ class Layer(SQLSubModel): cls._db_create(execute) return True else: - cls._db_update_to_0_1_0(execute, data) + cls._db_update_to_0_2_0(execute, data) if major == "0" and minor == "1": if int(release) < 2: @@ -142,7 +142,7 @@ class Layer(SQLSubModel): return cls._update_submodel(execute, version, data) @classmethod - def _db_update_to_0_1_0(cls, execute, data): + def _db_update_to_0_2_0(cls, execute, data): table = "sedimentary_layer_layer" sl = data['id2pid']['sedimentary_layer'] @@ -163,10 +163,10 @@ class Layer(SQLSubModel): execute(f"DROP TABLE {table}") execute(f"ALTER TABLE {table}_tmp RENAME TO {table}") - cls._db_update_to_0_1_0_set_sl_pid(execute, table, sl) + cls._db_update_to_0_2_0_set_sl_pid(execute, table, sl) @classmethod - def _db_update_to_0_1_0_set_sl_pid(cls, execute, table, sl): + def _db_update_to_0_2_0_set_sl_pid(cls, execute, table, sl): els = execute( f"SELECT pamhyr_id, sl FROM {table}" ) @@ -365,7 +365,7 @@ class SedimentLayer(SQLSubModel): cls._db_create(execute) return True else: - cls._db_update_to_0_1_0(execute, data) + cls._db_update_to_0_2_0(execute, data) if major == "0" and minor == "1": if int(release) < 2: @@ -377,7 +377,7 @@ class SedimentLayer(SQLSubModel): return cls._update_submodel(execute, version, data) @classmethod - def _db_update_to_0_1_0(cls, execute, data): + def _db_update_to_0_2_0(cls, execute, data): table = "sedimentary_layer" cls.update_db_add_pamhyr_id(execute, table, data) diff --git a/src/Model/Stricklers/Stricklers.py b/src/Model/Stricklers/Stricklers.py index fd3f3903..5aa4a9d1 100644 --- a/src/Model/Stricklers/Stricklers.py +++ b/src/Model/Stricklers/Stricklers.py @@ -64,7 +64,7 @@ class Stricklers(SQLSubModel): def _db_update(cls, execute, version, data=None): major, minor, release = version.strip().split(".") if major == minor == "0": - cls._db_update_to_0_1_0(execute, data) + cls._db_update_to_0_2_0(execute, data) if major == "0" and minor == "1": if int(release) < 2: @@ -76,7 +76,7 @@ class Stricklers(SQLSubModel): return cls._update_submodel(execute, version, data) @classmethod - def _db_update_to_0_1_0(cls, execute, data): + def _db_update_to_0_2_0(cls, execute, data): table = "stricklers" cls.update_db_add_pamhyr_id(execute, table, data) diff --git a/src/Model/Tools/PamhyrDB.py b/src/Model/Tools/PamhyrDB.py index 6878ee26..6f5d7bb9 100644 --- a/src/Model/Tools/PamhyrDB.py +++ b/src/Model/Tools/PamhyrDB.py @@ -278,7 +278,7 @@ class SQLSubModel(PamhyrID): raise NotImplementedMethodeError(cls, cls._db_update) @classmethod - def _db_update_to_0_1_0_set_node_pid(cls, execute, table, nodes): + def _db_update_to_0_2_0_set_node_pid(cls, execute, table, nodes): els = execute( f"SELECT pamhyr_id, node FROM {table}" ) @@ -298,7 +298,7 @@ class SQLSubModel(PamhyrID): ) @classmethod - def _db_update_to_0_1_0_set_reach_pid(cls, execute, table, reachs): + def _db_update_to_0_2_0_set_reach_pid(cls, execute, table, reachs): els = execute( f"SELECT pamhyr_id, reach FROM {table}" )