[#3587] use CHANGE instead of RENAME in MySQL

isc-projects · Oct 29, 2024 · f845719 · f845719
1 parent 140f255
commit f845719
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/src/share/database/scripts/mysql/dhcpdb_create.mysql b/src/share/database/scripts/mysql/dhcpdb_create.mysql
@@ -6036,31 +6036,31 @@ UPDATE option_def_data_type SET name='int8' WHERE id = 3;
 
 -- Rename require_client_classes and only_if_required.
 ALTER TABLE dhcp4_shared_network
-    RENAME COLUMN require_client_classes TO evaluate_additional_classes;
+    CHANGE require_client_classes evaluate_additional_classes LONGTEXT DEFAULT NULL;
 
 ALTER TABLE dhcp4_subnet
-    RENAME COLUMN require_client_classes TO evaluate_additional_classes;
+    CHANGE require_client_classes evaluate_additional_classes LONGTEXT DEFAULT NULL;
 
 ALTER TABLE dhcp4_pool
-    RENAME COLUMN require_client_classes TO evaluate_additional_classes;
+    CHANGE require_client_classes evaluate_additional_classes LONGTEXT DEFAULT NULL;
 
 ALTER TABLE dhcp6_shared_network
-    RENAME COLUMN require_client_classes TO evaluate_additional_classes;
+    CHANGE require_client_classes evaluate_additional_classes LONGTEXT DEFAULT NULL;
 
 ALTER TABLE dhcp6_subnet
-    RENAME COLUMN require_client_classes TO evaluate_additional_classes;
+    CHANGE require_client_classes evaluate_additional_classes LONGTEXT DEFAULT NULL;
 
 ALTER TABLE dhcp6_pool
-    RENAME COLUMN require_client_classes TO evaluate_additional_classes;
+    CHANGE require_client_classes evaluate_additional_classes LONGTEXT DEFAULT NULL;
 
 ALTER TABLE dhcp6_pd_pool
-    RENAME COLUMN require_client_classes TO evaluate_additional_classes;
+    CHANGE require_client_classes evaluate_additional_classes LONGTEXT DEFAULT NULL;
 
 ALTER TABLE dhcp4_client_class
-    RENAME COLUMN only_if_required TO only_in_additional_list;
+    CHANGE only_if_required only_in_additional_list TINYINT NOT NULL DEFAULT '0';
 
 ALTER TABLE dhcp6_client_class
-    RENAME COLUMN only_if_required TO only_in_additional_list;
+    CHANGE only_if_required only_in_additional_list TINYINT NOT NULL DEFAULT '0';
 
 -- Update the schema version number.
 UPDATE schema_version

diff --git a/src/share/database/scripts/mysql/upgrade_025_to_026.sh.in b/src/share/database/scripts/mysql/upgrade_025_to_026.sh.in
@@ -67,31 +67,31 @@ UPDATE option_def_data_type SET name='int8' WHERE id = 3;
 
 -- Rename require_client_classes and only_if_required.
 ALTER TABLE dhcp4_shared_network
-    RENAME COLUMN require_client_classes TO evaluate_additional_classes;
+    CHANGE require_client_classes evaluate_additional_classes LONGTEXT DEFAULT NULL;
 
 ALTER TABLE dhcp4_subnet
-    RENAME COLUMN require_client_classes TO evaluate_additional_classes;
+    CHANGE require_client_classes evaluate_additional_classes LONGTEXT DEFAULT NULL;
 
 ALTER TABLE dhcp4_pool
-    RENAME COLUMN require_client_classes TO evaluate_additional_classes;
+    CHANGE require_client_classes evaluate_additional_classes LONGTEXT DEFAULT NULL;
 
 ALTER TABLE dhcp6_shared_network
-    RENAME COLUMN require_client_classes TO evaluate_additional_classes;
+    CHANGE require_client_classes evaluate_additional_classes LONGTEXT DEFAULT NULL;
 
 ALTER TABLE dhcp6_subnet
-    RENAME COLUMN require_client_classes TO evaluate_additional_classes;
+    CHANGE require_client_classes evaluate_additional_classes LONGTEXT DEFAULT NULL;
 
 ALTER TABLE dhcp6_pool
-    RENAME COLUMN require_client_classes TO evaluate_additional_classes;
+    CHANGE require_client_classes evaluate_additional_classes LONGTEXT DEFAULT NULL;
 
 ALTER TABLE dhcp6_pd_pool
-    RENAME COLUMN require_client_classes TO evaluate_additional_classes;
+    CHANGE require_client_classes evaluate_additional_classes LONGTEXT DEFAULT NULL;
 
 ALTER TABLE dhcp4_client_class
-    RENAME COLUMN only_if_required TO only_in_additional_list;
+    CHANGE only_if_required only_in_additional_list TINYINT NOT NULL DEFAULT '0';
 
 ALTER TABLE dhcp6_client_class
-    RENAME COLUMN only_if_required TO only_in_additional_list;
+    CHANGE only_if_required only_in_additional_list TINYINT NOT NULL DEFAULT '0';
 
 -- Update the schema version number.
 UPDATE schema_version