From: Thomas Markwalder <tmark@isc.org>
Date: Fri, 3 Jun 2022 14:05:45 +0000 (-0400)
Subject: [#2299] Script sync issues
X-Git-Tag: Kea-2.1.7~150
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ef4f4f78feb99d658053a3e2953941e98d95a66;p=thirdparty%2Fkea.git

[#2299] Script sync issues

modified:   dhcpdb_create.mysql
modified:   upgrade_013_to_014.sh.in
---

diff --git a/src/share/database/scripts/mysql/dhcpdb_create.mysql b/src/share/database/scripts/mysql/dhcpdb_create.mysql
index f8038f9b2d..68ec7f9921 100644
--- a/src/share/database/scripts/mysql/dhcpdb_create.mysql
+++ b/src/share/database/scripts/mysql/dhcpdb_create.mysql
@@ -4346,8 +4346,6 @@ DELIMITER ;
 UPDATE schema_version
     SET version = '14', minor = '0';
 
-
-
 -- This line concludes database upgrade to version 14.
 
 # Notes:
diff --git a/src/share/database/scripts/mysql/upgrade_013_to_014.sh.in b/src/share/database/scripts/mysql/upgrade_013_to_014.sh.in
index 924b1bc566..eba90c6ebb 100644
--- a/src/share/database/scripts/mysql/upgrade_013_to_014.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_013_to_014.sh.in
@@ -52,6 +52,7 @@ then
 fi
 
 mysql "$@" <<EOF
+
 -- 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
 -- 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;
 
 ALTER TABLE dhcp4_subnet
-     ADD CONSTRAINT fk_dhcp4_subnet_shared_network FOREIGN KEY (shared_network_name)
-         REFERENCES dhcp4_shared_network (name)
-         ON DELETE NO ACTION ON UPDATE NO ACTION;
+    ADD CONSTRAINT fk_dhcp4_subnet_shared_network FOREIGN KEY (shared_network_name)
+        REFERENCES dhcp4_shared_network (name)
+        ON DELETE NO ACTION ON UPDATE NO ACTION;
 
 -- Modify BEFORE delete trigger on dhcp4_shared_network to explicitly
 -- 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;
 
 ALTER TABLE dhcp6_subnet
-     ADD CONSTRAINT fk_dhcp6_subnet_shared_network FOREIGN KEY (shared_network_name)
-         REFERENCES dhcp6_shared_network (name)
-         ON DELETE NO ACTION ON UPDATE NO ACTION;
+    ADD CONSTRAINT fk_dhcp6_subnet_shared_network FOREIGN KEY (shared_network_name)
+        REFERENCES dhcp6_shared_network (name)
+        ON DELETE NO ACTION ON UPDATE NO ACTION;
 
 -- 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.
 DROP TRIGGER dhcp6_shared_network_BDEL;
 
@@ -113,4 +114,5 @@ UPDATE schema_version
     SET version = '14', minor = '0';
 
 -- This line concludes database upgrade to version 14.
+
 EOF