From 07e840093b54b7f50841fe21aacee9b74df00eae Mon Sep 17 00:00:00 2001 From: SJiB Date: Thu, 22 Aug 2024 16:53:03 +0200 Subject: [PATCH 1/4] replace mutation.system_user with user_system to avoid postgres reserved word conflict --- 03_qgep_db_dss.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/03_qgep_db_dss.sql b/03_qgep_db_dss.sql index 4bb5e5c4..be60ef21 100644 --- a/03_qgep_db_dss.sql +++ b/03_qgep_db_dss.sql @@ -172,8 +172,8 @@ ALTER TABLE qgep_od.mutation ADD COLUMN recorded_by varchar(80) ; COMMENT ON COLUMN qgep_od.mutation.recorded_by IS 'Name of person who recorded the dataset / Name des Aufnehmers im Feld / Nom de la personne, qui a relevé les données'; ALTER TABLE qgep_od.mutation ADD COLUMN remark varchar(80) ; COMMENT ON COLUMN qgep_od.mutation.remark IS 'General remarks / Allgemeine Bemerkungen / Remarques générales'; -ALTER TABLE qgep_od.mutation ADD COLUMN system_user varchar(20) ; -COMMENT ON COLUMN qgep_od.mutation.system_user IS 'Name of system user / Name des Systembenutzers / Usager du système informatique'; +ALTER TABLE qgep_od.mutation ADD COLUMN user_system varchar(20) ; +COMMENT ON COLUMN qgep_od.mutation.user_system IS 'Name of system user / Name des Systembenutzers / Usager du système informatique'; ALTER TABLE qgep_od.mutation ADD COLUMN last_modification TIMESTAMP without time zone DEFAULT now(); COMMENT ON COLUMN qgep_od.mutation.last_modification IS 'Last modification / Letzte_Aenderung / Derniere_modification: INTERLIS_1_DATE'; ALTER TABLE qgep_od.mutation ADD COLUMN fk_dataowner varchar(16); From 821851efd7dad626ad1b7b959ae40cedc75c90d9 Mon Sep 17 00:00:00 2001 From: SJiB Date: Thu, 22 Aug 2024 16:54:33 +0200 Subject: [PATCH 2/4] same in dictionaries --- 09_qgep_dictionaries.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/09_qgep_dictionaries.sql b/09_qgep_dictionaries.sql index 66f95a8b..8f59f539 100644 --- a/09_qgep_dictionaries.sql +++ b/09_qgep_dictionaries.sql @@ -814,7 +814,7 @@ CREATE TABLE qgep_sys.dictionary_od_field ( INSERT INTO qgep_sys.dictionary_od_field (class_id, attribute_id, table_name, field_name, field_name_en, field_name_de, field_name_fr, field_name_it, field_name_ro, field_description_en, field_description_de, field_description_fr, field_description_it, field_description_ro, field_mandatory, field_visible, field_datatype, field_unit_en, field_unit_description_en, field_unit_de, field_unit_description_de, field_unit_fr, field_unit_description_fr, field_unit_it, field_unit_description_it, field_unit_ro, field_unit_description_ro, field_max, field_min) VALUES (9998,5514,'mutation','object','object','OBJEKT','OBJET','oggetto','obiect','OBJ_ID of Object','OBJ_ID des Objektes','OBJ_ID de l''objet','NULL','',ARRAY['kein_Plantyp_definiert']::qgep_od.plantype[],'true','varchar(20)','','','','','','','','','','',NULL,NULL); INSERT INTO qgep_sys.dictionary_od_field (class_id, attribute_id, table_name, field_name, field_name_en, field_name_de, field_name_fr, field_name_it, field_name_ro, field_description_en, field_description_de, field_description_fr, field_description_it, field_description_ro, field_mandatory, field_visible, field_datatype, field_unit_en, field_unit_description_en, field_unit_de, field_unit_description_de, field_unit_fr, field_unit_description_fr, field_unit_it, field_unit_description_it, field_unit_ro, field_unit_description_ro, field_max, field_min) VALUES (9998,5528,'mutation','recorded_by','recorded_by','AUFNEHMER','RELEVE_PAR','zzz_AUFNEHMER','înregistrat_de','Name of person who recorded the dataset','Name des Aufnehmers im Feld','Nom de la personne, qui a relevé les données','NULL','',ARRAY['kein_Plantyp_definiert']::qgep_od.plantype[],'true','varchar(80)','','','','','','','','','','',NULL,NULL); INSERT INTO qgep_sys.dictionary_od_field (class_id, attribute_id, table_name, field_name, field_name_en, field_name_de, field_name_fr, field_name_it, field_name_ro, field_description_en, field_description_de, field_description_fr, field_description_it, field_description_ro, field_mandatory, field_visible, field_datatype, field_unit_en, field_unit_description_en, field_unit_de, field_unit_description_de, field_unit_fr, field_unit_description_fr, field_unit_it, field_unit_description_it, field_unit_ro, field_unit_description_ro, field_max, field_min) VALUES (9998,5534,'mutation','remark','remark','BEMERKUNG','REMARQUE','osservazione','observa?ie','General remarks','Allgemeine Bemerkungen','Remarques générales','NULL','',ARRAY['kein_Plantyp_definiert']::qgep_od.plantype[],'true','varchar(80)','','','','','','','','','','',NULL,NULL); - INSERT INTO qgep_sys.dictionary_od_field (class_id, attribute_id, table_name, field_name, field_name_en, field_name_de, field_name_fr, field_name_it, field_name_ro, field_description_en, field_description_de, field_description_fr, field_description_it, field_description_ro, field_mandatory, field_visible, field_datatype, field_unit_en, field_unit_description_en, field_unit_de, field_unit_description_de, field_unit_fr, field_unit_description_fr, field_unit_it, field_unit_description_it, field_unit_ro, field_unit_description_ro, field_max, field_min) VALUES (9998,5532,'mutation','system_user','system_user','SYSTEMBENUTZER','USAGER_SYSTEME','zzz_SYSTEMBENUTZER','utilizatorul_din_sistem','Name of system user','Name des Systembenutzers','Usager du système informatique','NULL','',ARRAY['kein_Plantyp_definiert']::qgep_od.plantype[],'true','varchar(20)','','','','','','','','','','',NULL,NULL); + INSERT INTO qgep_sys.dictionary_od_field (class_id, attribute_id, table_name, field_name, field_name_en, field_name_de, field_name_fr, field_name_it, field_name_ro, field_description_en, field_description_de, field_description_fr, field_description_it, field_description_ro, field_mandatory, field_visible, field_datatype, field_unit_en, field_unit_description_en, field_unit_de, field_unit_description_de, field_unit_fr, field_unit_description_fr, field_unit_it, field_unit_description_it, field_unit_ro, field_unit_description_ro, field_max, field_min) VALUES (9998,5532,'mutation','user_system','user_system','SYSTEMBENUTZER','USAGER_SYSTEME','zzz_SYSTEMBENUTZER','utilizatorul_din_sistem','Name of system user','Name des Systembenutzers','Usager du système informatique','NULL','',ARRAY['kein_Plantyp_definiert']::qgep_od.plantype[],'true','varchar(20)','','','','','','','','','','',NULL,NULL); INSERT INTO qgep_sys.dictionary_od_field (class_id, attribute_id, table_name, field_name, field_name_en, field_name_de, field_name_fr, field_name_it, field_name_ro, field_description_en, field_description_de, field_description_fr, field_description_it, field_description_ro, field_mandatory, field_visible, field_datatype, field_unit_en, field_unit_description_en, field_unit_de, field_unit_description_de, field_unit_fr, field_unit_description_fr, field_unit_it, field_unit_description_it, field_unit_ro, field_unit_description_ro, field_max, field_min) VALUES (9998,999999,'mutation','OBJ_ID','OBJ_ID','OBJ_ID','OBJ_ID','OBJ_ID','OBJ_ID','OBJ_ID - Unique ID','OBJ_ID - eindeutige Kennung','OBJ_ID - ID unique','OBJ_ID - identificatore univoco','rrr_OBJ_ID - eindeutige Kennung',ARRAY['Werkinformation','Leitungskataster', 'GEP_Verband','GEP_Traegerschaft','SAA', 'PAA']::qgep_od.plantype[],'true','varchar(16)','','','','','','','','','','',NULL,NULL); INSERT INTO qgep_sys.dictionary_od_field (class_id, attribute_id, table_name, field_name, field_name_en, field_name_de, field_name_fr, field_name_it, field_name_ro, field_description_en, field_description_de, field_description_fr, field_description_it, field_description_ro, field_mandatory, field_visible, field_datatype, field_unit_en, field_unit_description_en, field_unit_de, field_unit_description_de, field_unit_fr, field_unit_description_fr, field_unit_it, field_unit_description_it, field_unit_ro, field_unit_description_ro, field_max, field_min) VALUES (9998,999999,'mutation','dataowner','dataowner','Datenherr','MAITRE_DES_DONNEES','proprietario_dati','rrr_Datenherr','dataowner - this is the person or body who is allowed to delete, change or maintain this object','Metaattribut Datenherr ist diejenige Person oder Stelle, die berechtigt ist, diesen Datensatz zu löschen, zu ändern bzw. zu verwalten','Maître des données gestionnaire de données, qui est la personne ou l''organisation autorisée pour gérer, modifier ou supprimer les données de cette table/classe','zzz_Metaattribut L''attributo proprietario dati si riferisce alla persona o ente che è autorizzato a eliminare, modificare o gestire i dati','rrr_Metaattribut Datenherr ist diejenige Person oder Stelle, die berechtigt ist, diesen Datensatz zu löschen, zu ändern bzw. zu verwalten',ARRAY['Werkinformation','Leitungskataster', 'GEP_Verband','GEP_Traegerschaft','SAA', 'PAA']::qgep_od.plantype[],'true','varchar(80)','','','','','','','','','','',NULL,NULL); INSERT INTO qgep_sys.dictionary_od_field (class_id, attribute_id, table_name, field_name, field_name_en, field_name_de, field_name_fr, field_name_it, field_name_ro, field_description_en, field_description_de, field_description_fr, field_description_it, field_description_ro, field_mandatory, field_visible, field_datatype, field_unit_en, field_unit_description_en, field_unit_de, field_unit_description_de, field_unit_fr, field_unit_description_fr, field_unit_it, field_unit_description_it, field_unit_ro, field_unit_description_ro, field_max, field_min) VALUES (9998,999999,'mutation','provider','provider','Datenlieferant','FOURNISSEUR_DES_DONNEES','fornitore_dati','rrr_Datenlieferant','Metaattribute provider - this is the person or body who delivered the data','Metaattribut Datenlieferant ist diejenige Person oder Stelle, die die Daten geliefert hat','FOURNISSEUR DES DONNEES Organisation qui crée l’enregistrement de ces données','zzz_Metaattribut L''attributo fornitore dati si riferisce alla persona o ente che ha fornito i dati','rrr_Metaattribut Datenlieferant ist diejenige Person oder Stelle, die die Daten geliefert hat',ARRAY['Werkinformation','Leitungskataster', 'GEP_Verband','GEP_Traegerschaft','SAA', 'PAA']::qgep_od.plantype[],'true','varchar(80)','','','','','','','','','','',NULL,NULL); From dbce53661d1214d88683b39f90ead0c74afe6574 Mon Sep 17 00:00:00 2001 From: Arnaud Poncet-Montanges Date: Fri, 23 Aug 2024 13:16:00 +0200 Subject: [PATCH 3/4] Add delta --- delta/delta_1.6.2_dss_rename_system_user.sql | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 delta/delta_1.6.2_dss_rename_system_user.sql diff --git a/delta/delta_1.6.2_dss_rename_system_user.sql b/delta/delta_1.6.2_dss_rename_system_user.sql new file mode 100644 index 00000000..03889479 --- /dev/null +++ b/delta/delta_1.6.2_dss_rename_system_user.sql @@ -0,0 +1,11 @@ +-- noop delta, used only to unambigously define the datamodel version +ALTER TABLE qgep_od.mutation +RENAME COLUMN system_user to user_system; + +UPDATE TABLE qgep_sys.dictionary_od_field +SET field_name = 'user_system' +WHERE attribute_id = 5532; + +UPDATE TABLE qgep_sys.dictionary_od_field +SET field_name_en = 'user_system' +WHERE attribute_id = 5532; \ No newline at end of file From 5d5c5330167364913937ef9ea34ca840e04b969b Mon Sep 17 00:00:00 2001 From: Arnaud Poncet-Montanges Date: Fri, 23 Aug 2024 13:20:32 +0200 Subject: [PATCH 4/4] Remove wrong table statement --- delta/delta_1.6.2_dss_rename_system_user.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/delta/delta_1.6.2_dss_rename_system_user.sql b/delta/delta_1.6.2_dss_rename_system_user.sql index 03889479..7b289f9f 100644 --- a/delta/delta_1.6.2_dss_rename_system_user.sql +++ b/delta/delta_1.6.2_dss_rename_system_user.sql @@ -2,10 +2,10 @@ ALTER TABLE qgep_od.mutation RENAME COLUMN system_user to user_system; -UPDATE TABLE qgep_sys.dictionary_od_field +UPDATE qgep_sys.dictionary_od_field SET field_name = 'user_system' WHERE attribute_id = 5532; -UPDATE TABLE qgep_sys.dictionary_od_field +UPDATE qgep_sys.dictionary_od_field SET field_name_en = 'user_system' WHERE attribute_id = 5532; \ No newline at end of file