From 38535459d24194ab219d55ca0a7c8ed74078060b Mon Sep 17 00:00:00 2001 From: gabriel Date: Wed, 9 Mar 2022 18:02:20 +0100 Subject: [PATCH 1/3] Change column `value` size from 255 to 4096 characters, matching the API size --- .../cloudstack/api/command/admin/config/UpdateCfgCmd.java | 2 +- .../src/main/resources/META-INF/db/schema-41610to41700.sql | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java index acc0d79baae6..0770f3c5a54b 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java @@ -50,7 +50,7 @@ public class UpdateCfgCmd extends BaseCmd { @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true, description = "the name of the configuration") private String cfgName; - @Parameter(name = ApiConstants.VALUE, type = CommandType.STRING, description = "the value of the configuration", length = 4095) + @Parameter(name = ApiConstants.VALUE, type = CommandType.STRING, description = "the value of the configuration", length = 4096) private String value; @Parameter(name = ApiConstants.ZONE_ID, diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41610to41700.sql b/engine/schema/src/main/resources/META-INF/db/schema-41610to41700.sql index fc53758cc9a3..4716e8461d81 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-41610to41700.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-41610to41700.sql @@ -652,3 +652,5 @@ INSERT INTO `cloud`.`user_vm_details`(`vm_id`, `name`, `value`) INNER JOIN `cloud`.`vm_instance` ON vm_instance.id = user_vm_details.vm_id WHERE ssh_keypairs.account_id = vm_instance.account_id; +-- PR #6080 Change column `value` size from 255 to 4096 characters, matching the API "updateConfiguration" "value" size +ALTER TABLE `cloud`.`account_details` MODIFY `value` VARCHAR(4096); From 19af54e5e68bb180509eb2671f4b99d971f7348c Mon Sep 17 00:00:00 2001 From: Bart Meyers Date: Wed, 3 Aug 2022 09:52:32 +0200 Subject: [PATCH 2/3] Fix change column value size for account_details --- engine/schema/src/main/java/com/cloud/user/AccountDetailVO.java | 2 +- .../src/main/resources/META-INF/db/schema-41610to41700.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/schema/src/main/java/com/cloud/user/AccountDetailVO.java b/engine/schema/src/main/java/com/cloud/user/AccountDetailVO.java index f4b356730ece..71ad765e618f 100644 --- a/engine/schema/src/main/java/com/cloud/user/AccountDetailVO.java +++ b/engine/schema/src/main/java/com/cloud/user/AccountDetailVO.java @@ -42,7 +42,7 @@ public class AccountDetailVO implements InternalIdentity { private String name; @Encrypt - @Column(name = "value") + @Column(name = "value", length=4096) private String value; protected AccountDetailVO() { diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41610to41700.sql b/engine/schema/src/main/resources/META-INF/db/schema-41610to41700.sql index 4716e8461d81..9e445761035c 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-41610to41700.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-41610to41700.sql @@ -653,4 +653,4 @@ INSERT INTO `cloud`.`user_vm_details`(`vm_id`, `name`, `value`) WHERE ssh_keypairs.account_id = vm_instance.account_id; -- PR #6080 Change column `value` size from 255 to 4096 characters, matching the API "updateConfiguration" "value" size -ALTER TABLE `cloud`.`account_details` MODIFY `value` VARCHAR(4096); +ALTER TABLE `cloud`.`account_details` MODIFY `value` VARCHAR(4096) NOT NULL; From 002414e1944620d79baa6e4173afdf91835f6669 Mon Sep 17 00:00:00 2001 From: Bart Meyers Date: Tue, 9 Aug 2022 13:36:30 +0200 Subject: [PATCH 3/3] Move schema change to 4.17.1 upgrade path --- .../src/main/resources/META-INF/db/schema-41700to41710.sql | 3 +++ 1 file changed, 3 insertions(+) diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41700to41710.sql b/engine/schema/src/main/resources/META-INF/db/schema-41700to41710.sql index abbc99a53bc8..7b8ed8f68483 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-41700to41710.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-41700to41710.sql @@ -126,3 +126,6 @@ CREATE VIEW `cloud`.`domain_router_view` AS `cloud`.`async_job` ON async_job.instance_id = vm_instance.id and async_job.instance_type = 'DomainRouter' and async_job.job_status = 0; + +-- PR #6080 Change column `value` size from 255 to 4096 characters, matching the API "updateConfiguration" "value" size +ALTER TABLE `cloud`.`account_details` MODIFY `value` VARCHAR(4096) NOT NULL; \ No newline at end of file