mirror of https://gitlab.com/pamhyr/pamhyr2
Scenarios: Change update version number for scenarios from 0.1.0 to 0.2.0.
parent
ae49908a42
commit
00c9ecde52
|
|
@ -72,7 +72,7 @@ class Data(SQLSubModel):
|
||||||
major, minor, release = version.strip().split(".")
|
major, minor, release = version.strip().split(".")
|
||||||
|
|
||||||
if major == "0" and int(minor) < 1:
|
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 major == "0" and minor == "1":
|
||||||
if int(release) < 2:
|
if int(release) < 2:
|
||||||
|
|
@ -84,7 +84,7 @@ class Data(SQLSubModel):
|
||||||
return cls._update_submodel(execute, version, data)
|
return cls._update_submodel(execute, version, data)
|
||||||
|
|
||||||
@classmethod
|
@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"
|
table = "boundary_condition_data"
|
||||||
bcs = data['id2pid']['boundary_condition']
|
bcs = data['id2pid']['boundary_condition']
|
||||||
|
|
||||||
|
|
@ -105,10 +105,10 @@ class Data(SQLSubModel):
|
||||||
execute(f"DROP TABLE {table}")
|
execute(f"DROP TABLE {table}")
|
||||||
execute(f"ALTER TABLE {table}_tmp RENAME TO {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
|
@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(
|
els = execute(
|
||||||
f"SELECT pamhyr_id, bc FROM {table}"
|
f"SELECT pamhyr_id, bc FROM {table}"
|
||||||
)
|
)
|
||||||
|
|
@ -249,7 +249,7 @@ class BoundaryCondition(SQLSubModel):
|
||||||
major, minor, release = version.strip().split(".")
|
major, minor, release = version.strip().split(".")
|
||||||
|
|
||||||
if major == minor == "0":
|
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 major == "0" and minor == "1":
|
||||||
if int(release) < 2:
|
if int(release) < 2:
|
||||||
|
|
@ -261,7 +261,7 @@ class BoundaryCondition(SQLSubModel):
|
||||||
return cls._update_submodel(execute, version, data)
|
return cls._update_submodel(execute, version, data)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def _db_update_to_0_1_0(cls, execute, data):
|
def _db_update_to_0_2_0(cls, execute, data):
|
||||||
table = "boundary_condition"
|
table = "boundary_condition"
|
||||||
nodes = data['id2pid']['river_node']
|
nodes = data['id2pid']['river_node']
|
||||||
|
|
||||||
|
|
@ -281,7 +281,7 @@ class BoundaryCondition(SQLSubModel):
|
||||||
execute(f"DROP TABLE {table}")
|
execute(f"DROP TABLE {table}")
|
||||||
execute(f"ALTER TABLE {table}_tmp RENAME TO {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
|
@classmethod
|
||||||
def _get_ctor_from_type(cls, t):
|
def _get_ctor_from_type(cls, t):
|
||||||
|
|
|
||||||
|
|
@ -55,7 +55,7 @@ class DIFAdisTSSpec(SQLSubModel):
|
||||||
DIFAdisTSSpec._id_cnt = max(DIFAdisTSSpec._id_cnt + 1, self.id)
|
DIFAdisTSSpec._id_cnt = max(DIFAdisTSSpec._id_cnt + 1, self.id)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def _db_create(cls, execute):
|
def _db_create(cls, execute, ext=""):
|
||||||
execute(f"""
|
execute(f"""
|
||||||
CREATE TABLE dif_adists_spec{ext}(
|
CREATE TABLE dif_adists_spec{ext}(
|
||||||
{cls.create_db_add_pamhyr_id()},
|
{cls.create_db_add_pamhyr_id()},
|
||||||
|
|
|
||||||
|
|
@ -78,7 +78,7 @@ class Friction(SQLSubModel):
|
||||||
"RENAME COLUMN begin_kp TO begin_rk")
|
"RENAME COLUMN begin_kp TO begin_rk")
|
||||||
execute("ALTER TABLE friction RENAME COLUMN end_kp TO end_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 major == "0" and minor == "1":
|
||||||
if int(release) < 2:
|
if int(release) < 2:
|
||||||
|
|
@ -90,7 +90,7 @@ class Friction(SQLSubModel):
|
||||||
return cls._update_submodel(execute, version, data)
|
return cls._update_submodel(execute, version, data)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def _db_update_to_0_1_0(cls, execute, data):
|
def _db_update_to_0_2_0(cls, execute, data):
|
||||||
table = "friction"
|
table = "friction"
|
||||||
reachs = data['id2pid']['river_reach']
|
reachs = data['id2pid']['river_reach']
|
||||||
stricklers = data['id2pid']['stricklers']
|
stricklers = data['id2pid']['stricklers']
|
||||||
|
|
@ -112,11 +112,11 @@ class Friction(SQLSubModel):
|
||||||
execute(f"DROP TABLE {table}")
|
execute(f"DROP TABLE {table}")
|
||||||
execute(f"ALTER TABLE {table}_tmp RENAME TO {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)
|
||||||
cls._db_update_to_0_1_0_set_stricklers_pid(execute, table, stricklers)
|
cls._db_update_to_0_2_0_set_stricklers_pid(execute, table, stricklers)
|
||||||
|
|
||||||
@classmethod
|
@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):
|
stricklers):
|
||||||
els = execute(
|
els = execute(
|
||||||
f"SELECT pamhyr_id, begin_strickler, end_strickler FROM {table}"
|
f"SELECT pamhyr_id, begin_strickler, end_strickler FROM {table}"
|
||||||
|
|
|
||||||
|
|
@ -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 major == "0" and minor == "1":
|
||||||
if int(release) < 2:
|
if int(release) < 2:
|
||||||
|
|
@ -93,7 +93,7 @@ class PointXYZ(Point, SQLSubModel):
|
||||||
return cls._update_submodel(execute, version, data)
|
return cls._update_submodel(execute, version, data)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def _db_update_to_0_1_0(cls, execute, data):
|
def _db_update_to_0_2_0(cls, execute, data):
|
||||||
table = "geometry_pointXYZ"
|
table = "geometry_pointXYZ"
|
||||||
id2pid = data['id2pid']
|
id2pid = data['id2pid']
|
||||||
profiles = id2pid['geometry_profileXYZ']
|
profiles = id2pid['geometry_profileXYZ']
|
||||||
|
|
@ -113,14 +113,14 @@ class PointXYZ(Point, SQLSubModel):
|
||||||
execute(f"DROP TABLE {table}")
|
execute(f"DROP TABLE {table}")
|
||||||
execute(f"ALTER TABLE {table}_tmp RENAME TO {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:
|
if 'sedimentary_layer' in id2pid:
|
||||||
sl = id2pid['sedimentary_layer']
|
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
|
@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(
|
els = execute(
|
||||||
f"SELECT pamhyr_id, profile FROM {table}"
|
f"SELECT pamhyr_id, profile FROM {table}"
|
||||||
)
|
)
|
||||||
|
|
@ -143,7 +143,7 @@ class PointXYZ(Point, SQLSubModel):
|
||||||
)
|
)
|
||||||
|
|
||||||
@classmethod
|
@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(
|
els = execute(
|
||||||
f"SELECT pamhyr_id, sl FROM {table}"
|
f"SELECT pamhyr_id, sl FROM {table}"
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -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 major == "0" and minor == "1":
|
||||||
if int(release) < 2:
|
if int(release) < 2:
|
||||||
|
|
@ -149,7 +149,7 @@ class ProfileXYZ(Profile, SQLSubModel):
|
||||||
return cls._update_submodel(execute, version, data)
|
return cls._update_submodel(execute, version, data)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def _db_update_to_0_1_0(cls, execute, data):
|
def _db_update_to_0_2_0(cls, execute, data):
|
||||||
table = "geometry_profileXYZ"
|
table = "geometry_profileXYZ"
|
||||||
id2pid = data['id2pid']
|
id2pid = data['id2pid']
|
||||||
reachs = id2pid['river_reach']
|
reachs = id2pid['river_reach']
|
||||||
|
|
@ -173,11 +173,11 @@ class ProfileXYZ(Profile, SQLSubModel):
|
||||||
execute(f"DROP TABLE {table}")
|
execute(f"DROP TABLE {table}")
|
||||||
execute(f"ALTER TABLE {table}_tmp RENAME TO {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:
|
if 'sedimentary_layer' in id2pid:
|
||||||
sl = id2pid['sedimentary_layer']
|
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
|
@classmethod
|
||||||
def _db_update_cleanup_points(cls, execute):
|
def _db_update_cleanup_points(cls, execute):
|
||||||
|
|
@ -198,7 +198,7 @@ class ProfileXYZ(Profile, SQLSubModel):
|
||||||
)
|
)
|
||||||
|
|
||||||
@classmethod
|
@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(
|
els = execute(
|
||||||
f"SELECT pamhyr_id, sl FROM {table}"
|
f"SELECT pamhyr_id, sl FROM {table}"
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -78,7 +78,7 @@ class BasicHS(SQLSubModel):
|
||||||
cls._db_create(execute)
|
cls._db_create(execute)
|
||||||
return True
|
return True
|
||||||
else:
|
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 major == "0" and minor == "1":
|
||||||
if int(release) < 2:
|
if int(release) < 2:
|
||||||
|
|
@ -90,12 +90,12 @@ class BasicHS(SQLSubModel):
|
||||||
return cls._update_submodel(execute, version, data)
|
return cls._update_submodel(execute, version, data)
|
||||||
|
|
||||||
@classmethod
|
@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"
|
table = "hydraulic_structures_basic"
|
||||||
hs = data['id2pid']['hydraulic_structures']
|
hs = data['id2pid']['hydraulic_structures']
|
||||||
|
|
||||||
cls.update_db_add_pamhyr_id(execute, table, data)
|
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)
|
Scenario.update_db_add_scenario(execute, table)
|
||||||
|
|
||||||
cls._db_create(execute, ext="_tmp")
|
cls._db_create(execute, ext="_tmp")
|
||||||
|
|
@ -111,7 +111,7 @@ class BasicHS(SQLSubModel):
|
||||||
execute(f"ALTER TABLE {table}_tmp RENAME TO {table}")
|
execute(f"ALTER TABLE {table}_tmp RENAME TO {table}")
|
||||||
|
|
||||||
@classmethod
|
@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(
|
els = execute(
|
||||||
f"SELECT pamhyr_id, hs FROM {table}"
|
f"SELECT pamhyr_id, hs FROM {table}"
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -62,17 +62,17 @@ class BHSValue(SQLSubModel):
|
||||||
cls._db_create(execute)
|
cls._db_create(execute)
|
||||||
return True
|
return True
|
||||||
else:
|
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)
|
return cls._update_submodel(execute, version, data)
|
||||||
|
|
||||||
@classmethod
|
@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"
|
table = "hydraulic_structures_basic_value"
|
||||||
bhs = data['id2pid']['hydraulic_structures_basic']
|
bhs = data['id2pid']['hydraulic_structures_basic']
|
||||||
|
|
||||||
cls.update_db_add_pamhyr_id(execute, table, data)
|
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)
|
Scenario.update_db_add_scenario(execute, table)
|
||||||
|
|
||||||
cls._db_create(execute, ext="_tmp")
|
cls._db_create(execute, ext="_tmp")
|
||||||
|
|
@ -88,7 +88,7 @@ class BHSValue(SQLSubModel):
|
||||||
execute(f"ALTER TABLE {table}_tmp RENAME TO {table}")
|
execute(f"ALTER TABLE {table}_tmp RENAME TO {table}")
|
||||||
|
|
||||||
@classmethod
|
@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(
|
els = execute(
|
||||||
f"SELECT pamhyr_id, bhs FROM {table}"
|
f"SELECT pamhyr_id, bhs FROM {table}"
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -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 major == "0" and minor == "1":
|
||||||
if rl < 1:
|
if rl < 1:
|
||||||
|
|
@ -115,12 +115,12 @@ class HydraulicStructure(SQLSubModel):
|
||||||
return cls._update_submodel(execute, version, data)
|
return cls._update_submodel(execute, version, data)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def _db_update_to_0_1_0(cls, execute, data):
|
def _db_update_to_0_2_0(cls, execute, data):
|
||||||
table = "hydraulic_structures"
|
table = "hydraulic_structures"
|
||||||
reachs = data['id2pid']['river_reach']
|
reachs = data['id2pid']['river_reach']
|
||||||
|
|
||||||
cls.update_db_add_pamhyr_id(execute, table, data)
|
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(
|
cls._db_update_to_0_1_1(
|
||||||
execute, data,
|
execute, data,
|
||||||
origin_version="0.0.*"
|
origin_version="0.0.*"
|
||||||
|
|
@ -143,7 +143,7 @@ class HydraulicStructure(SQLSubModel):
|
||||||
execute(f"ALTER TABLE {table}_tmp RENAME TO {table}")
|
execute(f"ALTER TABLE {table}_tmp RENAME TO {table}")
|
||||||
|
|
||||||
@classmethod
|
@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(
|
els = execute(
|
||||||
f"SELECT pamhyr_id, input_reach, output_reach FROM {table}"
|
f"SELECT pamhyr_id, input_reach, output_reach FROM {table}"
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -89,7 +89,7 @@ class Data(SQLSubModel):
|
||||||
"ALTER TABLE initial_conditions RENAME COLUMN kp TO rk"
|
"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 major == "0" and minor == "1":
|
||||||
if int(release) < 1:
|
if int(release) < 1:
|
||||||
|
|
@ -103,12 +103,12 @@ class Data(SQLSubModel):
|
||||||
return cls._update_submodel(execute, version, data)
|
return cls._update_submodel(execute, version, data)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def _db_update_to_0_1_0(cls, execute, data):
|
def _db_update_to_0_2_0(cls, execute, data):
|
||||||
table = "initial_conditions"
|
table = "initial_conditions"
|
||||||
reachs = data['id2pid']['river_reach']
|
reachs = data['id2pid']['river_reach']
|
||||||
|
|
||||||
cls.update_db_add_pamhyr_id(execute, table, data)
|
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(
|
cls._db_update_to_0_1_1(
|
||||||
execute, data,
|
execute, data,
|
||||||
origin_version="0.0.*"
|
origin_version="0.0.*"
|
||||||
|
|
|
||||||
|
|
@ -109,7 +109,6 @@ class InitialConditionsAdisTS(SQLSubModel):
|
||||||
|
|
||||||
cls._db_update_to_0_2_0_set_reach_pid(execute, table, reachs)
|
cls._db_update_to_0_2_0_set_reach_pid(execute, table, reachs)
|
||||||
|
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def _db_load(cls, execute, data=None):
|
def _db_load(cls, execute, data=None):
|
||||||
new = []
|
new = []
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,7 @@ from tools import trace, timer
|
||||||
|
|
||||||
from Model.Tools.PamhyrDB import SQLSubModel
|
from Model.Tools.PamhyrDB import SQLSubModel
|
||||||
from Model.Except import NotImplementedMethodeError
|
from Model.Except import NotImplementedMethodeError
|
||||||
|
from Model.Scenario import Scenario
|
||||||
|
|
||||||
logger = logging.getLogger()
|
logger = logging.getLogger()
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -73,7 +73,7 @@ class Data(SQLSubModel):
|
||||||
major, minor, release = version.strip().split(".")
|
major, minor, release = version.strip().split(".")
|
||||||
|
|
||||||
if major == minor == "0":
|
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 major == "0" and minor == "1":
|
||||||
if int(release) < 2:
|
if int(release) < 2:
|
||||||
|
|
@ -85,7 +85,7 @@ class Data(SQLSubModel):
|
||||||
return cls._update_submodel(execute, version, data)
|
return cls._update_submodel(execute, version, data)
|
||||||
|
|
||||||
@classmethod
|
@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"
|
table = "lateral_contribution_data"
|
||||||
lcs = data['id2pid']['lateral_contribution']
|
lcs = data['id2pid']['lateral_contribution']
|
||||||
|
|
||||||
|
|
@ -103,10 +103,10 @@ class Data(SQLSubModel):
|
||||||
execute(f"DROP TABLE {table}")
|
execute(f"DROP TABLE {table}")
|
||||||
execute(f"ALTER TABLE {table}_tmp RENAME TO {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
|
@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(
|
els = execute(
|
||||||
f"SELECT pamhyr_id, lc FROM {table}"
|
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 major == "0" and minor == "1":
|
||||||
if int(release) < 2:
|
if int(release) < 2:
|
||||||
|
|
@ -282,7 +282,7 @@ class LateralContribution(SQLSubModel):
|
||||||
return cls._update_submodel(execute, version, data)
|
return cls._update_submodel(execute, version, data)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def _db_update_to_0_1_0(cls, execute, data):
|
def _db_update_to_0_2_0(cls, execute, data):
|
||||||
table = "lateral_contribution"
|
table = "lateral_contribution"
|
||||||
reachs = data['id2pid']['river_reach']
|
reachs = data['id2pid']['river_reach']
|
||||||
|
|
||||||
|
|
@ -301,7 +301,7 @@ class LateralContribution(SQLSubModel):
|
||||||
execute(f"DROP TABLE {table}")
|
execute(f"DROP TABLE {table}")
|
||||||
execute(f"ALTER TABLE {table}_tmp RENAME TO {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
|
@classmethod
|
||||||
def _get_ctor_from_type(cls, t):
|
def _get_ctor_from_type(cls, t):
|
||||||
|
|
|
||||||
|
|
@ -64,7 +64,7 @@ class Data(SQLSubModel):
|
||||||
|
|
||||||
if major == minor == "0":
|
if major == minor == "0":
|
||||||
if int(release) > 5:
|
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 major == "0" and int(minor) <= 1:
|
||||||
if int(release) < 2:
|
if int(release) < 2:
|
||||||
|
|
@ -76,7 +76,7 @@ class Data(SQLSubModel):
|
||||||
return cls._update_submodel(execute, version, data)
|
return cls._update_submodel(execute, version, data)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def _db_update_to_0_1_0(cls, execute, data):
|
def _db_update_to_0_2_0(cls, execute, data):
|
||||||
table = "reservoir_data"
|
table = "reservoir_data"
|
||||||
id2pid = data['id2pid']
|
id2pid = data['id2pid']
|
||||||
|
|
||||||
|
|
@ -99,12 +99,12 @@ class Data(SQLSubModel):
|
||||||
|
|
||||||
if 'reservoir' in id2pid:
|
if 'reservoir' in id2pid:
|
||||||
reservoirs = id2pid['reservoir']
|
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
|
execute, table, reservoirs
|
||||||
)
|
)
|
||||||
|
|
||||||
@classmethod
|
@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(
|
bcs = execute(
|
||||||
f"SELECT pamhyr_id, reservoir FROM {table}"
|
f"SELECT pamhyr_id, reservoir FROM {table}"
|
||||||
)
|
)
|
||||||
|
|
@ -241,7 +241,7 @@ class Reservoir(SQLSubModel):
|
||||||
cls._db_create(execute)
|
cls._db_create(execute)
|
||||||
return True
|
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 major == "0" and minor == "1":
|
||||||
if int(release) < 2:
|
if int(release) < 2:
|
||||||
|
|
@ -253,12 +253,12 @@ class Reservoir(SQLSubModel):
|
||||||
return cls._update_submodel(execute, version, data)
|
return cls._update_submodel(execute, version, data)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def _db_update_to_0_1_0(cls, execute, data):
|
def _db_update_to_0_2_0(cls, execute, data):
|
||||||
table = "reservoir"
|
table = "reservoir"
|
||||||
nodes = data['id2pid']['river_node']
|
nodes = data['id2pid']['river_node']
|
||||||
|
|
||||||
cls.update_db_add_pamhyr_id(execute, table, data=data)
|
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)
|
Scenario.update_db_add_scenario(execute, table)
|
||||||
|
|
||||||
print(execute(f"SELECT * FROM {table}"))
|
print(execute(f"SELECT * FROM {table}"))
|
||||||
|
|
|
||||||
|
|
@ -101,7 +101,7 @@ class RiverNode(Node):
|
||||||
major, minor, release = version.strip().split(".")
|
major, minor, release = version.strip().split(".")
|
||||||
|
|
||||||
if major == minor == "0":
|
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 major == "0" and minor == "1":
|
||||||
if int(release) < 2:
|
if int(release) < 2:
|
||||||
|
|
@ -113,7 +113,7 @@ class RiverNode(Node):
|
||||||
return cls._update_submodel(execute, version, data)
|
return cls._update_submodel(execute, version, data)
|
||||||
|
|
||||||
@classmethod
|
@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"
|
table = "river_node"
|
||||||
|
|
||||||
cls.update_db_add_pamhyr_id(execute, table, data)
|
cls.update_db_add_pamhyr_id(execute, table, data)
|
||||||
|
|
@ -250,7 +250,7 @@ class RiverReach(Edge):
|
||||||
major, minor, release = version.strip().split(".")
|
major, minor, release = version.strip().split(".")
|
||||||
|
|
||||||
if major == minor == "0":
|
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 major == "0" and minor == "1":
|
||||||
if int(release) < 2:
|
if int(release) < 2:
|
||||||
|
|
@ -262,7 +262,7 @@ class RiverReach(Edge):
|
||||||
return cls._update_submodel(execute, version, data)
|
return cls._update_submodel(execute, version, data)
|
||||||
|
|
||||||
@classmethod
|
@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"
|
table = "river_reach"
|
||||||
nodes = data['id2pid']['river_node']
|
nodes = data['id2pid']['river_node']
|
||||||
|
|
||||||
|
|
@ -282,10 +282,10 @@ class RiverReach(Edge):
|
||||||
execute(f"DROP TABLE {table}")
|
execute(f"DROP TABLE {table}")
|
||||||
execute(f"ALTER TABLE {table}_tmp RENAME TO {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
|
@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(
|
bcs = execute(
|
||||||
f"SELECT pamhyr_id, node1, node2 FROM {table}"
|
f"SELECT pamhyr_id, node1, node2 FROM {table}"
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -130,7 +130,7 @@ class Layer(SQLSubModel):
|
||||||
cls._db_create(execute)
|
cls._db_create(execute)
|
||||||
return True
|
return True
|
||||||
else:
|
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 major == "0" and minor == "1":
|
||||||
if int(release) < 2:
|
if int(release) < 2:
|
||||||
|
|
@ -142,7 +142,7 @@ class Layer(SQLSubModel):
|
||||||
return cls._update_submodel(execute, version, data)
|
return cls._update_submodel(execute, version, data)
|
||||||
|
|
||||||
@classmethod
|
@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"
|
table = "sedimentary_layer_layer"
|
||||||
sl = data['id2pid']['sedimentary_layer']
|
sl = data['id2pid']['sedimentary_layer']
|
||||||
|
|
||||||
|
|
@ -163,10 +163,10 @@ class Layer(SQLSubModel):
|
||||||
execute(f"DROP TABLE {table}")
|
execute(f"DROP TABLE {table}")
|
||||||
execute(f"ALTER TABLE {table}_tmp RENAME TO {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
|
@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(
|
els = execute(
|
||||||
f"SELECT pamhyr_id, sl FROM {table}"
|
f"SELECT pamhyr_id, sl FROM {table}"
|
||||||
)
|
)
|
||||||
|
|
@ -365,7 +365,7 @@ class SedimentLayer(SQLSubModel):
|
||||||
cls._db_create(execute)
|
cls._db_create(execute)
|
||||||
return True
|
return True
|
||||||
else:
|
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 major == "0" and minor == "1":
|
||||||
if int(release) < 2:
|
if int(release) < 2:
|
||||||
|
|
@ -377,7 +377,7 @@ class SedimentLayer(SQLSubModel):
|
||||||
return cls._update_submodel(execute, version, data)
|
return cls._update_submodel(execute, version, data)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def _db_update_to_0_1_0(cls, execute, data):
|
def _db_update_to_0_2_0(cls, execute, data):
|
||||||
table = "sedimentary_layer"
|
table = "sedimentary_layer"
|
||||||
|
|
||||||
cls.update_db_add_pamhyr_id(execute, table, data)
|
cls.update_db_add_pamhyr_id(execute, table, data)
|
||||||
|
|
|
||||||
|
|
@ -64,7 +64,7 @@ class Stricklers(SQLSubModel):
|
||||||
def _db_update(cls, execute, version, data=None):
|
def _db_update(cls, execute, version, data=None):
|
||||||
major, minor, release = version.strip().split(".")
|
major, minor, release = version.strip().split(".")
|
||||||
if major == minor == "0":
|
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 major == "0" and minor == "1":
|
||||||
if int(release) < 2:
|
if int(release) < 2:
|
||||||
|
|
@ -76,7 +76,7 @@ class Stricklers(SQLSubModel):
|
||||||
return cls._update_submodel(execute, version, data)
|
return cls._update_submodel(execute, version, data)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def _db_update_to_0_1_0(cls, execute, data):
|
def _db_update_to_0_2_0(cls, execute, data):
|
||||||
table = "stricklers"
|
table = "stricklers"
|
||||||
|
|
||||||
cls.update_db_add_pamhyr_id(execute, table, data)
|
cls.update_db_add_pamhyr_id(execute, table, data)
|
||||||
|
|
|
||||||
|
|
@ -278,7 +278,7 @@ class SQLSubModel(PamhyrID):
|
||||||
raise NotImplementedMethodeError(cls, cls._db_update)
|
raise NotImplementedMethodeError(cls, cls._db_update)
|
||||||
|
|
||||||
@classmethod
|
@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(
|
els = execute(
|
||||||
f"SELECT pamhyr_id, node FROM {table}"
|
f"SELECT pamhyr_id, node FROM {table}"
|
||||||
)
|
)
|
||||||
|
|
@ -298,7 +298,7 @@ class SQLSubModel(PamhyrID):
|
||||||
)
|
)
|
||||||
|
|
||||||
@classmethod
|
@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(
|
els = execute(
|
||||||
f"SELECT pamhyr_id, reach FROM {table}"
|
f"SELECT pamhyr_id, reach FROM {table}"
|
||||||
)
|
)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue