Skip to content

engine-schema: add removed column for cloud.user_data, fix delete op #9120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DaanHoogland merged 1 commit into from
May 28, 2024
Merged

engine-schema: add removed column for cloud.user_data, fix delete op #9120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions engine/schema/src/main/java/com/cloud/user/UserDataVO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,12 @@
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 {
Expand Down Expand Up @@ -58,6 +62,9 @@ public UserDataVO() {
@Column(name = "params", length = 4096)
private String params;

@Column(name = GenericDao.REMOVED_COLUMN)
private Date removed;

@Override
public long getDomainId() {
return domainId;
Expand Down Expand Up @@ -117,4 +124,12 @@ public void setUserData(String userData) {
public void setParams(String params) {
this.params = params;
}

public void setRemoved(Date removed) {
this.removed = removed;
}

public Date getRemoved() {
return removed;
}
}
2 changes: 2 additions & 0 deletions engine/schema/src/main/resources/META-INF/db/schema-41900to41910.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"');