From d1400f12a6ed712543b3acc1ffe096b63ed0c197 Mon Sep 17 00:00:00 2001
From: Theophile Terraz <theophile.terraz@inrae.fr>
Date: Fri, 20 Dec 2024 15:41:19 +0100
Subject: [PATCH] debug
---
src/Model/Friction/Friction.py | 4 ++--
src/Model/Geometry/ProfileXYZ.py | 2 +-
.../HydraulicStructures.py | 4 ++--
.../InitialConditions/InitialConditions.py | 2 +-
.../LateralContribution.py | 4 ++--
src/Model/Tools/PamhyrDB.py | 1 +
tests_cases/Saar/Saar.pamhyr | Bin 212992 -> 278528 bytes
7 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/Model/Friction/Friction.py b/src/Model/Friction/Friction.py
index 8eb575b0..e8cfed55 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 f4ca99c4..bb3faa0b 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 579e0802..5bb77af0 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 c396a9cd..b069a5db 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 2196d835..bfed1d14 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 94eab543..75498546 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
GIT binary patch
delta 2973
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
V5!(j~tAyzhq(;FtYLuKi_aD+1<{|(9
delta 1718
zcmZ9LeM}Q)9LMkJUGJ_^d|;@xFSH!cVtHxrdIdx$Z;Fae#Nfmwi?<t`*w`1>7o%Gi
zicU}mPHaN|S)6~HxdFGqAB$PCm;aWSWiN@@;voJ(w(O5-7MDe%`(1mbu%`W9`gy*;
zx96TGoi0zOORw9@X@Vev@GE?_OgD-ZG~w&GZv=$!Q*EIPKUK^5No>RBQoNI3%~J$E
zfPLmE{1sln863l}&yA(b>K(@?hU55W0vEDrv52%=&nodmC>G^?yiX9yS+Wi%lBwbI
zQd|iuazf#&8Pe+y%Za3vkk2a8u$)wcRv{n+w>Jm3``W}nTd*y2!?hRHPmg(KmJp><
zRZJ&pQq6DNz;ff%OHim`k_WAS{}8D6>S@qzS52UGS3IDe%iW;vi4&l;<L`jhj9Wpg
zFSUYl@4X6Ibuj_zx>yG4ywC(%Io1p6P+!F6G3r<6M_;Q#LDhWg2ka6jVz3k#*UAZ(
zv=aQqcR~FZj)D5r=by5?ZIHm{@V$+<OZSv?m<CNo`Y+==)o1t`4XRa3J~Z8LQu~%i
z4TjTaGGi-M@K7H;yhaxPW*$9ss9&yJM<#`4EPg*4Kd&DDeH^JPf9yq?O<O<s=K|^4
zFhZD#c7nabd`o|9Tq2*5ThTWgt>y)yz2x?W+37B)I`w!0sVDxSSUoV4evzi2*WT%|
zp2hTch%u;}{_f5-18GgMRPszJDdme~`kyeFTTkwOhNv>K-*7X_l%XU2rVFNHrhv)F
zK42HvY4#M`!j>@inR(_K6K3`?we(~9E`6CEpgqQajXxScG>#Yp)Klsw>LV&fbyIe7
zg`6YbCXbLF!*jzu!_B#|Cy4d;(*)XG!DT<UqMD7;N%^$W+H_cBn9D9(5vMaxAFyU%
zB{pQ!nfDN|oxprHRN0!3t$PJnE9Pn<@`xfOPKA{4a6%f2hmxVUQi_nHxgyO6!8icH
z=WNJ}^TELbz<Mnlm;Kd-td2xzBq9quoa16xpcgDX7B2e>)NKFXqI*9q`YSkB&OaPV
zB<1LkBJG#8yHL#0un%l)o4IVG9l7*be0za)06S_&)jA9I0NZEfvZHpiO=q=xfC<p{
ztQ~FDS@UjSz2N)aj=YxqC}Ou3YvHW9vJv@Qw$p(&Tc8hq%_fLl;5rQ1L<g$Vv$b>r
z8z|?pLk?6g=Cjpw0Bfk=wiL2SC*!fyup;=H*NoK;rd<%Y;8-22VVBMx6q)!kFs&$E
zxmr}*sk4?fY=_QH78&0LtQTTuDp9SFZ;smz%v;Xk)#jq1q!Jg_?08KpSfKyxawW3p
zb5^wga|1(8v`J^x&A^%<z0--d=*%4iCIZ{#L{^>gA~3BD$%$%p<_!STPUEB#RTg}L
z?wc?A>UdxRyy@SZ$Uds?uOFBnb98QmWGJE}lFAwB%}{jB5FVdq+RPc(o04%^Y~k1V
z+)bLVf}`^L5sFHMgu=R0*a)_xU8Ni;hr`lPEE18U!%{dDRU|n+l8PwNWFnU#cU`I*
z!0onh2F+Z^C$7I6_4PDi^18X~7cS(~Uyj#H6KtKE)51dVUUIQK&+jOFizOECSkd6j
O1T|||q-M!yAN&W|2+#8X
--
GitLab