Merge pull request #159 from teksi/datamodel-fix-rename-file.class-to…

…-file.classname datamodel kek rename class.file to filename
teksi · Feb 20, 2024 · e5799bc · e5799bc
2 parents 2d122f7 + e0586bc
commit e5799bc
Show file tree

Hide file tree

Showing 8 changed files with 246 additions and 246 deletions.
diff --git a/datamodel/app/view/unused_views/heritage_dss2015/vw_organisation.sql b/datamodel/app/view/unused_views/heritage_dss2015/vw_organisation.sql
@@ -48,7 +48,7 @@ $BODY$
     NEW._url = replace(NEW._url, '\', '/');
 
     INSERT INTO tww_od.file(
-      class,
+      classname,
       identifier,
       kind,
       object,
@@ -59,7 +59,7 @@ $BODY$
       remark)
 
     SELECT
-      NEW.class,
+      NEW.classname,
       NEW.identifier,
       NEW.kind,
       NEW.object,
@@ -97,7 +97,7 @@ NEW._url = replace(NEW._url, '\', '/');
 
   UPDATE  tww_od.file
     SET
-    class = NEW.class,
+    classname = NEW.classname,
     identifier = NEW.identifier,
     kind = NEW.kind,
     object = NEW.object,

diff --git a/datamodel/app/view/vw_file.sql b/datamodel/app/view/vw_file.sql
@@ -20,7 +20,7 @@ CREATE OR REPLACE VIEW tww_app.vw_file AS
     f.identifier,
     f.kind,
     f.object,
-    f.class,
+    f.classname,
     -- dm.path,
     COALESCE(dm.path::text || f.path_relative::text, f.path_relative::text) AS _url,
     f.fk_dataowner as dataowner,
@@ -62,7 +62,7 @@ $BODY$
     NEW._url = replace(NEW._url, '\', '/');
 
     INSERT INTO tww_od.file(
-      class,
+      classname,
       identifier,
       kind,
       object,
@@ -73,7 +73,7 @@ $BODY$
       remark)
 
     SELECT
-      NEW.class,
+      NEW.classname,
       NEW.identifier,
       NEW.kind,
       NEW.object,
@@ -111,7 +111,7 @@ NEW._url = replace(NEW._url, '\', '/');
 
   UPDATE  tww_od.file
     SET
-    class = NEW.class,
+    classname = NEW.classname,
     identifier = NEW.identifier,
     kind = NEW.kind,
     object = NEW.object,

diff --git a/datamodel/changelogs/0001/04_vsa_kek_extension.sql b/datamodel/changelogs/0001/04_vsa_kek_extension.sql
diff --git a/datamodel/changelogs/0001/09_tww_dictionaries_kek.sql b/datamodel/changelogs/0001/09_tww_dictionaries_kek.sql
diff --git a/...si_wastewater/interlis/interlis_model_mapping/interlis_exporter_to_intermediate_schema.py b/...si_wastewater/interlis/interlis_model_mapping/interlis_exporter_to_intermediate_schema.py
@@ -2324,7 +2324,9 @@ def _export_file(self):
                 bemerkung=self.truncate(self.emptystr_to_null(row.remark), 80),
                 bezeichnung=self.null_to_emptystr(row.identifier),
                 datentraegerref=self.get_tid(row.fk_data_media__REL),
-                klasse=self.get_vl_by_code(self.model_classes_tww_vl.file_class, row.class_column),
+                klasse=self.get_vl_by_code(
+                    self.model_classes_tww_vl.file_classname, row.class_column
+                ),
                 objekt=self.null_to_emptystr(row.object),
                 relativpfad=row.path_relative,
             )

diff --git a/...si_wastewater/interlis/interlis_model_mapping/interlis_importer_to_intermediate_schema.py b/...si_wastewater/interlis/interlis_model_mapping/interlis_importer_to_intermediate_schema.py
@@ -2210,7 +2210,7 @@ def _import_datei(self):
                 object=row.objekt,
                 path_relative=row.relativpfad,
                 remark=row.bemerkung,
-                class_column=self.get_vl_code(self.model_classes_tww_vl.file_class, row.klasse),
+                classname=self.get_vl_code(self.model_classes_tww_vl.file_classname, row.klasse),
             )
 
             self.session_tww.add(file_table_row)

diff --git a/plugin/teksi_wastewater/interlis/interlis_model_mapping/model_tww_od.py b/plugin/teksi_wastewater/interlis/interlis_model_mapping/model_tww_od.py
@@ -1,5 +1,3 @@
-from sqlalchemy import Column
-
 from ...interlis import config
 from .model_base import ModelBase
 
@@ -314,6 +312,5 @@ class backflow_prevention(structure_part):
         class file(self.Base):
             __tablename__ = "file"
             __table_args__ = {"schema": config.TWW_OD_SCHEMA}
-            class_column = Column("class")
 
         ModelTwwOd.file = file
diff --git a/project/teksi_wastewater.qgs b/project/teksi_wastewater.qgs
@@ -650,7 +650,7 @@
             <Option></Option>
           </customproperties>
         </layer-tree-layer>
-        <layer-tree-layer checked="Qt::Unchecked" expanded="1" id="file_class" legend_exp="" legend_split_behavior="0" name="file_class" patch_size="0,0">
+        <layer-tree-layer checked="Qt::Unchecked" expanded="1" id="file_classname" legend_exp="" legend_split_behavior="0" name="file_classname" patch_size="0,0">
           <customproperties>
             <Option></Option>
           </customproperties>
@@ -1705,9 +1705,9 @@
             <legendlayerfile isInOverview="0" layerid="data_media_kind" visible="0"></legendlayerfile>
           </filegroup>
         </legendlayer>
-        <legendlayer checked="Qt::Unchecked" drawingOrder="-1" name="file_class" open="true" showFeatureCount="0">
+        <legendlayer checked="Qt::Unchecked" drawingOrder="-1" name="file_classname" open="true" showFeatureCount="0">
           <filegroup hidden="false" open="true">
-            <legendlayerfile isInOverview="0" layerid="file_class" visible="0"></legendlayerfile>
+            <legendlayerfile isInOverview="0" layerid="file_classname" visible="0"></legendlayerfile>
           </filegroup>
         </legendlayer>
         <legendlayer checked="Qt::Unchecked" drawingOrder="-1" name="file_kind" open="true" showFeatureCount="0">
@@ -2314,11 +2314,11 @@
     </maplayer>
     <maplayer autoRefreshEnabled="0" autoRefreshTime="0" geometry="No geometry" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="" maxScale="0" minScale="1e+08" readOnly="0" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" type="vector" wkbType="NoGeometry">
       <id>_0d048deb_6e75_49f8_be35_aba415ffebf2</id>
-      <datasource>service='pg_tww' key='code' checkPrimaryKeyUnicity='1' table="tww_vl"."file_class"</datasource>
+      <datasource>service='pg_tww' key='code' checkPrimaryKeyUnicity='1' table="tww_vl"."file_classname"</datasource>
       <keywordList>
         <value></value>
       </keywordList>
-      <layername>file_class</layername>
+      <layername>file_classname</layername>
       <srs>
         <spatialrefsys nativeFormat="Wkt">
           <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>