Skip to content

Commit c970141

Browse files
authored
engine-schema: add removed columne for cloud.user_data, fix delete op (apache#9120)
Signed-off-by: Abhishek Kumar <[email protected]>
1 parent c36a3b8 commit c970141

File tree

2 files changed

+17
-0
lines changed

2 files changed

+17
-0
lines changed

engine/schema/src/main/java/com/cloud/user/UserDataVO.java

+15
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,12 @@
2424
import javax.persistence.GenerationType;
2525
import javax.persistence.Id;
2626
import javax.persistence.Table;
27+
28+
import java.util.Date;
2729
import java.util.UUID;
2830

31+
import com.cloud.utils.db.GenericDao;
32+
2933
@Entity
3034
@Table(name = "user_data")
3135
public class UserDataVO implements UserData {
@@ -58,6 +62,9 @@ public UserDataVO() {
5862
@Column(name = "params", length = 4096)
5963
private String params;
6064

65+
@Column(name = GenericDao.REMOVED_COLUMN)
66+
private Date removed;
67+
6168
@Override
6269
public long getDomainId() {
6370
return domainId;
@@ -117,4 +124,12 @@ public void setUserData(String userData) {
117124
public void setParams(String params) {
118125
this.params = params;
119126
}
127+
128+
public void setRemoved(Date removed) {
129+
this.removed = removed;
130+
}
131+
132+
public Date getRemoved() {
133+
return removed;
134+
}
120135
}

engine/schema/src/main/resources/META-INF/db/schema-41900to41910.sql

+2
Original file line numberDiff line numberDiff line change
@@ -63,3 +63,5 @@ CREATE TABLE IF NOT EXISTS `cloud_usage`.`usage_vpc` (
6363
) ENGINE=InnoDB CHARSET=utf8;
6464

6565
CALL `cloud_usage`.`IDEMPOTENT_ADD_COLUMN`('cloud_usage.cloud_usage', 'state', 'VARCHAR(100) DEFAULT NULL');
66+
67+
CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.user_data', 'removed', 'datetime COMMENT "date removed or null, if still present"');

0 commit comments

Comments
 (0)