From: Francis Dupont Date: Wed, 20 Feb 2019 13:16:30 +0000 (+0100) Subject: [460-update-mysql-database-schema-for-dhcpv6--align-on-dhcpv4] Aligned server table... X-Git-Tag: 397-cb-implement-mysqlconfigbackenddhcpv6_base~25 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=705da9b3169e5a1f3c19c6f323751b231763fba3;p=thirdparty%2Fkea.git [460-update-mysql-database-schema-for-dhcpv6--align-on-dhcpv4] Aligned server table idexes --- diff --git a/src/share/database/scripts/mysql/dhcpdb_create.mysql b/src/share/database/scripts/mysql/dhcpdb_create.mysql index 286900206f..8768b41322 100644 --- 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 775541e971..f5b9551486 100644 --- 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';