diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImageDate.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImageDate.java index 35f755a7147f5e606f4dded54a78499f3ad87ced..48a8d47a4b3e23756fdf49ae3160bc0b45d16aba 100644 --- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImageDate.java +++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImageDate.java @@ -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; diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/View.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/View.java index 056311dedf7ae868176ea99e6d2613cbddd3d8b5..14466a12bd8d992f339a6367f96455fd5a67cae8 100644 --- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/View.java +++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/View.java @@ -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; diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/concepts/Concept.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/concepts/Concept.java index 01f0334edc5de67f4a7bef976a5a44a2add1a330..733b2c6b146340798d87381f979cc8e433c715b5 100644 --- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/concepts/Concept.java +++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/concepts/Concept.java @@ -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 = { diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/Identifier.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/Identifier.java index 14e2762a4d74330a57c1135f4b266c96e14f4408..2fd30300602a791c7ea64856564685e496e2a824 100644 --- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/Identifier.java +++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/Identifier.java @@ -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) }) diff --git a/fda-query-service/rest-service/src/main/java/at/tuwien/endpoint/QueryEndpoint.java b/fda-query-service/rest-service/src/main/java/at/tuwien/endpoint/QueryEndpoint.java index 57f0ba802bc89204e3ce9b9f6f3da5d33e3ee6c9..0699f5b758213fc5e8cc60c280eed63fe16bae81 100644 --- a/fda-query-service/rest-service/src/main/java/at/tuwien/endpoint/QueryEndpoint.java +++ b/fda-query-service/rest-service/src/main/java/at/tuwien/endpoint/QueryEndpoint.java @@ -37,7 +37,7 @@ public class QueryEndpoint extends AbstractEndpoint { this.storeService = storeService; } - @PutMapping + @PostMapping @Transactional(readOnly = true) @Timed(value = "query.execute", description = "Time needed to execute a query") @Operation(summary = "Execute query", security = @SecurityRequirement(name = "bearerAuth")) diff --git a/fda-ui/components/query/Results.vue b/fda-ui/components/query/Results.vue index c4a765688c1f4252808da0b4d0d8edc189cdf974..235e8a44b1665989a2fcdb75cbe7cff1888aefce 100644 --- a/fda-ui/components/query/Results.vue +++ b/fda-ui/components/query/Results.vue @@ -62,7 +62,7 @@ export default { async executeFirstTime (parent, sql) { this.loading = true try { - const res = await this.$axios.put(this.executeUrl, { statement: sql }, this.config) + const res = await this.$axios.post(this.executeUrl, { statement: sql }, this.config) console.debug('query result', res.data) this.$toast.success('Successfully executed query') this.mapResults(res.data)