mirror of
https://gitlab.com/pamhyr/pamhyr2.git
synced 2026-10-30 03:20:41 +01:00
AdistTS: Fix update with table exists tests.
This commit is contained in:
1 parent
e79ae8ebf5
commit
229b3da2d1
11 files changed
+50
-78
No files matched your search
@@ -248,15 +248,13 @@ class BoundaryConditionAdisTS(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 int(minor) < 2:
|
||||||
if int(release) < 11:
|
if cls.is_table_exists(execute, "boundary_condition_adists"):
|
||||||
|
cls._db_update_to_0_2_0(execute, data)
|
||||||
|
else:
|
||||||
cls._db_create(execute)
|
cls._db_create(execute)
|
||||||
created = True
|
created = True
|
||||||
|
|
||||||
if major == "0" and int(minor) < 2:
|
|
||||||
if not created:
|
|
||||||
cls._db_update_to_0_2_0(execute, data)
|
|
||||||
|
|
||||||
if not created:
|
if not created:
|
||||||
return cls._update_submodel(execute, version, data)
|
return cls._update_submodel(execute, version, data)
|
||||||
|
|
||||||
|
|||||||
@@ -73,15 +73,13 @@ class D90AdisTS(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 int(minor) < 2:
|
||||||
if int(release) < 11:
|
if cls.is_table_exists(execute, "d90_adists"):
|
||||||
|
cls._db_update_to_0_2_0(execute, data)
|
||||||
|
else:
|
||||||
cls._db_create(execute)
|
cls._db_create(execute)
|
||||||
created = True
|
created = True
|
||||||
|
|
||||||
if major == "0" and int(minor) < 2:
|
|
||||||
if not created:
|
|
||||||
cls._db_update_to_0_2_0(execute, data)
|
|
||||||
|
|
||||||
if not created:
|
if not created:
|
||||||
return cls._update_submodel(execute, version, data)
|
return cls._update_submodel(execute, version, data)
|
||||||
|
|
||||||
|
|||||||
@@ -70,16 +70,12 @@ class D90AdisTSSpec(SQLSubModel):
|
|||||||
@classmethod
|
@classmethod
|
||||||
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(".")
|
||||||
created = False
|
|
||||||
|
|
||||||
if major == "0" and minor == "0":
|
|
||||||
if int(release) < 11:
|
|
||||||
cls._db_create(execute)
|
|
||||||
created = True
|
|
||||||
|
|
||||||
if major == "0" and int(minor) < 2:
|
if major == "0" and int(minor) < 2:
|
||||||
if not created:
|
if cls.is_table_exists(execute, "d90_spec"):
|
||||||
cls._db_update_to_0_2_0(execute, data)
|
cls._db_update_to_0_2_0(execute, data)
|
||||||
|
else:
|
||||||
|
cls._db_create(execute)
|
||||||
|
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|||||||
@@ -79,15 +79,13 @@ class DIFAdisTS(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 int(minor) < 2:
|
||||||
if int(release) < 11:
|
if cls.is_table_exists(execute, "dif_adists"):
|
||||||
|
cls._db_update_to_0_2_0(execute, data)
|
||||||
|
else:
|
||||||
cls._db_create(execute)
|
cls._db_create(execute)
|
||||||
created = True
|
created = True
|
||||||
|
|
||||||
if major == "0" and int(minor) < 2:
|
|
||||||
if not created:
|
|
||||||
cls._db_update_to_0_2_0(execute, data)
|
|
||||||
|
|
||||||
if not created:
|
if not created:
|
||||||
return cls._update_submodel(execute, version, data)
|
return cls._update_submodel(execute, version, data)
|
||||||
|
|
||||||
|
|||||||
@@ -81,16 +81,12 @@ class DIFAdisTSSpec(SQLSubModel):
|
|||||||
@classmethod
|
@classmethod
|
||||||
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(".")
|
||||||
created = False
|
|
||||||
|
|
||||||
if major == "0" and minor == "0":
|
|
||||||
if int(release) < 11:
|
|
||||||
cls._db_create(execute)
|
|
||||||
created = True
|
|
||||||
|
|
||||||
if major == "0" and int(minor) < 2:
|
if major == "0" and int(minor) < 2:
|
||||||
if not created:
|
if cls.is_table_exists(execute, "dif_spec"):
|
||||||
cls._db_update_to_0_2_0(execute, data)
|
cls._db_update_to_0_2_0(execute, data)
|
||||||
|
else:
|
||||||
|
cls._db_create(execute)
|
||||||
|
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|||||||
@@ -79,16 +79,12 @@ class InitialConditionsAdisTS(SQLSubModel):
|
|||||||
@classmethod
|
@classmethod
|
||||||
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(".")
|
||||||
created = False
|
|
||||||
|
|
||||||
if major == "0" and minor == "0":
|
|
||||||
if int(release) < 11:
|
|
||||||
cls._db_create(execute)
|
|
||||||
created = True
|
|
||||||
|
|
||||||
if major == "0" and int(minor) < 2:
|
if major == "0" and int(minor) < 2:
|
||||||
if not created:
|
if cls.is_table_exists(execute, "initial_conditions_adists"):
|
||||||
cls._db_update_to_0_2_0(execute, data)
|
cls._db_update_to_0_2_0(execute, data)
|
||||||
|
else:
|
||||||
|
cls._db_create(execute)
|
||||||
|
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|||||||
@@ -77,16 +77,12 @@ class ICAdisTSSpec(SQLSubModel):
|
|||||||
@classmethod
|
@classmethod
|
||||||
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(".")
|
||||||
created = False
|
|
||||||
|
|
||||||
if major == "0" and minor == "0":
|
|
||||||
if int(release) < 11:
|
|
||||||
cls._db_create(execute)
|
|
||||||
created = True
|
|
||||||
|
|
||||||
if major == "0" and int(minor) < 2:
|
if major == "0" and int(minor) < 2:
|
||||||
if not created:
|
if cls.is_table_exists(execute, "initial_conditions_adists_spec"):
|
||||||
cls._db_update_to_0_2_0(execute, data)
|
cls._db_update_to_0_2_0(execute, data)
|
||||||
|
else:
|
||||||
|
cls._db_create(execute)
|
||||||
|
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|||||||
@@ -69,14 +69,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 int(release) < 11:
|
|
||||||
cls._db_create(execute)
|
|
||||||
created = True
|
|
||||||
|
|
||||||
if major == "0" and int(minor) < 2:
|
if major == "0" and int(minor) < 2:
|
||||||
if not created:
|
if cls.is_table_exists(execute, "lateral_contribution_data_adists"):
|
||||||
cls._db_update_to_0_2_0(execute, data)
|
cls._db_update_to_0_2_0(execute, data)
|
||||||
|
else:
|
||||||
|
cls._db_create(execute)
|
||||||
|
|
||||||
return True
|
return True
|
||||||
|
|
||||||
@@ -243,15 +240,13 @@ class LateralContributionAdisTS(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 int(minor) < 2:
|
||||||
if int(release) < 11:
|
if cls.is_table_exists(execute, "lateral_contribution_adists"):
|
||||||
|
cls._db_update_to_0_2_0(execute, data)
|
||||||
|
else:
|
||||||
cls._db_create(execute)
|
cls._db_create(execute)
|
||||||
created = True
|
created = True
|
||||||
|
|
||||||
if major == "0" and int(minor) < 2:
|
|
||||||
if not created:
|
|
||||||
cls._db_update_to_0_2_0(execute, data)
|
|
||||||
|
|
||||||
if not created:
|
if not created:
|
||||||
return cls._update_submodel(execute, version, data)
|
return cls._update_submodel(execute, version, data)
|
||||||
|
|
||||||
|
|||||||
@@ -95,16 +95,12 @@ class OutputRKAdists(SQLSubModel):
|
|||||||
@classmethod
|
@classmethod
|
||||||
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(".")
|
||||||
created = False
|
|
||||||
|
|
||||||
if major == "0" and minor == "0":
|
|
||||||
if int(release) < 11:
|
|
||||||
cls._db_create(execute)
|
|
||||||
created = True
|
|
||||||
|
|
||||||
if major == "0" and int(minor) < 2:
|
if major == "0" and int(minor) < 2:
|
||||||
if not created:
|
if cls.is_table_exists(execute, "OutputRKAdists"):
|
||||||
cls._db_update_to_0_2_0(execute, data)
|
cls._db_update_to_0_2_0(execute, data)
|
||||||
|
else:
|
||||||
|
cls._db_create(execute)
|
||||||
|
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|||||||
@@ -138,16 +138,12 @@ class PollutantCharacteristics(SQLSubModel):
|
|||||||
@classmethod
|
@classmethod
|
||||||
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(".")
|
||||||
created = False
|
|
||||||
|
|
||||||
if major == "0" and minor == "0":
|
|
||||||
if int(release) < 11:
|
|
||||||
cls._db_create(execute)
|
|
||||||
created = True
|
|
||||||
|
|
||||||
if major == "0" and int(minor) < 2:
|
if major == "0" and int(minor) < 2:
|
||||||
if not created:
|
if cls.is_table_exists(execute, "Pollutants_characteristic"):
|
||||||
cls._db_update_to_0_2_0(execute, data)
|
cls._db_update_to_0_2_0(execute, data)
|
||||||
|
else:
|
||||||
|
cls._db_create(execute)
|
||||||
|
|
||||||
return cls._update_submodel(execute, version, data)
|
return cls._update_submodel(execute, version, data)
|
||||||
|
|
||||||
@@ -370,15 +366,13 @@ class Pollutants(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 int(minor) < 2:
|
||||||
if int(release) < 11:
|
if cls.is_table_exists(execute, "Pollutants"):
|
||||||
|
cls._db_update_to_0_2_0(execute, data)
|
||||||
|
else:
|
||||||
cls._db_create(execute)
|
cls._db_create(execute)
|
||||||
created = True
|
created = True
|
||||||
|
|
||||||
if major == "0" and int(minor) < 2:
|
|
||||||
if not created:
|
|
||||||
cls._db_update_to_0_2_0(execute, data)
|
|
||||||
|
|
||||||
if not created:
|
if not created:
|
||||||
return cls._update_submodel(execute, version, data)
|
return cls._update_submodel(execute, version, data)
|
||||||
|
|
||||||
|
|||||||
@@ -301,6 +301,15 @@ class SQLSubModel(PamhyrID):
|
|||||||
"""
|
"""
|
||||||
raise NotImplementedMethodeError(cls, cls._db_update)
|
raise NotImplementedMethodeError(cls, cls._db_update)
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def is_table_exists(cls, execute, table):
|
||||||
|
return any(
|
||||||
|
execute(
|
||||||
|
"SELECT name FROM sqlite_master " +
|
||||||
|
f"WHERE type='table' AND name='{table}'"
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def _db_update_to_0_2_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(
|
||||||
|
|||||||
Reference in new issue
Block a user