From 2c9837d40b6fefc4993dee1d9f00e00c4c560baf Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Fri, 18 Nov 2022 08:29:38 +0100
Subject: [PATCH] Reverted some changes
---
.../main/java/at/tuwien/entities/container/Container.java | 5 ++---
.../at/tuwien/entities/container/image/ContainerImage.java | 6 +++---
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/Container.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/Container.java
index c9227c53a9..b19146c731 100644
--- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/Container.java
+++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/Container.java
@@ -58,14 +58,13 @@ public class Container {
private Integer port;
@org.springframework.data.annotation.Transient
- @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.DETACH)
+ @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
@JoinColumns({
@JoinColumn(name = "id", referencedColumnName = "id", insertable = false, updatable = false)
})
private List<Database> databases;
- @org.springframework.data.annotation.Transient
- @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.DETACH)
+ @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
private ContainerImage image;
@Column
diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java
index 84fb700e7b..8704b32853 100644
--- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java
+++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java
@@ -61,8 +61,8 @@ public class ContainerImage {
@Column(nullable = false)
private Integer defaultPort;
- @ToString.Exclude
- @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, mappedBy = "image")
+ @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+ @JoinColumn(name = "iid", insertable = false, updatable = false)
private List<ContainerImageEnvironmentItem> environment;
@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, mappedBy = "image")
@@ -70,7 +70,7 @@ public class ContainerImage {
@org.springframework.data.annotation.Transient
@ToString.Exclude
- @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.DETACH, mappedBy = "image")
+ @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.MERGE, mappedBy = "image")
private List<Container> containers;
@Column(nullable = false, updatable = false)
--
GitLab