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

Reverted the rest

parent 2c9837d4
Branches
Tags
1 merge request!106Dev
......@@ -36,7 +36,7 @@ public class ContainerImageDate {
@org.springframework.data.annotation.Transient
@ToString.Exclude
@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.DETACH)
@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
@JoinColumn(name = "iid", insertable = false, updatable = false)
private ContainerImage image;
......
......@@ -46,13 +46,6 @@ public class ContainerImageEnvironmentItem {
@Enumerated(EnumType.STRING)
private ContainerImageEnvironmentItemType type;
@org.springframework.data.annotation.Transient
@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
@JoinColumns({
@JoinColumn(name = "iid", referencedColumnName = "id", insertable = false, updatable = false)
})
private ContainerImage image;
@Column(nullable = false, updatable = false)
@CreatedDate
private Instant created;
......
......@@ -46,7 +46,7 @@ public class View {
private User creator;
@org.springframework.data.annotation.Transient
@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.DETACH)
@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
@JoinColumn(name = "vdbid", insertable = false, updatable = false)
private Database database;
......
......@@ -63,11 +63,11 @@ public class Table {
@org.springframework.data.annotation.Transient
@ToString.Exclude
@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.DETACH)
@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
@JoinColumn(name = "tdbid", insertable = false, updatable = false)
private Database database;
@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.DETACH, mappedBy = "table")
@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.MERGE, mappedBy = "table")
@OrderBy("ordinalPosition")
private List<TableColumn> columns;
......
......@@ -52,13 +52,13 @@ public class TableColumn implements Comparable<TableColumn> {
private Long dfid;
@ToString.Exclude
@OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.DETACH)
@OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
@JoinColumn(name = "dfid", referencedColumnName = "id", insertable = false, updatable = false)
private ContainerImageDate dateFormat;
@org.springframework.data.annotation.Transient
@ToString.Exclude
@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.DETACH)
@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
@JoinColumns({
@JoinColumn(name = "tid", referencedColumnName = "id", insertable = false, updatable = false),
@JoinColumn(name = "cdbid", referencedColumnName = "tdbid", insertable = false, updatable = false)
......@@ -117,7 +117,7 @@ public class TableColumn implements Comparable<TableColumn> {
@CreatedDate
private Instant created;
@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.DETACH)
@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
@JoinTable(name = "mdb_columns_concepts",
joinColumns = {
@JoinColumn(name = "cid", referencedColumnName = "id", insertable = false, updatable = false),
......
......@@ -29,7 +29,7 @@ public class Concept {
@org.springframework.data.annotation.Transient
@ToString.Exclude
@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.DETACH)
@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
@JoinTable(name = "mdb_columns_concepts",
joinColumns = @JoinColumn(name = "uri"),
inverseJoinColumns = {
......
......@@ -71,7 +71,7 @@ public class Identifier {
@Enumerated(EnumType.STRING)
private LanguageType language;
@OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.DETACH)
@OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
@JoinColumns({
@JoinColumn(name = "License", referencedColumnName = "identifier")
})
......@@ -118,7 +118,7 @@ public class Identifier {
@Enumerated(EnumType.STRING)
private VisibilityType visibility = VisibilityType.SELF;
@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.DETACH)
@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
@JoinColumns({
@JoinColumn(name = "iid", referencedColumnName = "id", insertable = false, updatable = false)
})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment