mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-31 22:15:23 +00:00
Code Issues Releases Wiki Activity

[#2299] Fixed minor review comments

Browse Source 
modified:
    src/share/database/scripts/mysql/dhcpdb_create.mysql
    src/share/database/scripts/mysql/upgrade_013_to_014.sh.in
    src/share/database/scripts/pgsql/dhcpdb_create.pgsql
    src/share/database/scripts/pgsql/upgrade_011_to_012.sh.in
This commit is contained in:
Thomas Markwalder
2022-06-07 13:47:26 -04:00
parent 67ea8f4783
commit ba5ba1ee10
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/share/database/scripts/mysql/dhcpdb_create.mysql
View File

@@ -4288,7 +4288,7 @@ UPDATE schema_version
-- This line starts database upgrade to version 14.0.
-- Modify shared-network-name foreign key contraint on dhcp4_subnet to not perform
-- Modify shared-network-name foreign key constraint on dhcp4_subnet to not perform
-- the update when the network is deleted the cascaded update will not execute
-- dhcp4_subnet update trigger leaving the updated subnets without audit_entries.
ALTER TABLE dhcp4_subnet
@@ -4311,12 +4311,12 @@ CREATE TRIGGER dhcp4_shared_network_BDEL BEFORE DELETE ON dhcp4_shared_network
CALL createAuditEntryDHCP4('dhcp4_shared_network', OLD.id, "delete");
-- In MySQL Foreign key constraint triggered updates will not cascade, so we explicitly
-- update subnets first which should ensure they get audit entries.
UPDATE dhcp4_subnet SET shared_network_name = NULL WHERE shared_network_name = OLD.name;
UPDATE dhcp4_subnet SET shared_network_name = NULL WHERE shared_network_name = OLD.name;
DELETE FROM dhcp4_options WHERE shared_network_name = OLD.name;
END $$
DELIMITER ;
-- Modify shared-network-name foreign key contraint on dhcp6_subnet to not perform
-- Modify shared-network-name foreign key constraint on dhcp6_subnet to not perform
-- the update when the network is deleted the cascaded update will not execute
-- dhcp6_subnet update trigger leaving the updated subnets without audit_entries.
ALTER TABLE dhcp6_subnet
@@ -4339,7 +4339,7 @@ CREATE TRIGGER dhcp6_shared_network_BDEL BEFORE DELETE ON dhcp6_shared_network
CALL createAuditEntryDHCP6('dhcp6_shared_network', OLD.id, "delete");
-- In MySQL Foreign key constraint triggered updates will not cascade, so we explicitly
-- update subnets first which should ensure they get audit entries.
UPDATE dhcp6_subnet SET shared_network_name = NULL WHERE shared_network_name = OLD.name;
UPDATE dhcp6_subnet SET shared_network_name = NULL WHERE shared_network_name = OLD.name;
DELETE FROM dhcp6_options WHERE shared_network_name = OLD.name;
END $$
DELIMITER ;

8
src/share/database/scripts/mysql/upgrade_013_to_014.sh.in
View File

@@ -54,7 +54,7 @@ fi
mysql "$@" <<EOF
-- This line starts database upgrade to version 14.0.
-- Modify shared-network-name foreign key contraint on dhcp4_subnet to not perform
-- Modify shared-network-name foreign key constraint on dhcp4_subnet to not perform
-- the update when the network is deleted the cascaded update will not execute
-- dhcp4_subnet update trigger leaving the updated subnets without audit_entries.
ALTER TABLE dhcp4_subnet
@@ -77,12 +77,12 @@ CREATE TRIGGER dhcp4_shared_network_BDEL BEFORE DELETE ON dhcp4_shared_network
CALL createAuditEntryDHCP4('dhcp4_shared_network', OLD.id, "delete");
-- In MySQL Foreign key constraint triggered updates will not cascade, so we explicitly
-- update subnets first which should ensure they get audit entries.
UPDATE dhcp4_subnet SET shared_network_name = NULL WHERE shared_network_name = OLD.name;
UPDATE dhcp4_subnet SET shared_network_name = NULL WHERE shared_network_name = OLD.name;
DELETE FROM dhcp4_options WHERE shared_network_name = OLD.name;
END $$
DELIMITER ;
-- Modify shared-network-name foreign key contraint on dhcp6_subnet to not perform
-- Modify shared-network-name foreign key constraint on dhcp6_subnet to not perform
-- the update when the network is deleted the cascaded update will not execute
-- dhcp6_subnet update trigger leaving the updated subnets without audit_entries.
ALTER TABLE dhcp6_subnet
@@ -105,7 +105,7 @@ CREATE TRIGGER dhcp6_shared_network_BDEL BEFORE DELETE ON dhcp6_shared_network
CALL createAuditEntryDHCP6('dhcp6_shared_network', OLD.id, "delete");
-- In MySQL Foreign key constraint triggered updates will not cascade, so we explicitly
-- update subnets first which should ensure they get audit entries.
UPDATE dhcp6_subnet SET shared_network_name = NULL WHERE shared_network_name = OLD.name;
UPDATE dhcp6_subnet SET shared_network_name = NULL WHERE shared_network_name = OLD.name;
DELETE FROM dhcp6_options WHERE shared_network_name = OLD.name;
END $$
DELIMITER ;