From c970141e25055e3b11574c5436fe541c60d204c1 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Tue, 28 May 2024 13:13:14 +0530 Subject: [PATCH] engine-schema: add removed columne for cloud.user_data, fix delete op (#9120) Signed-off-by: Abhishek Kumar --- .../src/main/java/com/cloud/user/UserDataVO.java | 15 +++++++++++++++ .../resources/META-INF/db/schema-41900to41910.sql | 2 ++ 2 files changed, 17 insertions(+) diff --git a/engine/schema/src/main/java/com/cloud/user/UserDataVO.java b/engine/schema/src/main/java/com/cloud/user/UserDataVO.java index f54b1a8872e..a8e48ad22b1 100644 --- a/engine/schema/src/main/java/com/cloud/user/UserDataVO.java +++ b/engine/schema/src/main/java/com/cloud/user/UserDataVO.java @@ -24,8 +24,12 @@ import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; + +import java.util.Date; import java.util.UUID; +import com.cloud.utils.db.GenericDao; + @Entity @Table(name = "user_data") public class UserDataVO implements UserData { @@ -58,6 +62,9 @@ public class UserDataVO implements UserData { @Column(name = "params", length = 4096) private String params; + @Column(name = GenericDao.REMOVED_COLUMN) + private Date removed; + @Override public long getDomainId() { return domainId; @@ -117,4 +124,12 @@ public class UserDataVO implements UserData { public void setParams(String params) { this.params = params; } + + public void setRemoved(Date removed) { + this.removed = removed; + } + + public Date getRemoved() { + return removed; + } } diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41900to41910.sql b/engine/schema/src/main/resources/META-INF/db/schema-41900to41910.sql index c05f5503c3e..bdb23d9844c 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-41900to41910.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-41900to41910.sql @@ -63,3 +63,5 @@ CREATE TABLE IF NOT EXISTS `cloud_usage`.`usage_vpc` ( ) ENGINE=InnoDB CHARSET=utf8; CALL `cloud_usage`.`IDEMPOTENT_ADD_COLUMN`('cloud_usage.cloud_usage', 'state', 'VARCHAR(100) DEFAULT NULL'); + +CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.user_data', 'removed', 'datetime COMMENT "date removed or null, if still present"');