Removed deleted_by from user_group and user_group_member tables.
Change-Id: I81c36ec5097f8cb229813dd903fb66785dfba485
diff --git a/src/main/java/de/ids_mannheim/korap/entity/UserGroup.java b/src/main/java/de/ids_mannheim/korap/entity/UserGroup.java
index 4bb17fe..f5522c2 100644
--- a/src/main/java/de/ids_mannheim/korap/entity/UserGroup.java
+++ b/src/main/java/de/ids_mannheim/korap/entity/UserGroup.java
@@ -45,8 +45,6 @@
private String description;
@Column(name = "created_by")
private String createdBy;
- @Column(name = "deleted_by")
- private String deletedBy;
@Column(name = "created_date")
private ZonedDateTime createdDate;
diff --git a/src/main/java/de/ids_mannheim/korap/entity/UserGroupMember.java b/src/main/java/de/ids_mannheim/korap/entity/UserGroupMember.java
index e1cc3e5..4030fc9 100644
--- a/src/main/java/de/ids_mannheim/korap/entity/UserGroupMember.java
+++ b/src/main/java/de/ids_mannheim/korap/entity/UserGroupMember.java
@@ -47,8 +47,6 @@
private String userId;
@Column(name = "created_by")
private String createdBy;
- @Column(name = "deleted_by")
- private String deletedBy;
// auto update in the database
@Column(name = "status_date")
@@ -74,7 +72,7 @@
@Override
public String toString () {
return "id=" + id + ", group= " + group + ", userId= " + userId
- + ", createdBy= " + createdBy + ", deletedBy= " + deletedBy
+ + ", createdBy= " + createdBy
+ ", roles=" + roles;
}
}
diff --git a/src/main/resources/db/sqlite/V1.13__user_group_alteration.sql b/src/main/resources/db/sqlite/V1.13__user_group_alteration.sql
index f977c4e..84daff6 100644
--- a/src/main/resources/db/sqlite/V1.13__user_group_alteration.sql
+++ b/src/main/resources/db/sqlite/V1.13__user_group_alteration.sql
@@ -6,19 +6,19 @@
-- please commented out the triggers in V1.2__triggers.sql later
--DROP TRIGGER IF EXISTS insert_member_status;
--DROP TRIGGER IF EXISTS update_member_status;
---DROP TRIGGER IF EXISTS delete_member;
+DROP TRIGGER IF EXISTS delete_member;
---ALTER TABLE user_group
---DROP COLUMN deleted_by;
---
+ALTER TABLE user_group
+DROP COLUMN deleted_by;
+
ALTER TABLE user_group
ADD COLUMN created_date TIMESTAMP;
--
--ALTER TABLE user_group_member
--DROP COLUMN created_by;
--
---ALTER TABLE user_group_member
---DROP COLUMN deleted_by;
+ALTER TABLE user_group_member
+DROP COLUMN deleted_by;
--
--ALTER TABLE user_group_member
--DROP COLUMN status;