[460-update-mysql-database-schema-for-dhcpv6--align-on-dhcpv4] Aligned server table...

diff --git a/src/share/database/scripts/mysql/dhcpdb_create.mysql b/src/share/database/scripts/mysql/dhcpdb_create.mysql
index 286900206fdbcd8ef4d56a288426d66fd35751db..8768b41322d5f0049b4e2c79ed17e3a2f9047354 100644 (file)
--- a/src/share/database/scripts/mysql/dhcpdb_create.mysql
+++ b/src/share/database/scripts/mysql/dhcpdb_create.mysql
@@ -1815,6 +1815,21 @@ ALTER TABLE dhcp6_pool
 ALTER TABLE dhcp6_pd_pool
     CHANGE dhcp6_subnet_id subnet_id INT(10) UNSIGNED NOT NULL;
 
+-- align dhcp6_shared_network_server indexes on dhcp4_shared_network_server
+
+ALTER TABLE dhcp6_shared_network_server
+    ADD PRIMARY KEY (shared_network_id, server_id);
+
+ALTER TABLE dhcp6_shared_network_server
+    DROP FOREIGN KEY fk_dhcp6_shared_network_server_shared_network_id;
+DROP INDEX fk_dhcp6_shared_network_server_shared_network_id
+    ON dhcp6_shared_network_server;
+ALTER TABLE dhcp6_shared_network_server
+    ADD CONSTRAINT fk_dhcp6_shared_network_server_shared_network_id
+    FOREIGN KEY (shared_network_id)
+    REFERENCES dhcp6_shared_network (id)
+    ON DELETE CASCADE ON UPDATE NO ACTION;
+
 # Update the schema version number
 UPDATE schema_version
 SET version = '8', minor = '0';

diff --git a/src/share/database/scripts/mysql/upgrade_7.0_to_8.0.sh.in b/src/share/database/scripts/mysql/upgrade_7.0_to_8.0.sh.in
index 775541e971a6513e13885e0596bd6fb962dfad6e..f5b95514868ae8776a6b81fa46ac355cd53681b5 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_7.0_to_8.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_7.0_to_8.0.sh.in
@@ -498,6 +498,21 @@ ALTER TABLE dhcp6_pool
 ALTER TABLE dhcp6_pd_pool
     CHANGE dhcp6_subnet_id subnet_id INT(10) UNSIGNED NOT NULL;
 
+-- align dhcp6_shared_network_server indexes on dhcp4_shared_network_server
+
+ALTER TABLE dhcp6_shared_network_server
+    ADD PRIMARY KEY (shared_network_id, server_id);
+
+ALTER TABLE dhcp6_shared_network_server
+    DROP FOREIGN KEY fk_dhcp6_shared_network_server_shared_network_id;
+DROP INDEX fk_dhcp6_shared_network_server_shared_network_id
+    ON dhcp6_shared_network_server;
+ALTER TABLE dhcp6_shared_network_server
+    ADD CONSTRAINT fk_dhcp6_shared_network_server_shared_network_id
+    FOREIGN KEY (shared_network_id)
+    REFERENCES dhcp6_shared_network (id)
+    ON DELETE CASCADE ON UPDATE NO ACTION;
+
 # Update the schema version number
 UPDATE schema_version
 SET version = '8', minor = '0';