mirror of https://gitlab.com/pamhyr/pamhyr2
AdisTS: Fix db update.
parent
c3faf45f75
commit
7aa0cf4361
|
|
@ -70,8 +70,11 @@ class Data(SQLSubModel):
|
|||
def _db_update(cls, execute, version, data=None):
|
||||
major, minor, release = version.strip().split(".")
|
||||
created = False
|
||||
|
||||
if major == "0" and minor == "0":
|
||||
cls._db_create(execute)
|
||||
created = True
|
||||
|
||||
if major == "0" and minor == "1":
|
||||
if int(release) < 7:
|
||||
cls._db_create(execute)
|
||||
created = True
|
||||
|
|
@ -250,6 +253,10 @@ class BoundaryConditionAdisTS(SQLSubModel):
|
|||
created = False
|
||||
|
||||
if major == "0" and minor == "0":
|
||||
cls._db_create(execute)
|
||||
created = True
|
||||
|
||||
if major == "0" and minor == "1":
|
||||
if int(release) < 7:
|
||||
cls._db_create(execute)
|
||||
created = True
|
||||
|
|
|
|||
|
|
@ -73,7 +73,11 @@ class D90AdisTS(SQLSubModel):
|
|||
major, minor, release = version.strip().split(".")
|
||||
created = False
|
||||
|
||||
if major == "0" and int(minor) <= 1:
|
||||
if major == "0" and minor == "0":
|
||||
cls._db_create(execute)
|
||||
created = True
|
||||
|
||||
if major == "0" and minor == "1":
|
||||
if int(release) < 6:
|
||||
cls._db_create(execute)
|
||||
created = True
|
||||
|
|
|
|||
|
|
@ -72,7 +72,12 @@ class D90AdisTSSpec(SQLSubModel):
|
|||
major, minor, release = version.strip().split(".")
|
||||
created = False
|
||||
|
||||
if major == 0 and minor < 1:
|
||||
|
||||
if major == "0" and minor == "0":
|
||||
cls._db_create(execute)
|
||||
created = True
|
||||
|
||||
if major == "0" and minor == "1":
|
||||
if int(release) < 6:
|
||||
cls._db_create(execute)
|
||||
created = True
|
||||
|
|
|
|||
|
|
@ -79,7 +79,11 @@ class DIFAdisTS(SQLSubModel):
|
|||
major, minor, release = version.strip().split(".")
|
||||
created = False
|
||||
|
||||
if major == "0" and int(minor) <= 1:
|
||||
if major == "0" and minor == "0":
|
||||
cls._db_create(execute)
|
||||
created = True
|
||||
|
||||
if major == "0" and minor == "1":
|
||||
if int(release) < 6:
|
||||
cls._db_create(execute)
|
||||
created = True
|
||||
|
|
|
|||
|
|
@ -83,7 +83,11 @@ class DIFAdisTSSpec(SQLSubModel):
|
|||
major, minor, release = version.strip().split(".")
|
||||
created = False
|
||||
|
||||
if major == 0 and minor < 1:
|
||||
if major == "0" and minor == "0":
|
||||
cls._db_create(execute)
|
||||
created = True
|
||||
|
||||
if major == "0" and minor == "1":
|
||||
if int(release) < 6:
|
||||
cls._db_create(execute)
|
||||
created = True
|
||||
|
|
|
|||
|
|
@ -81,7 +81,11 @@ class InitialConditionsAdisTS(SQLSubModel):
|
|||
major, minor, release = version.strip().split(".")
|
||||
created = False
|
||||
|
||||
if major == "0" and int(minor) <= 1:
|
||||
if major == "0" and minor == "0":
|
||||
cls._db_create(execute)
|
||||
created = True
|
||||
|
||||
if major == "0" and minor == "1":
|
||||
if int(release) < 6:
|
||||
cls._db_create(execute)
|
||||
created = True
|
||||
|
|
|
|||
|
|
@ -79,8 +79,12 @@ class ICAdisTSSpec(SQLSubModel):
|
|||
major, minor, release = version.strip().split(".")
|
||||
created = False
|
||||
|
||||
if major == 0 and minor < 1:
|
||||
if int(release) < 6:
|
||||
if major == "0" and minor == "0":
|
||||
cls._db_create(execute)
|
||||
created = True
|
||||
|
||||
if major == "0" and minor == "1":
|
||||
if int(release) < 7:
|
||||
cls._db_create(execute)
|
||||
created = True
|
||||
|
||||
|
|
|
|||
|
|
@ -69,7 +69,11 @@ class Data(SQLSubModel):
|
|||
major, minor, release = version.strip().split(".")
|
||||
created = False
|
||||
|
||||
if major == "0" and int(minor) <= 1:
|
||||
if major == "0" and minor == "0":
|
||||
cls._db_create(execute)
|
||||
created = True
|
||||
|
||||
if major == "0" and minor == "1":
|
||||
if int(release) < 7:
|
||||
cls._db_create(execute)
|
||||
created = True
|
||||
|
|
@ -243,7 +247,11 @@ class LateralContributionAdisTS(SQLSubModel):
|
|||
major, minor, release = version.strip().split(".")
|
||||
created = False
|
||||
|
||||
if major == "0" and int(minor) <= 1:
|
||||
if major == "0" and minor == "0":
|
||||
cls._db_create(execute)
|
||||
created = True
|
||||
|
||||
if major == "0" and minor == "1":
|
||||
if int(release) < 7:
|
||||
cls._db_create(execute)
|
||||
created = True
|
||||
|
|
|
|||
|
|
@ -97,7 +97,11 @@ class OutputRKAdists(SQLSubModel):
|
|||
major, minor, release = version.strip().split(".")
|
||||
created = False
|
||||
|
||||
if major == "0" and int(minor) <= 1:
|
||||
if major == "0" and minor == "0":
|
||||
cls._db_create(execute)
|
||||
created = True
|
||||
|
||||
if major == "0" and minor == "1":
|
||||
if int(release) < 7:
|
||||
cls._db_create(execute)
|
||||
created = True
|
||||
|
|
|
|||
|
|
@ -152,7 +152,11 @@ class PollutantCharacteristics(SQLSubModel):
|
|||
major, minor, release = version.strip().split(".")
|
||||
created = False
|
||||
|
||||
if major == "0" and int(minor) <= 1:
|
||||
if major == "0" and minor == "0":
|
||||
cls._db_create(execute)
|
||||
created = True
|
||||
|
||||
if major == "0" and minor == "1":
|
||||
if int(release) < 7:
|
||||
cls._db_create(execute)
|
||||
created = True
|
||||
|
|
@ -344,19 +348,21 @@ class Pollutants(SQLSubModel):
|
|||
|
||||
@data.setter
|
||||
def data(self, data):
|
||||
self._data = [PollutantCharacteristics(type=int(data[0]),
|
||||
diametre=float(data[1]),
|
||||
rho=float(data[2]),
|
||||
porosity=float(data[3]),
|
||||
cdc_riv=float(data[4]),
|
||||
cdc_cas=float(data[5]),
|
||||
apd=float(data[6]),
|
||||
ac=float(data[7]),
|
||||
bc=float(data[8]),
|
||||
pollutant=self,
|
||||
status=self._status
|
||||
)
|
||||
]
|
||||
self._data = [
|
||||
PollutantCharacteristics(
|
||||
type=int(data[0]),
|
||||
diametre=float(data[1]),
|
||||
rho=float(data[2]),
|
||||
porosity=float(data[3]),
|
||||
cdc_riv=float(data[4]),
|
||||
cdc_cas=float(data[5]),
|
||||
apd=float(data[6]),
|
||||
ac=float(data[7]),
|
||||
bc=float(data[8]),
|
||||
pollutant=self,
|
||||
status=self._status
|
||||
)
|
||||
]
|
||||
|
||||
@classmethod
|
||||
def _db_create(cls, execute, ext=""):
|
||||
|
|
@ -380,7 +386,11 @@ class Pollutants(SQLSubModel):
|
|||
major, minor, release = version.strip().split(".")
|
||||
created = False
|
||||
|
||||
if major == "0" and int(minor) <= 1:
|
||||
if major == "0" and minor == "0":
|
||||
cls._db_create(execute)
|
||||
created = True
|
||||
|
||||
if major == "0" and minor == "1":
|
||||
if int(release) < 7:
|
||||
cls._db_create(execute)
|
||||
created = True
|
||||
|
|
|
|||
Loading…
Reference in New Issue