diff --git a/src/Model/Friction/Friction.py b/src/Model/Friction/Friction.py index 8eb575b01819ef92c11f6cad025134830fe94931..e8cfed55c8a38524f2b7a61c89abfa4513ce592c 100644 --- a/src/Model/Friction/Friction.py +++ b/src/Model/Friction/Friction.py @@ -75,8 +75,8 @@ class Friction(SQLSubModel): if major == minor == "0": if int(release) < 11: execute("ALTER TABLE friction " + - "RENAME COLUMN begin_rk TO begin_rk") - execute("ALTER TABLE friction RENAME COLUMN end_rk TO end_rk") + "RENAME COLUMN begin_kp TO begin_rk") + execute("ALTER TABLE friction RENAME COLUMN end_kp TO end_rk") return True diff --git a/src/Model/Geometry/ProfileXYZ.py b/src/Model/Geometry/ProfileXYZ.py index f4ca99c4c4e9a263f43d2c38c146b92171c814aa..bb3faa0b7eba7908f72b5eb4d004e94ec24cbab0 100644 --- a/src/Model/Geometry/ProfileXYZ.py +++ b/src/Model/Geometry/ProfileXYZ.py @@ -108,7 +108,7 @@ class ProfileXYZ(Profile, SQLSubModel): execute( """ ALTER TABLE geometry_profileXYZ - RENAME COLUMN rk TO rk + RENAME COLUMN kp TO rk """ ) diff --git a/src/Model/HydraulicStructures/HydraulicStructures.py b/src/Model/HydraulicStructures/HydraulicStructures.py index 579e0802fe04f2842671015b5ae46402ef103be6..5bb77af0f3a3846e636470ce778c6b70efe671cc 100644 --- a/src/Model/HydraulicStructures/HydraulicStructures.py +++ b/src/Model/HydraulicStructures/HydraulicStructures.py @@ -94,13 +94,13 @@ class HydraulicStructure(SQLSubModel): execute( """ ALTER TABLE hydraulic_structures - RENAME COLUMN input_rk TO input_rk + RENAME COLUMN input_kp TO input_rk """ ) execute( """ ALTER TABLE hydraulic_structures - RENAME COLUMN output_rk TO output_rk + RENAME COLUMN output_kp TO output_rk """ ) diff --git a/src/Model/InitialConditions/InitialConditions.py b/src/Model/InitialConditions/InitialConditions.py index c396a9cd4bdd1b2b2738cbd2d298824853afe991..b069a5dbc5489853d51171461379351ec215f590 100644 --- a/src/Model/InitialConditions/InitialConditions.py +++ b/src/Model/InitialConditions/InitialConditions.py @@ -80,7 +80,7 @@ class Data(SQLSubModel): if major == minor == "0": if int(release) < 11: execute( - "ALTER TABLE initial_conditions RENAME COLUMN rk TO rk" + "ALTER TABLE initial_conditions RENAME COLUMN kp TO rk" ) return cls._update_submodel(execute, version) diff --git a/src/Model/LateralContribution/LateralContribution.py b/src/Model/LateralContribution/LateralContribution.py index 2196d8357476733f3cd9f24245cdeaba626b4a9c..bfed1d14ca97567049a2fb698803e690df288a35 100644 --- a/src/Model/LateralContribution/LateralContribution.py +++ b/src/Model/LateralContribution/LateralContribution.py @@ -93,13 +93,13 @@ class LateralContribution(SQLSubModel): execute( """ ALTER TABLE lateral_contribution - RENAME COLUMN begin_rk TO begin_rk + RENAME COLUMN begin_kp TO begin_rk """ ) execute( """ ALTER TABLE lateral_contribution - RENAME COLUMN end_rk TO end_rk + RENAME COLUMN end_kp TO end_rk """ ) diff --git a/src/Model/Tools/PamhyrDB.py b/src/Model/Tools/PamhyrDB.py index 94eab5430d87882b438e25eff104334771f92a10..75498546ba0d4ef1bd8b4064c91a3ed43fad969f 100644 --- a/src/Model/Tools/PamhyrDB.py +++ b/src/Model/Tools/PamhyrDB.py @@ -50,6 +50,7 @@ class SQLModel(SQL): self._create() # Create db # self._save() # Save else: + logger.info("Update database") self._update() # Update db scheme if necessary # self._load() # Load data diff --git a/tests_cases/Saar/Saar.pamhyr b/tests_cases/Saar/Saar.pamhyr index b3d09b083450c3ff500b91e1f2fc2de2a179d9f9..9f1c08bfece12cf21069193a611f9ba41d04fc5b 100644 Binary files a/tests_cases/Saar/Saar.pamhyr and b/tests_cases/Saar/Saar.pamhyr differ