Merge branch 'HAPI-224/remove-hdx-python-database-dep' into HAPI-225/…

…add-tests
OCHA-DAP · Oct 15, 2023 · 9227831 · 9227831
2 parents f76a5a4 + a13d6c1
commit 9227831
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 12 deletions.
diff --git a/src/hapi_schema/db_admin1.py b/src/hapi_schema/db_admin1.py
@@ -40,7 +40,7 @@ class DBAdmin1(Base):
     location = relationship("DBLocation")
 
 
-admin1_view_params = ViewParams(
+view_params_admin1 = ViewParams(
     name="admin1_view",
     metadata=Base.metadata,
     selectable=select(

diff --git a/src/hapi_schema/db_admin2.py b/src/hapi_schema/db_admin2.py
@@ -41,7 +41,7 @@ class DBAdmin2(Base):
     admin1 = relationship("DBAdmin1")
 
 
-admin2_view_params = ViewParams(
+view_params_admin2 = ViewParams(
     name="admin2_view",
     metadata=Base.metadata,
     selectable=select(

diff --git a/src/hapi_schema/db_age_range.py b/src/hapi_schema/db_age_range.py
@@ -15,7 +15,7 @@ class DBAgeRange(Base):
     age_max: Mapped[int] = mapped_column(Integer, nullable=True)
 
 
-age_range_view_params = ViewParams(
+view_params_age_range = ViewParams(
     name="age_range_view",
     metadata=Base.metadata,
     selectable=select(*DBAgeRange.__table__.columns),

diff --git a/src/hapi_schema/db_dataset.py b/src/hapi_schema/db_dataset.py
@@ -26,7 +26,7 @@ class DBDataset(Base):
     )
 
 
-dataset_view_params = ViewParams(
+view_params_dataset = ViewParams(
     name="dataset_view",
     metadata=Base.metadata,
     selectable=select(*DBDataset.__table__.columns),

diff --git a/src/hapi_schema/db_gender.py b/src/hapi_schema/db_gender.py
@@ -14,7 +14,7 @@ class DBGender(Base):
     description: Mapped[str] = mapped_column(String(256), nullable=False)
 
 
-gender_view_params = ViewParams(
+view_params_gender = ViewParams(
     name="gender_view",
     metadata=Base.metadata,
     selectable=select(*DBGender.__table__.columns),

diff --git a/src/hapi_schema/db_location.py b/src/hapi_schema/db_location.py
@@ -22,7 +22,7 @@ class DBLocation(Base):
     )
 
 
-location_view_params = ViewParams(
+view_params_location = ViewParams(
     name="location_view",
     metadata=Base.metadata,
     selectable=select(*DBLocation.__table__.columns),

diff --git a/src/hapi_schema/db_operational_presence.py b/src/hapi_schema/db_operational_presence.py
@@ -54,7 +54,7 @@ class DBOperationalPresence(Base):
     admin2 = relationship("DBAdmin2")
 
 
-operational_presence_view_params = ViewParams(
+view_params_operational_presence = ViewParams(
     name="operational_presence_view",
     metadata=Base.metadata,
     selectable=select(

diff --git a/src/hapi_schema/db_org.py b/src/hapi_schema/db_org.py
@@ -36,7 +36,7 @@ class DBOrg(Base):
     org_type = relationship("DBOrgType")
 
 
-org_view_params = ViewParams(
+view_params_org = ViewParams(
     name="org_view",
     metadata=Base.metadata,
     selectable=select(

diff --git a/src/hapi_schema/db_org_type.py b/src/hapi_schema/db_org_type.py
@@ -14,7 +14,7 @@ class DBOrgType(Base):
     description: Mapped[str] = mapped_column(String(512), nullable=False)
 
 
-org_type_view_params = ViewParams(
+view_params_org_type = ViewParams(
     name="org_type_view",
     metadata=Base.metadata,
     selectable=select(*DBOrgType.__table__.columns),

diff --git a/src/hapi_schema/db_population.py b/src/hapi_schema/db_population.py
@@ -56,7 +56,7 @@ class DBPopulation(Base):
     gender = relationship("DBGender")
 
 
-population_view_params = ViewParams(
+view_params_population = ViewParams(
     name="population_view",
     metadata=Base.metadata,
     selectable=select(

diff --git a/src/hapi_schema/db_resource.py b/src/hapi_schema/db_resource.py
@@ -37,7 +37,7 @@ class DBResource(Base):
     dataset = relationship("DBDataset")
 
 
-resource_view_params = ViewParams(
+view_params_resource = ViewParams(
     name="resource_view",
     metadata=Base.metadata,
     selectable=select(

diff --git a/src/hapi_schema/db_sector.py b/src/hapi_schema/db_sector.py
@@ -21,7 +21,7 @@ class DBSector(Base):
     )
 
 
-sector_view_params = ViewParams(
+view_params_sector = ViewParams(
     name="sector_view",
     metadata=Base.metadata,
     selectable=select(*DBSector.__table__.columns),