Skip to content

Commit fd59729

Browse files
committed
[#89,!22] Removed dhcpX_options constraints.
1 parent 03b007f commit fd59729

File tree

2 files changed

+0
-48
lines changed

2 files changed

+0
-48
lines changed

src/share/database/scripts/mysql/dhcpdb_create.mysql

-24
Original file line numberDiff line numberDiff line change
@@ -1004,17 +1004,6 @@ ALTER TABLE dhcp4_options
10041004
ADD COLUMN dhcp4_pool_id BIGINT(20) UNSIGNED DEFAULT NULL,
10051005
ADD COLUMN modification_ts TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP;
10061006

1007-
# Add configuration backend specific constraints.
1008-
ALTER TABLE dhcp4_options
1009-
ADD CONSTRAINT fk_dhcp4_option_pool_id FOREIGN KEY (dhcp4_pool_id)
1010-
REFERENCES dhcp4_pool (id) ON DELETE CASCADE ON UPDATE CASCADE,
1011-
ADD CONSTRAINT fk_dhcp4_option_shared_network_name FOREIGN KEY (dhcp4_shared_network_name)
1012-
REFERENCES dhcp4_shared_network (name)
1013-
ON DELETE CASCADE ON UPDATE CASCADE,
1014-
ADD CONSTRAINT fk_dhcp4_option_subnet_id FOREIGN KEY (dhcp4_subnet_id)
1015-
REFERENCES dhcp4_subnet (subnet_id)
1016-
ON DELETE CASCADE ON UPDATE CASCADE;
1017-
10181007
-- -----------------------------------------------------
10191008
-- Table `dhcp4_options_server`
10201009
-- -----------------------------------------------------
@@ -1263,19 +1252,6 @@ ALTER TABLE dhcp6_options
12631252
ADD COLUMN dhcp6_pd_pool_id BIGINT(20) UNSIGNED DEFAULT NULL,
12641253
ADD COLUMN modification_ts TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP;
12651254

1266-
# Add configuration backend specific constraints.
1267-
ALTER TABLE dhcp6_options
1268-
ADD CONSTRAINT fk_dhcp6_option_pd_pool_id FOREIGN KEY (dhcp6_pd_pool_id)
1269-
REFERENCES dhcp6_pd_pool (id) ON DELETE CASCADE ON UPDATE CASCADE,
1270-
ADD CONSTRAINT fk_dhcp6_option_pool_id FOREIGN KEY (dhcp6_pool_id)
1271-
REFERENCES dhcp6_pool (id) ON DELETE CASCADE ON UPDATE CASCADE,
1272-
ADD CONSTRAINT fk_dhcp6_option_shared_network_name FOREIGN KEY (dhcp6_shared_network_name)
1273-
REFERENCES dhcp6_shared_network (name)
1274-
ON DELETE CASCADE ON UPDATE CASCADE,
1275-
ADD CONSTRAINT fk_dhcp6_option_subnet_id FOREIGN KEY (dhcp6_subnet_id)
1276-
REFERENCES dhcp6_subnet (subnet_id)
1277-
ON DELETE CASCADE ON UPDATE CASCADE;
1278-
12791255
-- -----------------------------------------------------
12801256
-- Table `dhcp6_options_server`
12811257
-- -----------------------------------------------------

src/share/database/scripts/mysql/upgrade_6.0_to_7.0.sh.in

-24
Original file line numberDiff line numberDiff line change
@@ -324,17 +324,6 @@ ALTER TABLE dhcp4_options
324324
ADD COLUMN dhcp4_pool_id BIGINT(20) UNSIGNED DEFAULT NULL,
325325
ADD COLUMN modification_ts TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP;
326326
327-
# Add configuration backend specific constraints.
328-
ALTER TABLE dhcp4_options
329-
ADD CONSTRAINT fk_dhcp4_option_pool_id FOREIGN KEY (dhcp4_pool_id)
330-
REFERENCES dhcp4_pool (id) ON DELETE CASCADE ON UPDATE CASCADE,
331-
ADD CONSTRAINT fk_dhcp4_option_shared_network_name FOREIGN KEY (dhcp4_shared_network_name)
332-
REFERENCES dhcp4_shared_network (name)
333-
ON DELETE CASCADE ON UPDATE CASCADE,
334-
ADD CONSTRAINT fk_dhcp4_option_subnet_id FOREIGN KEY (dhcp4_subnet_id)
335-
REFERENCES dhcp4_subnet (subnet_id)
336-
ON DELETE CASCADE ON UPDATE CASCADE;
337-
338327
# Create table dhcp4_options_server
339328
CREATE TABLE IF NOT EXISTS dhcp4_options_server (
340329
option_id BIGINT(20) UNSIGNED NOT NULL,
@@ -557,19 +546,6 @@ ALTER TABLE dhcp6_options
557546
ADD COLUMN dhcp6_pd_pool_id BIGINT(20) UNSIGNED DEFAULT NULL,
558547
ADD COLUMN modification_ts TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP;
559548
560-
# Add configuration backend specific constraints.
561-
ALTER TABLE dhcp6_options
562-
ADD CONSTRAINT fk_dhcp6_option_pd_pool_id FOREIGN KEY (dhcp6_pd_pool_id)
563-
REFERENCES dhcp6_pd_pool (id) ON DELETE CASCADE ON UPDATE CASCADE,
564-
ADD CONSTRAINT fk_dhcp6_option_pool_id FOREIGN KEY (dhcp6_pool_id)
565-
REFERENCES dhcp6_pool (id) ON DELETE CASCADE ON UPDATE CASCADE,
566-
ADD CONSTRAINT fk_dhcp6_option_shared_network_name FOREIGN KEY (dhcp6_shared_network_name)
567-
REFERENCES dhcp6_shared_network (name)
568-
ON DELETE CASCADE ON UPDATE CASCADE,
569-
ADD CONSTRAINT fk_dhcp6_option_subnet_id FOREIGN KEY (dhcp6_subnet_id)
570-
REFERENCES dhcp6_subnet (subnet_id)
571-
ON DELETE CASCADE ON UPDATE CASCADE;
572-
573549
# Create table dhcp6_options_server
574550
CREATE TABLE IF NOT EXISTS dhcp6_options_server (
575551
option_id BIGINT(20) UNSIGNED NOT NULL,

0 commit comments

Comments
 (0)