summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java4
-rw-r--r--dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java1
2 files changed, 3 insertions, 2 deletions
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java
index ace8df01..55fa02b2 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java
@@ -640,9 +640,9 @@ public class DbImage {
public static void deleteVersionPermanently(LocalImageVersion image) throws SQLException {
try (MysqlConnection connection = Database.getConnection()) {
- DbLecture.deletePermanently(connection, image);
// Unlink any linked lectures
DbLecture.unlinkFromImageVersion(connection, image.imageVersionId);
+ //DbLecture.deletePermanently(connection, image);
// Unlink latest version field from image base
MysqlStatement unlinkStmt = connection.prepareStatement("UPDATE imagebase SET latestversionid = NULL"
+ " WHERE latestversionid = :imageversionid");
@@ -654,7 +654,7 @@ public class DbImage {
stmt.executeUpdate();
connection.commit();
} catch (SQLException e) {
- LOGGER.error("Query failed in DbImage.deleteVersionPermanently()", e);
+ LOGGER.error("Query failed in DbImage.deleteVersionPermanently(2)", e);
throw e;
}
}
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java
index 1436aa36..0ed62770 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java
@@ -532,6 +532,7 @@ public class DbLecture {
MysqlStatement stmt = connection.prepareStatement("UPDATE lecture SET imageversionid = NULL"
+ " WHERE imageversionid = :imageversionid");
stmt.setString("imageversionid", imageVersionId);
+ stmt.executeUpdate();
}
}