From: Marcin Siodelski <marcin@isc.org>
Date: Wed, 6 Mar 2019 11:26:36 +0000 (+0100)
Subject: [#488,!259] Added sname, next-server and boot-file-name to MySQL schema.
X-Git-Tag: 494-dhcp4configparser-sharednetworkssanitychecks-is-buggy_base~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da92b4e9e3fca35210ae1182e7af28716f57df22;p=thirdparty%2Fkea.git

[#488,!259] Added sname, next-server and boot-file-name to MySQL schema.
---

diff --git a/src/bin/admin/tests/mysql_tests.sh.in b/src/bin/admin/tests/mysql_tests.sh.in
index 61fd5b1446..9d9e9d83bb 100644
--- a/src/bin/admin/tests/mysql_tests.sh.in
+++ b/src/bin/admin/tests/mysql_tests.sh.in
@@ -507,7 +507,7 @@ EOF
     run_statement "dhcp4_option_def_server" "$qry"
 
     # table: dhcp4_shared_network
-    qry="select id, name, client_class, interface, match_client_id, modification_ts, rebind_timer, relay, renew_timer, require_client_classes, reservation_mode, user_context, valid_lifetime, authoritative, calculate_tee_times, t1_percent, t2_percent from dhcp4_shared_network"
+    qry="select id, name, client_class, interface, match_client_id, modification_ts, rebind_timer, relay, renew_timer, require_client_classes, reservation_mode, user_context, valid_lifetime, authoritative, calculate_tee_times, t1_percent, t2_percent, boot_file_name, next_server, server_hostname from dhcp4_shared_network"
     run_statement "dhcp4_shared_network" "$qry"
 
     # table: dhcp4_shared_network_server
diff --git a/src/share/database/scripts/mysql/dhcpdb_create.mysql b/src/share/database/scripts/mysql/dhcpdb_create.mysql
index 7e4fc83096..01526513f0 100644
--- a/src/share/database/scripts/mysql/dhcpdb_create.mysql
+++ b/src/share/database/scripts/mysql/dhcpdb_create.mysql
@@ -1359,7 +1359,10 @@ ALTER TABLE dhcp4_shared_network
     ADD COLUMN authoritative TINYINT(1) DEFAULT NULL,
     ADD COLUMN calculate_tee_times TINYINT(1) DEFAULT NULL,
     ADD COLUMN t1_percent FLOAT DEFAULT NULL,
-    ADD COLUMN t2_percent FLOAT DEFAULT NULL;
+    ADD COLUMN t2_percent FLOAT DEFAULT NULL,
+    ADD COLUMN boot_file_name VARCHAR(512) DEFAULT NULL,
+    ADD COLUMN next_server INT(10) UNSIGNED DEFAULT NULL,
+    ADD COLUMN server_hostname VARCHAR(512) DEFAULT NULL;
 
 ALTER TABLE dhcp4_shared_network
     MODIFY COLUMN reservation_mode TINYINT(3) DEFAULT NULL;
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 a90a3612b3..b574a47ce0 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
@@ -42,7 +42,10 @@ ALTER TABLE dhcp4_shared_network
     ADD COLUMN authoritative TINYINT(1) DEFAULT NULL,
     ADD COLUMN calculate_tee_times TINYINT(1) DEFAULT NULL,
     ADD COLUMN t1_percent FLOAT DEFAULT NULL,
-    ADD COLUMN t2_percent FLOAT DEFAULT NULL;
+    ADD COLUMN t2_percent FLOAT DEFAULT NULL,
+    ADD COLUMN boot_file_name VARCHAR(512) DEFAULT NULL,
+    ADD COLUMN next_server INT(10) UNSIGNED DEFAULT NULL,
+    ADD COLUMN server_hostname VARCHAR(512) DEFAULT NULL;
 
 ALTER TABLE dhcp4_shared_network
     MODIFY COLUMN reservation_mode TINYINT(3) DEFAULT NULL;