mirror of https://gitlab.com/pamhyr/pamhyr2
Adists: Fix update.
parent
3ef13666dc
commit
072840a18c
|
|
@ -82,7 +82,10 @@ class D90AdisTS(SQLSubModel):
|
||||||
if not created:
|
if not created:
|
||||||
cls._db_update_to_0_2_0(execute, data)
|
cls._db_update_to_0_2_0(execute, data)
|
||||||
|
|
||||||
return cls._update_submodel(execute, version, data)
|
if not created:
|
||||||
|
return cls._update_submodel(execute, version, data)
|
||||||
|
|
||||||
|
return True
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def _db_update_to_0_2_0(cls, execute, data):
|
def _db_update_to_0_2_0(cls, execute, data):
|
||||||
|
|
@ -184,7 +187,7 @@ class D90AdisTS(SQLSubModel):
|
||||||
|
|
||||||
data['d90_default_id'] = self.id
|
data['d90_default_id'] = self.id
|
||||||
execute(
|
execute(
|
||||||
"DELETE FROM d90_spec " +
|
"DELETE FROM d90_adists_spec " +
|
||||||
f"WHERE d90_default = {self.id} " +
|
f"WHERE d90_default = {self.id} " +
|
||||||
f"AND scenario = {self._status.scenario_id} "
|
f"AND scenario = {self._status.scenario_id} "
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -88,7 +88,10 @@ class DIFAdisTS(SQLSubModel):
|
||||||
if not created:
|
if not created:
|
||||||
cls._db_update_to_0_2_0(execute, data)
|
cls._db_update_to_0_2_0(execute, data)
|
||||||
|
|
||||||
return cls._update_submodel(execute, version, data)
|
if not created:
|
||||||
|
return cls._update_submodel(execute, version, data)
|
||||||
|
|
||||||
|
return True
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def _db_update_to_0_2_0(cls, execute, data):
|
def _db_update_to_0_2_0(cls, execute, data):
|
||||||
|
|
|
||||||
|
|
@ -230,7 +230,10 @@ class LateralContributionAdisTS(SQLSubModel):
|
||||||
)
|
)
|
||||||
""")
|
""")
|
||||||
|
|
||||||
return True
|
if ext != "":
|
||||||
|
return True
|
||||||
|
|
||||||
|
return cls._create_submodel(execute)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def _db_update(cls, execute, version, data=None):
|
def _db_update(cls, execute, version, data=None):
|
||||||
|
|
@ -246,7 +249,10 @@ class LateralContributionAdisTS(SQLSubModel):
|
||||||
if not created:
|
if not created:
|
||||||
cls._db_update_to_0_2_0(execute, data)
|
cls._db_update_to_0_2_0(execute, data)
|
||||||
|
|
||||||
return cls._update_submodel(execute, version, data)
|
if not created:
|
||||||
|
return cls._update_submodel(execute, version, data)
|
||||||
|
|
||||||
|
return True
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def _db_update_to_0_2_0(cls, execute, data):
|
def _db_update_to_0_2_0(cls, execute, data):
|
||||||
|
|
|
||||||
|
|
@ -171,6 +171,9 @@ class Layer(SQLSubModel):
|
||||||
f"SELECT pamhyr_id, sl FROM {table}"
|
f"SELECT pamhyr_id, sl FROM {table}"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if els is None:
|
||||||
|
return True
|
||||||
|
|
||||||
for row in els:
|
for row in els:
|
||||||
it = iter(row)
|
it = iter(row)
|
||||||
pid = next(it)
|
pid = next(it)
|
||||||
|
|
|
||||||
|
|
@ -303,6 +303,9 @@ class SQLSubModel(PamhyrID):
|
||||||
f"SELECT pamhyr_id, reach FROM {table}"
|
f"SELECT pamhyr_id, reach FROM {table}"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if els is None:
|
||||||
|
return True
|
||||||
|
|
||||||
for row in els:
|
for row in els:
|
||||||
it = iter(row)
|
it = iter(row)
|
||||||
pid = next(it)
|
pid = next(it)
|
||||||
|
|
@ -317,6 +320,8 @@ class SQLSubModel(PamhyrID):
|
||||||
f"WHERE pamhyr_id = {pid}"
|
f"WHERE pamhyr_id = {pid}"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
return True
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def _db_update_to_0_1_1_assoc_section_from_rk(
|
def _db_update_to_0_1_1_assoc_section_from_rk(
|
||||||
cls, execute, table,
|
cls, execute, table,
|
||||||
|
|
|
||||||
|
|
@ -64,6 +64,9 @@ class PamhyrID(object):
|
||||||
id2pid = cls.update_db_add_pamhyr_id_init_id2pid(table, data)
|
id2pid = cls.update_db_add_pamhyr_id_init_id2pid(table, data)
|
||||||
rows = execute(f"SELECT id FROM {table}")
|
rows = execute(f"SELECT id FROM {table}")
|
||||||
|
|
||||||
|
if rows is None:
|
||||||
|
return True
|
||||||
|
|
||||||
for row in rows:
|
for row in rows:
|
||||||
id = row[0]
|
id = row[0]
|
||||||
pid = cls.get_new_pamhyr_id(-1)
|
pid = cls.get_new_pamhyr_id(-1)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue