Compare commits

..

No commits in common. "7e080767da9ecac9bc21f5182c7682bf6a27aa3b" and "26dc7d8761b1f90484ce5e7fb717252fd08136e8" have entirely different histories.

10 changed files with 71 additions and 20 deletions

View File

@ -71,7 +71,11 @@ class Data(SQLSubModel):
major, minor, release = version.strip().split(".") major, minor, release = version.strip().split(".")
created = False created = False
if major == "0" and minor == "0": if major == "0" and minor == "0":
if int(release) < 11: cls._db_create(execute)
created = True
if major == "0" and minor == "1":
if int(release) < 7:
cls._db_create(execute) cls._db_create(execute)
created = True created = True
@ -249,7 +253,11 @@ class BoundaryConditionAdisTS(SQLSubModel):
created = False created = False
if major == "0" and minor == "0": if major == "0" and minor == "0":
if int(release) < 11: cls._db_create(execute)
created = True
if major == "0" and minor == "1":
if int(release) < 7:
cls._db_create(execute) cls._db_create(execute)
created = True created = True

View File

@ -74,7 +74,11 @@ class D90AdisTS(SQLSubModel):
created = False created = False
if major == "0" and minor == "0": if major == "0" and minor == "0":
if int(release) < 11: cls._db_create(execute)
created = True
if major == "0" and minor == "1":
if int(release) < 6:
cls._db_create(execute) cls._db_create(execute)
created = True created = True

View File

@ -72,8 +72,13 @@ class D90AdisTSSpec(SQLSubModel):
major, minor, release = version.strip().split(".") major, minor, release = version.strip().split(".")
created = False created = False
if major == "0" and minor == "0": if major == "0" and minor == "0":
if int(release) < 11: cls._db_create(execute)
created = True
if major == "0" and minor == "1":
if int(release) < 6:
cls._db_create(execute) cls._db_create(execute)
created = True created = True
@ -95,10 +100,8 @@ class D90AdisTSSpec(SQLSubModel):
execute( execute(
f"INSERT INTO {table_new}_tmp " + f"INSERT INTO {table_new}_tmp " +
"(pamhyr_id, d90_default, name, reach, " + "(pamhyr_id, name, d90, enabled, scenario) " +
" start_rk, end_rk, d90, enabled, scenario) " + "SELECT pamhyr_id, name, d90, enabled, scenario " +
"SELECT pamhyr_id, d90_default, name, reach, " +
" start_rk, end_rk, d90, enabled, scenario " +
f"FROM {table}" f"FROM {table}"
) )
@ -111,7 +114,7 @@ class D90AdisTSSpec(SQLSubModel):
def _db_update_to_0_2_0_set_d90_pid(cls, execute, data): def _db_update_to_0_2_0_set_d90_pid(cls, execute, data):
pid_d90 = data["id2pid"]["d90_adists"] pid_d90 = data["id2pid"]["d90_adists"]
els = execute( els = execute(
f"SELECT pamhyr_id, d90_default FROM d90_adists_spec" f"SELECT pamhyr_id, d90 FROM d90_adists_spec"
) )
for row in els: for row in els:
@ -124,7 +127,7 @@ class D90AdisTSSpec(SQLSubModel):
execute( execute(
f"UPDATE d90_adists_spec" + f"UPDATE d90_adists_spec" +
f"SET d90_default = {pid_d90[d90_id]} " + f"SET d90 = {pid_d90[d90_id]} " +
f"WHERE pamhyr_id = {pid}" f"WHERE pamhyr_id = {pid}"
) )

View File

@ -80,7 +80,11 @@ class DIFAdisTS(SQLSubModel):
created = False created = False
if major == "0" and minor == "0": if major == "0" and minor == "0":
if int(release) < 11: cls._db_create(execute)
created = True
if major == "0" and minor == "1":
if int(release) < 6:
cls._db_create(execute) cls._db_create(execute)
created = True created = True

View File

@ -84,7 +84,11 @@ class DIFAdisTSSpec(SQLSubModel):
created = False created = False
if major == "0" and minor == "0": if major == "0" and minor == "0":
if int(release) < 11: cls._db_create(execute)
created = True
if major == "0" and minor == "1":
if int(release) < 6:
cls._db_create(execute) cls._db_create(execute)
created = True created = True

View File

@ -82,7 +82,11 @@ class InitialConditionsAdisTS(SQLSubModel):
created = False created = False
if major == "0" and minor == "0": if major == "0" and minor == "0":
if int(release) < 11: cls._db_create(execute)
created = True
if major == "0" and minor == "1":
if int(release) < 6:
cls._db_create(execute) cls._db_create(execute)
created = True created = True

View File

@ -80,7 +80,11 @@ class ICAdisTSSpec(SQLSubModel):
created = False created = False
if major == "0" and minor == "0": if major == "0" and minor == "0":
if int(release) < 11: cls._db_create(execute)
created = True
if major == "0" and minor == "1":
if int(release) < 7:
cls._db_create(execute) cls._db_create(execute)
created = True created = True

View File

@ -70,7 +70,11 @@ class Data(SQLSubModel):
created = False created = False
if major == "0" and minor == "0": if major == "0" and minor == "0":
if int(release) < 11: cls._db_create(execute)
created = True
if major == "0" and minor == "1":
if int(release) < 7:
cls._db_create(execute) cls._db_create(execute)
created = True created = True
@ -244,7 +248,11 @@ class LateralContributionAdisTS(SQLSubModel):
created = False created = False
if major == "0" and minor == "0": if major == "0" and minor == "0":
if int(release) < 11: cls._db_create(execute)
created = True
if major == "0" and minor == "1":
if int(release) < 7:
cls._db_create(execute) cls._db_create(execute)
created = True created = True

View File

@ -98,7 +98,11 @@ class OutputRKAdists(SQLSubModel):
created = False created = False
if major == "0" and minor == "0": if major == "0" and minor == "0":
if int(release) < 11: cls._db_create(execute)
created = True
if major == "0" and minor == "1":
if int(release) < 7:
cls._db_create(execute) cls._db_create(execute)
created = True created = True

View File

@ -153,7 +153,11 @@ class PollutantCharacteristics(SQLSubModel):
created = False created = False
if major == "0" and minor == "0": if major == "0" and minor == "0":
if int(release) < 11: cls._db_create(execute)
created = True
if major == "0" and minor == "1":
if int(release) < 7:
cls._db_create(execute) cls._db_create(execute)
created = True created = True
@ -383,7 +387,11 @@ class Pollutants(SQLSubModel):
created = False created = False
if major == "0" and minor == "0": if major == "0" and minor == "0":
if int(release) < 11: cls._db_create(execute)
created = True
if major == "0" and minor == "1":
if int(release) < 7:
cls._db_create(execute) cls._db_create(execute)
created = True created = True