[#93,!63] Added CASCADE delete to MySQL CB schema.

diff --git a/src/share/database/scripts/mysql/dhcpdb_create.mysql b/src/share/database/scripts/mysql/dhcpdb_create.mysql
index cd7692b409e811176856a59bbb3ae3b5f16a995c..b965429a7d852114635f93ce97af2077341fa923 100644 (file)
--- a/src/share/database/scripts/mysql/dhcpdb_create.mysql
+++ b/src/share/database/scripts/mysql/dhcpdb_create.mysql
@@ -870,7 +870,7 @@ CREATE TABLE IF NOT EXISTS dhcp4_global_parameter_server (
     KEY key_dhcp4_global_parameter_server (modification_ts),
     CONSTRAINT fk_dhcp4_global_parameter_server_parameter_id FOREIGN KEY (parameter_id)
         REFERENCES dhcp4_global_parameter (id)
-        ON DELETE NO ACTION ON UPDATE NO ACTION,
+        ON DELETE CASCADE ON UPDATE NO ACTION,
     CONSTRAINT fk_dhcp4_global_parameter_server_server_id FOREIGN KEY (server_id)
         REFERENCES dhcp4_server (id)
         ON DELETE NO ACTION ON UPDATE NO ACTION
@@ -909,7 +909,7 @@ CREATE TABLE IF NOT EXISTS dhcp4_option_def_server (
     KEY key_dhcp4_option_def_server_modification_ts (modification_ts),
     CONSTRAINT fk_dhcp4_option_def_server_option_def_id FOREIGN KEY (option_def_id)
         REFERENCES dhcp4_option_def (id)
-        ON DELETE NO ACTION ON UPDATE NO ACTION,
+        ON DELETE CASCADE ON UPDATE NO ACTION,
     CONSTRAINT fk_dhcp4_option_def_server_server_id FOREIGN KEY (server_id)
         REFERENCES dhcp4_server (id) ON DELETE NO ACTION ON UPDATE NO ACTION
 ) ENGINE=InnoDB;
@@ -952,7 +952,7 @@ CREATE TABLE IF NOT EXISTS dhcp4_shared_network_server (
         REFERENCES dhcp4_server (id)
         ON DELETE NO ACTION ON UPDATE NO ACTION,
     CONSTRAINT fk_dhcp4_shared_network_server_shared_network_id FOREIGN KEY (shared_network_id)
-        REFERENCES dhcp4_shared_network (id) ON DELETE NO ACTION ON UPDATE NO ACTION
+        REFERENCES dhcp4_shared_network (id) ON DELETE CASCADE ON UPDATE NO ACTION
 ) ENGINE=InnoDB;
 
 -- -----------------------------------------------------
@@ -1021,7 +1021,7 @@ CREATE TABLE IF NOT EXISTS dhcp4_subnet_server (
         ON DELETE NO ACTION ON UPDATE NO ACTION,
     CONSTRAINT fk_dhcp4_subnet_server_subnet_id FOREIGN KEY (subnet_id)
         REFERENCES dhcp4_subnet (subnet_id)
-        ON DELETE NO ACTION ON UPDATE NO ACTION
+        ON DELETE CASCADE ON UPDATE NO ACTION
 ) ENGINE=InnoDB;
 
 
@@ -1047,7 +1047,7 @@ CREATE TABLE IF NOT EXISTS dhcp4_options_server (
     KEY key_dhcp4_options_server_modification_ts (modification_ts),
     CONSTRAINT fk_dhcp4_options_server_option_id FOREIGN KEY (option_id)
         REFERENCES dhcp4_options (option_id)
-        ON DELETE NO ACTION ON UPDATE NO ACTION,
+        ON DELETE CASCADE ON UPDATE NO ACTION,
     CONSTRAINT fk_dhcp4_options_server_server_id FOREIGN KEY (server_id)
         REFERENCES dhcp4_server (id)
         ON DELETE NO ACTION ON UPDATE NO ACTION
@@ -1134,7 +1134,7 @@ CREATE TABLE IF NOT EXISTS dhcp6_global_parameter_server (
     KEY key_dhcp6_global_parameter_server (modification_ts),
     CONSTRAINT fk_dhcp6_global_parameter_server_parameter_id FOREIGN KEY (parameter_id)
         REFERENCES dhcp6_global_parameter (id)
-        ON DELETE NO ACTION ON UPDATE NO ACTION,
+        ON DELETE CASCADE ON UPDATE NO ACTION,
     CONSTRAINT fk_dhcp6_global_parameter_server_server_id FOREIGN KEY (server_id)
         REFERENCES dhcp6_server (id)
         ON DELETE NO ACTION ON UPDATE NO ACTION
@@ -1173,7 +1173,7 @@ CREATE TABLE IF NOT EXISTS dhcp6_option_def_server (
     KEY key_dhcp6_option_def_server_modification_ts (modification_ts),
     CONSTRAINT fk_dhcp6_option_def_server_option_def_id FOREIGN KEY (option_def_id)
         REFERENCES dhcp6_option_def (id)
-        ON DELETE NO ACTION ON UPDATE NO ACTION,
+        ON DELETE CASCADE ON UPDATE NO ACTION,
     CONSTRAINT fk_dhcp6_option_def_server_server_id FOREIGN KEY (server_id)
         REFERENCES dhcp6_server (id) ON DELETE NO ACTION ON UPDATE NO ACTION
 ) ENGINE=InnoDB;
@@ -1218,7 +1218,7 @@ CREATE TABLE IF NOT EXISTS dhcp6_shared_network_server (
         ON DELETE NO ACTION ON UPDATE NO ACTION,
     CONSTRAINT fk_dhcp6_shared_network_server_shared_network_id FOREIGN KEY (shared_network_id)
         REFERENCES dhcp6_shared_network (id)
-        ON DELETE NO ACTION ON UPDATE NO ACTION
+        ON DELETE CASCADE ON UPDATE NO ACTION
 ) ENGINE=InnoDB;
 
 -- -----------------------------------------------------
@@ -1266,7 +1266,7 @@ CREATE TABLE dhcp6_subnet_server (
         ON DELETE NO ACTION ON UPDATE NO ACTION,
     CONSTRAINT fk_dhcp6_subnet_server_subnet_id FOREIGN KEY (subnet_id)
         REFERENCES dhcp6_subnet (subnet_id)
-        ON DELETE NO ACTION ON UPDATE NO ACTION
+        ON DELETE CASCADE ON UPDATE NO ACTION
 ) ENGINE=InnoDB;
 
 -- -----------------------------------------------------
@@ -1328,7 +1328,7 @@ CREATE TABLE IF NOT EXISTS dhcp6_options_server (
         ON DELETE NO ACTION ON UPDATE NO ACTION,
     CONSTRAINT fk_dhcp6_options_server_server_id FOREIGN KEY (server_id)
         REFERENCES dhcp6_server (id)
-        ON DELETE NO ACTION ON UPDATE NO ACTION
+        ON DELETE CASCADE ON UPDATE NO ACTION
 ) ENGINE=InnoDB;
 
 # Create trigger which removes pool specific options upon removal of

diff --git a/src/share/database/scripts/mysql/upgrade_6.0_to_7.0.sh.in b/src/share/database/scripts/mysql/upgrade_6.0_to_7.0.sh.in
index de9ea68df3a065b2445bc725d017202dc9581e5e..1eb7cdebb120514f5530bc0ae3fd679297cca8e0 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_6.0_to_7.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_6.0_to_7.0.sh.in
@@ -205,7 +205,7 @@ CREATE TABLE IF NOT EXISTS dhcp4_global_parameter_server (
     KEY key_dhcp4_global_parameter_server (modification_ts),
     CONSTRAINT fk_dhcp4_global_parameter_server_parameter_id FOREIGN KEY (parameter_id)
         REFERENCES dhcp4_global_parameter (id)
-        ON DELETE NO ACTION ON UPDATE NO ACTION,
+        ON DELETE CASCADE ON UPDATE NO ACTION,
     CONSTRAINT fk_dhcp4_global_parameter_server_server_id FOREIGN KEY (server_id)
         REFERENCES dhcp4_server (id)
         ON DELETE NO ACTION ON UPDATE NO ACTION
@@ -241,7 +241,7 @@ CREATE TABLE IF NOT EXISTS dhcp4_option_def_server (
     KEY key_dhcp4_option_def_server_modification_ts (modification_ts),
     CONSTRAINT fk_dhcp4_option_def_server_option_def_id FOREIGN KEY (option_def_id)
         REFERENCES dhcp4_option_def (id)
-        ON DELETE NO ACTION ON UPDATE NO ACTION,
+        ON DELETE CASCADE ON UPDATE NO ACTION,
     CONSTRAINT fk_dhcp4_option_def_server_server_id FOREIGN KEY (server_id)
         REFERENCES dhcp4_server (id) ON DELETE NO ACTION ON UPDATE NO ACTION
 ) ENGINE=InnoDB;
@@ -281,7 +281,7 @@ CREATE TABLE IF NOT EXISTS dhcp4_shared_network_server (
         REFERENCES dhcp4_server (id)
         ON DELETE NO ACTION ON UPDATE NO ACTION,
     CONSTRAINT fk_dhcp4_shared_network_server_shared_network_id FOREIGN KEY (shared_network_id)
-        REFERENCES dhcp4_shared_network (id) ON DELETE NO ACTION ON UPDATE NO ACTION
+        REFERENCES dhcp4_shared_network (id) ON DELETE CASCADE ON UPDATE NO ACTION
 ) ENGINE=InnoDB;
 
 # Create table dhcp4_subnet
@@ -347,7 +347,7 @@ CREATE TABLE IF NOT EXISTS dhcp4_subnet_server (
         ON DELETE NO ACTION ON UPDATE NO ACTION,
     CONSTRAINT fk_dhcp4_subnet_server_subnet_id FOREIGN KEY (subnet_id)
         REFERENCES dhcp4_subnet (subnet_id)
-        ON DELETE NO ACTION ON UPDATE NO ACTION
+        ON DELETE CASCADE ON UPDATE NO ACTION
 ) ENGINE=InnoDB;
 
 
@@ -373,7 +373,7 @@ CREATE TABLE IF NOT EXISTS dhcp4_options_server (
     KEY key_dhcp4_options_server_modification_ts (modification_ts),
     CONSTRAINT fk_dhcp4_options_server_option_id FOREIGN KEY (option_id)
         REFERENCES dhcp4_options (option_id)
-        ON DELETE NO ACTION ON UPDATE NO ACTION,
+        ON DELETE CASCADE ON UPDATE NO ACTION,
     CONSTRAINT fk_dhcp4_options_server_server_id FOREIGN KEY (server_id)
         REFERENCES dhcp4_server (id)
         ON DELETE NO ACTION ON UPDATE NO ACTION
@@ -455,7 +455,7 @@ CREATE TABLE IF NOT EXISTS dhcp6_global_parameter_server (
     KEY key_dhcp6_global_parameter_server (modification_ts),
     CONSTRAINT fk_dhcp6_global_parameter_server_parameter_id FOREIGN KEY (parameter_id)
         REFERENCES dhcp6_global_parameter (id)
-        ON DELETE NO ACTION ON UPDATE NO ACTION,
+        ON DELETE CASCADE ON UPDATE NO ACTION,
     CONSTRAINT fk_dhcp6_global_parameter_server_server_id FOREIGN KEY (server_id)
         REFERENCES dhcp6_server (id)
         ON DELETE NO ACTION ON UPDATE NO ACTION
@@ -491,7 +491,7 @@ CREATE TABLE IF NOT EXISTS dhcp6_option_def_server (
     KEY key_dhcp6_option_def_server_modification_ts (modification_ts),
     CONSTRAINT fk_dhcp6_option_def_server_option_def_id FOREIGN KEY (option_def_id)
         REFERENCES dhcp6_option_def (id)
-        ON DELETE NO ACTION ON UPDATE NO ACTION,
+        ON DELETE CASCADE ON UPDATE NO ACTION,
     CONSTRAINT fk_dhcp6_option_def_server_server_id FOREIGN KEY (server_id)
         REFERENCES dhcp6_server (id) ON DELETE NO ACTION ON UPDATE NO ACTION
 ) ENGINE=InnoDB;
@@ -533,7 +533,7 @@ CREATE TABLE IF NOT EXISTS dhcp6_shared_network_server (
         ON DELETE NO ACTION ON UPDATE NO ACTION,
     CONSTRAINT fk_dhcp6_shared_network_server_shared_network_id FOREIGN KEY (shared_network_id)
         REFERENCES dhcp6_shared_network (id)
-        ON DELETE NO ACTION ON UPDATE NO ACTION
+        ON DELETE CASCADE ON UPDATE NO ACTION
 ) ENGINE=InnoDB;
 
 # Create table dhcp6_subnet
@@ -578,7 +578,7 @@ CREATE TABLE dhcp6_subnet_server (
         ON DELETE NO ACTION ON UPDATE NO ACTION,
     CONSTRAINT fk_dhcp6_subnet_server_subnet_id FOREIGN KEY (subnet_id)
         REFERENCES dhcp6_subnet (subnet_id)
-        ON DELETE NO ACTION ON UPDATE NO ACTION
+        ON DELETE CASCADE ON UPDATE NO ACTION
 ) ENGINE=InnoDB;
 
 # Create table dhcp6_pd_pool
@@ -634,7 +634,7 @@ CREATE TABLE IF NOT EXISTS dhcp6_options_server (
     KEY key_dhcp6_options_server_modification_ts (modification_ts),
     CONSTRAINT fk_dhcp6_options_server_option_id FOREIGN KEY (option_id)
         REFERENCES dhcp6_options (option_id)
-        ON DELETE NO ACTION ON UPDATE NO ACTION,
+        ON DELETE CASCADE ON UPDATE NO ACTION,
     CONSTRAINT fk_dhcp6_options_server_server_id FOREIGN KEY (server_id)
         REFERENCES dhcp6_server (id)
         ON DELETE NO ACTION ON UPDATE NO ACTION