Skip to content
Snippets Groups Projects
Unverified Commit 2c9837d4 authored by Martin Weise's avatar Martin Weise
Browse files

Reverted some changes

parent abe1ad96
No related branches found
No related tags found
1 merge request!106Dev
...@@ -58,14 +58,13 @@ public class Container { ...@@ -58,14 +58,13 @@ public class Container {
private Integer port; private Integer port;
@org.springframework.data.annotation.Transient @org.springframework.data.annotation.Transient
@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.DETACH) @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
@JoinColumns({ @JoinColumns({
@JoinColumn(name = "id", referencedColumnName = "id", insertable = false, updatable = false) @JoinColumn(name = "id", referencedColumnName = "id", insertable = false, updatable = false)
}) })
private List<Database> databases; private List<Database> databases;
@org.springframework.data.annotation.Transient @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.DETACH)
private ContainerImage image; private ContainerImage image;
@Column @Column
......
...@@ -61,8 +61,8 @@ public class ContainerImage { ...@@ -61,8 +61,8 @@ public class ContainerImage {
@Column(nullable = false) @Column(nullable = false)
private Integer defaultPort; private Integer defaultPort;
@ToString.Exclude @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, mappedBy = "image") @JoinColumn(name = "iid", insertable = false, updatable = false)
private List<ContainerImageEnvironmentItem> environment; private List<ContainerImageEnvironmentItem> environment;
@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, mappedBy = "image") @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, mappedBy = "image")
...@@ -70,7 +70,7 @@ public class ContainerImage { ...@@ -70,7 +70,7 @@ public class ContainerImage {
@org.springframework.data.annotation.Transient @org.springframework.data.annotation.Transient
@ToString.Exclude @ToString.Exclude
@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.DETACH, mappedBy = "image") @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.MERGE, mappedBy = "image")
private List<Container> containers; private List<Container> containers;
@Column(nullable = false, updatable = false) @Column(nullable = false, updatable = false)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment