Fix 1.4.0 SIRE

Fix 1.4.0 SIRE

.build/extensions/sire/views_pully/captage.sql

@@ -35,9 +35,9 @@ CREATE OR REPLACE VIEW qwat_ch_vd_sire.captage
     JOIN qwat_od.network_element element ON installation.id = element.id
     JOIN qwat_od.node node ON element.id = node.id
     LEFT JOIN qwat_vl."precision" "precision" ON element.fk_precision = "precision".id
-    LEFT JOIN qwat_od.distributor distributor ON element.fk_distributor = distributor.id
+    LEFT JOIN qwat_od.distributor distributor ON distributor.id = ANY (node.fk_distributor)
     LEFT JOIN qwat_od.folder folder ON element.fk_folder = folder.id
-    LEFT JOIN qwat_od.pressurezone pressurezone ON node.fk_pressurezone = pressurezone.id
+    LEFT JOIN qwat_od.pressurezone pressurezone ON pressurezone.id = ANY (node.fk_pressurezone)
     LEFT JOIN qwat_vl.watertype watertype ON installation.fk_watertype = watertype.id
     LEFT JOIN qwat_od.source source ON installation.id = source.id
     LEFT JOIN qwat_vl.source_type source_type ON source.fk_source_type = source_type.id

.build/extensions/sire/views_pully/regulation_pression.sql

@@ -36,9 +36,9 @@ CREATE OR REPLACE VIEW qwat_ch_vd_sire.regulation_pression
     JOIN qwat_od.node node ON element.id = node.id
     LEFT JOIN qwat_od.pump pump ON installation.id = pump.id
     LEFT JOIN qwat_vl."precision" "precision" ON element.fk_precision = "precision".id
-    LEFT JOIN qwat_od.distributor distributor ON element.fk_distributor = distributor.id
+    LEFT JOIN qwat_od.distributor distributor ON distributor.id = ANY (node.fk_distributor)
     LEFT JOIN qwat_od.folder folder ON element.fk_folder = folder.id
-    LEFT JOIN qwat_od.pressurezone pressurezone ON node.fk_pressurezone = pressurezone.id
+    LEFT JOIN qwat_od.pressurezone pressurezone ON pressurezone.id = ANY (node.fk_pressurezone)
     LEFT JOIN qwat_vl.watertype watertype ON installation.fk_watertype = watertype.id
     LEFT JOIN qwat_od.pressurecontrol pressurecontrol ON installation.id = pressurecontrol.id
   WHERE pressurecontrol.fk_pressurecontrol_type = ANY (ARRAY[2801, 2802])

.build/extensions/sire/views_pully/reservoir.sql

@@ -45,9 +45,9 @@ CREATE OR REPLACE VIEW qwat_ch_vd_sire.reservoir
     JOIN qwat_od.network_element element ON installation.id = element.id
     JOIN qwat_od.node node ON element.id = node.id
     LEFT JOIN qwat_vl."precision" "precision" ON element.fk_precision = "precision".id
-    LEFT JOIN qwat_od.distributor distributor ON element.fk_distributor = distributor.id
+    LEFT JOIN qwat_od.distributor distributor ON distributor.id = ANY (node.fk_distributor)
     LEFT JOIN qwat_od.folder folder ON element.fk_folder = folder.id
-    LEFT JOIN qwat_od.pressurezone pressurezone ON node.fk_pressurezone = pressurezone.id
+    LEFT JOIN qwat_od.pressurezone pressurezone ON pressurezone.id = ANY (node.fk_pressurezone)
     LEFT JOIN qwat_vl.watertype watertype ON installation.fk_watertype = watertype.id
     LEFT JOIN qwat_od.tank tank ON installation.id = tank.id
   WHERE tank.id is not NULL;

.build/extensions/sire/views_pully/station_pompage.sql

@@ -29,9 +29,9 @@ CREATE OR REPLACE VIEW qwat_ch_vd_sire.station_pompage
     JOIN qwat_od.network_element element ON installation.id = element.id
     JOIN qwat_od.node node ON element.id = node.id
     LEFT JOIN qwat_vl."precision" "precision" ON element.fk_precision = "precision".id
-    LEFT JOIN qwat_od.distributor distributor ON element.fk_distributor = distributor.id
+    LEFT JOIN qwat_od.distributor distributor ON distributor.id = ANY (node.fk_distributor)
     LEFT JOIN qwat_od.folder folder ON element.fk_folder = folder.id
-    LEFT JOIN qwat_od.pressurezone pressurezone ON node.fk_pressurezone = pressurezone.id
+    LEFT JOIN qwat_od.pressurezone pressurezone ON pressurezone.id = ANY (node.fk_pressurezone)
     LEFT JOIN qwat_vl.watertype watertype ON installation.fk_watertype = watertype.id
     LEFT JOIN qwat_od.pump pump ON installation.id = pump.id
     LEFT JOIN qwat_vl.pump_type pump_type ON pump.fk_pump_type = pump_type.id

.build/extensions/sire/views_pully/station_traitement.sql

@@ -61,9 +61,9 @@ CREATE OR REPLACE VIEW qwat_ch_vd_sire.station_traitement
     JOIN qwat_od.network_element element ON installation.id = element.id
     JOIN qwat_od.node node ON element.id = node.id
     LEFT JOIN qwat_vl."precision" "precision" ON element.fk_precision = "precision".id
-    LEFT JOIN qwat_od.distributor distributor ON element.fk_distributor = distributor.id
+    LEFT JOIN qwat_od.distributor distributor ON distributor.id = ANY (node.fk_distributor)
     LEFT JOIN qwat_od.folder folder ON element.fk_folder = folder.id
-    LEFT JOIN qwat_od.pressurezone pressurezone ON node.fk_pressurezone = pressurezone.id
+    LEFT JOIN qwat_od.pressurezone pressurezone ON pressurezone.id = ANY (node.fk_pressurezone)
     LEFT JOIN qwat_vl.watertype watertype ON installation.fk_watertype = watertype.id
     LEFT JOIN qwat_od.treatment treatment ON installation.id = treatment.id
   WHERE treatment.id is not NULL;

.build/extensions/sire/views_pully/zone_pression.sql

@@ -1,15 +1,16 @@
 CREATE OR REPLACE VIEW qwat_ch_vd_sire.zone_pression AS
-	SELECT
-		pressurezone.id AS "ID_Num",
-		NULL::text AS "Remarque",
-		pressurezone.name AS "Nom_Descriptif",
-		distributor.name AS "Nom_Distributeur",
-		consumptionzone.qwat_ext_ch_vd_sire_pressure_load_type AS "Mise_En_Charge",
-		consumptionzone.qwat_ext_ch_vd_sire_pressure_load_altitude AS "Altitude_Plan_De_Charge"
-		FROM qwat_od.pressurezone
-		JOIN qwat_od.distributor ON pressurezone.fk_distributor = distributor.id
-		JOIN qwat_od.consumptionzone ON pressurezone.fk_consumptionzone = consumptionzone.id
-	WHERE pressurezone.fk_distributor = 1;
+  SELECT
+    pressurezone.id AS "ID_Num",
+    NULL::text AS "Remarque",
+    pressurezone.name AS "Nom_Descriptif",
+    distributor.name AS "Nom_Distributeur",
+    consumptionzone.qwat_ext_ch_vd_sire_pressure_load_type AS "Mise_En_Charge",
+    consumptionzone.qwat_ext_ch_vd_sire_pressure_load_altitude AS "Altitude_Plan_De_Charge"
+  FROM qwat_od.pressurezone
+    JOIN qwat_od.distributor ON pressurezone.fk_distributor = distributor.id
+    JOIN qwat_od.consumptionzone ON pressurezone.fk_consumptionzone = consumptionzone.id
+  WHERE pressurezone.fk_distributor = 1;
+
 GRANT SELECT, REFERENCES, TRIGGER ON TABLE qwat_ch_vd_sire.zone_pression TO qwat_viewer;
 GRANT ALL ON TABLE qwat_ch_vd_sire.zone_pression TO qwat_user;
 GRANT ALL ON TABLE qwat_ch_vd_sire.zone_pression TO qwat_manager;