Skip to content

Commit

Permalink
Merge pull request #215 from QGEP/delta_1.5.x_dss_rename_xxx_fk_chute…
Browse files Browse the repository at this point in the history
…_to_fk_surface_water_bodies

DSS rename xxx.fk_chute to xxx.fk_surface_water_bodies
  • Loading branch information
ponceta authored Oct 9, 2023
2 parents f501f1b + c60d2bd commit 2fec9ee
Show file tree
Hide file tree
Showing 2 changed files with 75 additions and 6 deletions.
12 changes: 6 additions & 6 deletions 03_qgep_db_dss.sql
Original file line number Diff line number Diff line change
Expand Up @@ -3538,8 +3538,8 @@ ALTER TABLE qgep_vl.water_catchment_kind ADD CONSTRAINT pkey_qgep_vl_water_catch
ON UPDATE RESTRICT ON DELETE RESTRICT;
ALTER TABLE qgep_od.water_catchment ADD COLUMN fk_aquifier varchar (16);
ALTER TABLE qgep_od.water_catchment ADD CONSTRAINT rel_water_catchment_aquifier FOREIGN KEY (fk_aquifier) REFERENCES qgep_od.aquifier(obj_id) ON UPDATE CASCADE ON DELETE set null;
ALTER TABLE qgep_od.water_catchment ADD COLUMN fk_chute varchar (16);
ALTER TABLE qgep_od.water_catchment ADD CONSTRAINT rel_water_catchment_chute FOREIGN KEY (fk_chute) REFERENCES qgep_od.surface_water_bodies(obj_id) ON UPDATE CASCADE ON DELETE set null;
ALTER TABLE qgep_od.water_catchment ADD COLUMN fk_surface_water_bodies varchar (16);
ALTER TABLE qgep_od.water_catchment ADD CONSTRAINT rel_water_catchment_surface_water_bodies FOREIGN KEY (fk_surface_water_bodies) REFERENCES qgep_od.surface_water_bodies(obj_id) ON UPDATE CASCADE ON DELETE set null;
CREATE TABLE qgep_vl.river_bank_control_grade_of_river () INHERITS (qgep_sys.value_list_base);
ALTER TABLE qgep_vl.river_bank_control_grade_of_river ADD CONSTRAINT pkey_qgep_vl_river_bank_control_grade_of_river_code PRIMARY KEY (code);
INSERT INTO qgep_vl.river_bank_control_grade_of_river (code, vsacode, value_en, value_de, value_fr, value_it, value_ro, abbr_en, abbr_de, abbr_fr, abbr_it, abbr_ro, active) VALUES (341,341,'none','keine','nul', 'nessuno', 'inexistent', '', '', '', '', '', 'true');
Expand Down Expand Up @@ -3646,8 +3646,8 @@ ALTER TABLE qgep_vl.sector_water_body_kind ADD CONSTRAINT pkey_qgep_vl_sector_wa
ALTER TABLE qgep_od.sector_water_body ADD CONSTRAINT fkey_vl_sector_water_body_kind FOREIGN KEY (kind)
REFERENCES qgep_vl.sector_water_body_kind (code) MATCH SIMPLE
ON UPDATE RESTRICT ON DELETE RESTRICT;
ALTER TABLE qgep_od.sector_water_body ADD COLUMN fk_chute varchar (16);
ALTER TABLE qgep_od.sector_water_body ADD CONSTRAINT rel_sector_water_body_chute FOREIGN KEY (fk_chute) REFERENCES qgep_od.surface_water_bodies(obj_id) ON UPDATE CASCADE ON DELETE cascade;
ALTER TABLE qgep_od.sector_water_body ADD COLUMN fk_surface_water_bodies varchar (16);
ALTER TABLE qgep_od.sector_water_body ADD CONSTRAINT rel_sector_water_body_surface_water_bodies FOREIGN KEY (fk_surface_water_bodies) REFERENCES qgep_od.surface_water_bodies(obj_id) ON UPDATE CASCADE ON DELETE cascade;
ALTER TABLE qgep_od.cooperative ADD CONSTRAINT oorel_od_cooperative_organisation FOREIGN KEY (obj_id) REFERENCES qgep_od.organisation(obj_id) ON DELETE CASCADE ON UPDATE CASCADE;
ALTER TABLE qgep_od.canton ADD CONSTRAINT oorel_od_canton_organisation FOREIGN KEY (obj_id) REFERENCES qgep_od.organisation(obj_id) ON DELETE CASCADE ON UPDATE CASCADE;
ALTER TABLE qgep_od.waste_water_association ADD CONSTRAINT oorel_od_waste_water_association_organisation FOREIGN KEY (obj_id) REFERENCES qgep_od.organisation(obj_id) ON DELETE CASCADE ON UPDATE CASCADE;
Expand Down Expand Up @@ -4202,8 +4202,8 @@ ALTER TABLE qgep_vl.rock_ramp_stabilisation ADD CONSTRAINT pkey_qgep_vl_rock_ram
ON UPDATE RESTRICT ON DELETE RESTRICT;
ALTER TABLE qgep_od.fish_pass ADD COLUMN fk_water_control_structure varchar (16);
ALTER TABLE qgep_od.fish_pass ADD CONSTRAINT rel_fish_pass_water_control_structure FOREIGN KEY (fk_water_control_structure) REFERENCES qgep_od.water_control_structure(obj_id) ON UPDATE CASCADE ON DELETE cascade;
ALTER TABLE qgep_od.bathing_area ADD COLUMN fk_chute varchar (16);
ALTER TABLE qgep_od.bathing_area ADD CONSTRAINT rel_bathing_area_chute FOREIGN KEY (fk_chute) REFERENCES qgep_od.surface_water_bodies(obj_id) ON UPDATE CASCADE ON DELETE set null;
ALTER TABLE qgep_od.bathing_area ADD COLUMN fk_surface_water_bodies varchar (16);
ALTER TABLE qgep_od.bathing_area ADD CONSTRAINT rel_bathing_area_surface_water_bodies FOREIGN KEY (fk_surface_water_bodies) REFERENCES qgep_od.surface_water_bodies(obj_id) ON UPDATE CASCADE ON DELETE set null;
ALTER TABLE qgep_od.wastewater_networkelement ADD COLUMN fk_wastewater_structure varchar (16);
ALTER TABLE qgep_od.wastewater_networkelement ADD CONSTRAINT rel_wastewater_networkelement_wastewater_structure FOREIGN KEY (fk_wastewater_structure) REFERENCES qgep_od.wastewater_structure(obj_id) ON UPDATE CASCADE ON DELETE cascade;
CREATE TABLE qgep_vl.reach_point_elevation_accuracy () INHERITS (qgep_sys.value_list_base);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
-- class water_catchment
--1. add correct fk_surface_water_bodies
ALTER TABLE IF EXISTS qgep_od.water_catchment ADD COLUMN fk_surface_water_bodies varchar (16);

-- 2. add correct CONSTRAINT
-- ALTER TABLE qgep_od.water_catchment ADD CONSTRAINT rel_water_catchment_chute FOREIGN KEY (fk_chute) REFERENCES qgep_od.surface_water_bodies(obj_id) ON UPDATE CASCADE ON DELETE set null;

ALTER TABLE IF EXISTS qgep_od.water_catchment ADD CONSTRAINT rel_water_catchment_surface_water_bodies FOREIGN KEY (fk_surface_water_bodies) REFERENCES qgep_od.surface_water_bodies(obj_id) ON UPDATE CASCADE ON DELETE set null;

--3. copy data from fk_chute to fk_surface_water_bodies
UPDATE qgep_od.water_catchment
SET fk_surface_water_bodies = fk_chute;

-- 4. delete old rel_water_catchment_chute constraint
ALTER TABLE IF EXISTS qgep_od.water_catchment DROP CONSTRAINT rel_water_catchment_chute;

-- 5. delete wrong fk_chute column
ALTER TABLE IF EXISTS qgep_od.water_catchment DROP COLUMN fk_chute;

-- 6. rename wrong value in qgep_sys.dictionary_od_field
-- not needed as fk_attributes are not in qgep_sys tables


-- class bathing_area
--1. add correct fk_surface_water_bodies
ALTER TABLE IF EXISTS qgep_od.bathing_area ADD COLUMN fk_surface_water_bodies varchar (16);

-- 2. add correct CONSTRAINT
-- ALTER TABLE qgep_od.bathing_area ADD CONSTRAINT rel_bathing_area_chute FOREIGN KEY (fk_chute) REFERENCES qgep_od.surface_water_bodies(obj_id) ON UPDATE CASCADE ON DELETE set null;

ALTER TABLE IF EXISTS qgep_od.bathing_area ADD CONSTRAINT rel_bathing_area_surface_water_bodies FOREIGN KEY (fk_surface_water_bodies) REFERENCES qgep_od.surface_water_bodies(obj_id) ON UPDATE CASCADE ON DELETE set null;

--3. copy data from fk_chute to fk_surface_water_bodies
UPDATE qgep_od.bathing_area
SET fk_surface_water_bodies = fk_chute;

-- 4. delete old rel_water_catchment_chute constraint
ALTER TABLE IF EXISTS qgep_od.bathing_area DROP CONSTRAINT rel_bathing_area_chute;

-- 5. delete wrong fk_chute column
ALTER TABLE IF EXISTS qgep_od.bathing_area DROP COLUMN fk_chute;

-- 6. rename wrong value in qgep_sys.dictionary_od_field
-- not needed as fk_attributes are not in qgep_sys tables



-- class sector_water_body
--1. add correct fk_surface_water_bodies
ALTER TABLE IF EXISTS qgep_od.sector_water_body ADD COLUMN fk_surface_water_bodies varchar (16);

-- 2. add correct CONSTRAINT
-- ALTER TABLE qgep_od.sector_water_body ADD CONSTRAINT rel_sector_water_body_chute FOREIGN KEY (fk_chute) REFERENCES qgep_od.surface_water_bodies(obj_id) ON UPDATE CASCADE ON DELETE set null;

ALTER TABLE IF EXISTS qgep_od.sector_water_body ADD CONSTRAINT rel_sector_water_body_surface_water_bodies FOREIGN KEY (fk_surface_water_bodies) REFERENCES qgep_od.surface_water_bodies(obj_id) ON UPDATE CASCADE ON DELETE set null;

--3. copy data from fk_chute to fk_surface_water_bodies
UPDATE qgep_od.sector_water_body
SET fk_surface_water_bodies = fk_chute;

-- 4. delete old rel_water_catchment_chute constraint
ALTER TABLE IF EXISTS qgep_od.sector_water_body DROP CONSTRAINT rel_sector_water_body_chute;

-- 5. delete wrong fk_chute column
ALTER TABLE IF EXISTS qgep_od.sector_water_body DROP COLUMN fk_chute;

-- 6. rename wrong value in qgep_sys.dictionary_od_field
-- not needed as fk_attributes are not in qgep_sys tables

0 comments on commit 2fec9ee

Please sign in to comment.