From f84571984a2250d8cff2c342369fcc5067890b40 Mon Sep 17 00:00:00 2001 From: Razvan Becheriu Date: Tue, 29 Oct 2024 09:45:13 +0200 Subject: [PATCH] [#3587] use CHANGE instead of RENAME in MySQL --- .../database/scripts/mysql/dhcpdb_create.mysql | 18 +++++++++--------- .../scripts/mysql/upgrade_025_to_026.sh.in | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/share/database/scripts/mysql/dhcpdb_create.mysql b/src/share/database/scripts/mysql/dhcpdb_create.mysql index c1ba285340..723d26e966 100644 --- 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 index b9f322fb8a..c98223e2bc 100644 --- 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