mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-03 15:35:17 +00:00
Code Issues Releases Wiki Activity

[#2299] Script sync issues

Browse Source 
modified:   dhcpdb_create.mysql
modified:   upgrade_013_to_014.sh.in
This commit is contained in:
Thomas Markwalder
2022-06-03 10:05:45 -04:00
parent df14c7593e
commit 2ef4f4f78f
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4346,8 +4346,6 @@ DELIMITER ;
UPDATE schema_version UPDATE schema_version
SET version = '14', minor = '0'; SET version = '14', minor = '0';
-- This line concludes database upgrade to version 14. -- This line concludes database upgrade to version 14.
# Notes: # Notes:

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

@@ -52,6 +52,7 @@ then
fi fi
mysql "$@" <<EOF mysql "$@" <<EOF
-- Modify shared-network-name foreign key contraint on dhcp4_subnet to not perform -- Modify shared-network-name foreign key contraint on dhcp4_subnet to not perform
-- the update when the network is deleted the cascaded update will not execute -- the update when the network is deleted the cascaded update will not execute
-- dhcp4_subnet update trigger leaving the updated subnets without audit_entries. -- dhcp4_subnet update trigger leaving the updated subnets without audit_entries.
@@ -59,9 +60,9 @@ ALTER TABLE dhcp4_subnet
DROP FOREIGN KEY fk_dhcp4_subnet_shared_network; DROP FOREIGN KEY fk_dhcp4_subnet_shared_network;
ALTER TABLE dhcp4_subnet ALTER TABLE dhcp4_subnet
ADD CONSTRAINT fk_dhcp4_subnet_shared_network FOREIGN KEY (shared_network_name) ADD CONSTRAINT fk_dhcp4_subnet_shared_network FOREIGN KEY (shared_network_name)
REFERENCES dhcp4_shared_network (name) REFERENCES dhcp4_shared_network (name)
ON DELETE NO ACTION ON UPDATE NO ACTION; ON DELETE NO ACTION ON UPDATE NO ACTION;
-- Modify BEFORE delete trigger on dhcp4_shared_network to explicitly -- Modify BEFORE delete trigger on dhcp4_shared_network to explicitly
-- update dhcp4_subnets. This ensures there are audit entries for updated -- update dhcp4_subnets. This ensures there are audit entries for updated
@@ -87,12 +88,12 @@ ALTER TABLE dhcp6_subnet
DROP FOREIGN KEY fk_dhcp6_subnet_shared_network; DROP FOREIGN KEY fk_dhcp6_subnet_shared_network;
ALTER TABLE dhcp6_subnet ALTER TABLE dhcp6_subnet
ADD CONSTRAINT fk_dhcp6_subnet_shared_network FOREIGN KEY (shared_network_name) ADD CONSTRAINT fk_dhcp6_subnet_shared_network FOREIGN KEY (shared_network_name)
REFERENCES dhcp6_shared_network (name) REFERENCES dhcp6_shared_network (name)
ON DELETE NO ACTION ON UPDATE NO ACTION; ON DELETE NO ACTION ON UPDATE NO ACTION;
-- Modify BEFORE delete trigger on dhcp6_shared_network to explicitly -- Modify BEFORE delete trigger on dhcp6_shared_network to explicitly
-- update dhcp4_subnets. This ensures there are audit entries for updated -- update dhcp6_subnets. This ensures there are audit entries for updated
-- subnets. -- subnets.
DROP TRIGGER dhcp6_shared_network_BDEL; DROP TRIGGER dhcp6_shared_network_BDEL;
@@ -113,4 +114,5 @@ UPDATE schema_version
SET version = '14', minor = '0'; SET version = '14', minor = '0';
-- This line concludes database upgrade to version 14. -- This line concludes database upgrade to version 14.
EOF EOF