Merge pull request #524 from cymed/fix-od-views

Fixes to MultipleInheritances
teksi · Jan 16, 2025 · b010cc5 · b010cc5
2 parents 3b5056e + 59f7f85
commit b010cc5
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/datamodel/app/create_app.py b/datamodel/app/create_app.py
@@ -150,9 +150,7 @@ def create_app(
 
     MultipleInheritance(
         safe_load(open(cwd / "view/vw_maintenance_event.yaml")),
-        create_joins=True,
         drop=True,
-        variables=variables,
         pg_service=pg_service,
     ).create()
 
@@ -175,7 +173,6 @@ def create_app(
 
     MultipleInheritance(
         safe_load(open(cwd / "view/vw_oo_overflow.yaml")),
-        create_joins=True,
         variables=variables,
         pg_service=pg_service,
         drop=True,

diff --git a/datamodel/app/view/vw_maintenance_event.yaml b/datamodel/app/view/vw_maintenance_event.yaml
@@ -2,7 +2,7 @@
 table: tww_od.maintenance_event
 view_name: vw_tww_maintenance_event
 view_schema: tww_app
-allow_type_change: false
+allow_type_change: true
 allow_parent_only: false
 pkey_default_value: True
 

diff --git a/datamodel/app/view/vw_oo_overflow.yaml b/datamodel/app/view/vw_oo_overflow.yaml
@@ -7,7 +7,7 @@ allow_parent_only: false
 pkey_default_value: True
 
 additional_columns:
-  geometry: n1.situation3d_geometry::geometry('PointZ',{SRID})
+  geometry: n1.situation3d_geometry
 additional_joins: >
   LEFT JOIN tww_od.wastewater_node n1 ON overflow.fk_wastewater_node::text = n1.obj_id::text