From d9f28e3b6c4556fbd139f790ec1d6bca0bd918e7 Mon Sep 17 00:00:00 2001 From: Stephan Richter Date: Mon, 20 Jul 2026 00:22:06 +0200 Subject: [PATCH 1/2] improced commit-rollback behaviour on multi-step transactions Signed-off-by: Stephan Richter --- .../umbrella/accounting/SqliteDb.java | 5 +++- .../srsoftware/umbrella/contact/SqliteDb.java | 9 ++++++- .../de/srsoftware/umbrella/core/BaseDb.java | 8 ++++++- .../umbrella/documents/SqliteDb.java | 24 ++++++++++++++++--- .../srsoftware/umbrella/stock/SqliteDb.java | 13 ++++++++-- .../de/srsoftware/umbrella/task/SqliteDb.java | 8 ++++++- .../de/srsoftware/umbrella/time/SqliteDb.java | 8 ++++++- 7 files changed, 65 insertions(+), 10 deletions(-) diff --git a/accounting/src/main/java/de/srsoftware/umbrella/accounting/SqliteDb.java b/accounting/src/main/java/de/srsoftware/umbrella/accounting/SqliteDb.java index 844de420..9cf25b68 100644 --- a/accounting/src/main/java/de/srsoftware/umbrella/accounting/SqliteDb.java +++ b/accounting/src/main/java/de/srsoftware/umbrella/accounting/SqliteDb.java @@ -124,13 +124,16 @@ public class SqliteDb extends BaseDb implements AccountDb { db.setAutoCommit(false); Query.delete().from(TABLE_TAGS_TRANSACTIONS).where(TRANSACTION_ID,equal(transaction.id())).execute(db); Query.delete().from(TABLE_TRANSACTIONS).where(ID,equal(transaction.id())).execute(db); - db.setAutoCommit(true); return transaction; } catch (SQLException e){ try { db.rollback(); } catch (SQLException ignored){}; throw failedToDropObject(transaction); + } finally { + try { + db.setAutoCommit(true); + } catch (SQLException ignored){}; } } diff --git a/contact/src/main/java/de/srsoftware/umbrella/contact/SqliteDb.java b/contact/src/main/java/de/srsoftware/umbrella/contact/SqliteDb.java index 70d27d0b..6044f4fb 100644 --- a/contact/src/main/java/de/srsoftware/umbrella/contact/SqliteDb.java +++ b/contact/src/main/java/de/srsoftware/umbrella/contact/SqliteDb.java @@ -67,9 +67,16 @@ public class SqliteDb extends BaseDb implements ContactDb{ db.setAutoCommit(false); Query.delete().from(TABLE_CONTACTS).where(ID,equal(contact.id())).execute(db); Query.delete().from(TABLE_CONTACTS_USERS).where(CONTACT_ID,equal(contact.id())).execute(db); - db.setAutoCommit(true); } catch (SQLException e){ + try { + db.rollback(); + } catch (SQLException ignored){}; throw failedToDropObject(t(CONTACT_WITH_ID, ID,contact.id())).causedBy(e); + } finally { + try { + db.setAutoCommit(true); + } catch (SQLException ignored){}; + } } diff --git a/core/src/main/java/de/srsoftware/umbrella/core/BaseDb.java b/core/src/main/java/de/srsoftware/umbrella/core/BaseDb.java index 89a916d6..0f9049df 100644 --- a/core/src/main/java/de/srsoftware/umbrella/core/BaseDb.java +++ b/core/src/main/java/de/srsoftware/umbrella/core/BaseDb.java @@ -69,9 +69,15 @@ CREATE TABLE IF NOT EXISTS {0} ( {1} VARCHAR(255) PRIMARY KEY, {2} VARCHAR(255) update(table).set(STATUS).where(STATUS,equal(20)).prepare(db).apply(40).execute(); update(table).set(STATUS).where(STATUS,equal(10)).prepare(db).apply(20).execute(); update(table).set(STATUS).where(STATUS,equal(0)).prepare(db).apply(10).execute(); - db.setAutoCommit(true); } catch (SQLException e) { + try { + db.rollback(); + } catch (SQLException ignored) {} throw new RuntimeException(e); + } finally { + try { + db.setAutoCommit(true); + } catch (SQLException ignored){}; } } } diff --git a/documents/src/main/java/de/srsoftware/umbrella/documents/SqliteDb.java b/documents/src/main/java/de/srsoftware/umbrella/documents/SqliteDb.java index 6bfaa2cf..fd640979 100644 --- a/documents/src/main/java/de/srsoftware/umbrella/documents/SqliteDb.java +++ b/documents/src/main/java/de/srsoftware/umbrella/documents/SqliteDb.java @@ -198,11 +198,17 @@ CREATE TABLE IF NOT EXISTS {0} ( rs.close(); delete().from(TABLE_POSITIONS).where(DOCUMENT_ID,equal(docId)).execute(db); delete().from(TABLE_DOCUMENTS).where(ID,equal(docId)).execute(db); - db.setAutoCommit(true); if (number != null) return number; throw failedToDropObject(t(DOCUMENT_WITH_ID, ID,docId)); } catch (SQLException e){ + try { + db.rollback(); + } catch (SQLException ignored){}; throw failedToDropObject(t(DOCUMENT_WITH_ID, ID,docId)).causedBy(e); + } finally { + try { + db.setAutoCommit(true); + } catch (SQLException ignored){}; } } @@ -217,10 +223,16 @@ CREATE TABLE IF NOT EXISTS {0} ( stmt.setLong(2,pos); stmt.execute(); stmt.close(); - db.setAutoCommit(true); return pos; } catch (SQLException e) { + try { + db.rollback(); + } catch (SQLException ignored){}; throw failedToDropObjectFromObject(POSITION,pos,t(Text.DOCUMENT),docId).causedBy(e); + } finally { + try { + db.setAutoCommit(true); + } catch (SQLException ignored){}; } } @@ -582,9 +594,15 @@ CREATE TABLE IF NOT EXISTS {0} ( update(TABLE_POSITIONS).set(POS).where(DOCUMENT_ID,equal(docId)).where(POS,equal(pair.left())).prepare(db).apply(-pair.right()).close(); update(TABLE_POSITIONS).set(POS).where(DOCUMENT_ID,equal(docId)).where(POS,equal(pair.right())).prepare(db).apply(pair.left()).close(); update(TABLE_POSITIONS).set(POS).where(DOCUMENT_ID,equal(docId)).where(POS,equal(-pair.right())).prepare(db).apply(pair.right()).close(); - db.setAutoCommit(true); } catch (SQLException e) { + try { + db.rollback(); + } catch (SQLException ignored){}; throw databaseException(FAILED_TO_SWITCH_POSITIONS,"a",pair.left(),"b",pair.right(),docId).causedBy(e); + } finally { + try { + db.setAutoCommit(true); + } catch (SQLException ignored){}; } return pair; } diff --git a/stock/src/main/java/de/srsoftware/umbrella/stock/SqliteDb.java b/stock/src/main/java/de/srsoftware/umbrella/stock/SqliteDb.java index ddbeddac..ad20bf42 100644 --- a/stock/src/main/java/de/srsoftware/umbrella/stock/SqliteDb.java +++ b/stock/src/main/java/de/srsoftware/umbrella/stock/SqliteDb.java @@ -63,10 +63,16 @@ public class SqliteDb extends BaseDb implements StockDb { rs.close(); if (propertyId == null || propertyId == 0) throw failedToStoreObject(t(PROPERTY)); insertInto(TABLE_ITEM_PROPERTIES,ITEM_ID,PROPERTY_ID,VALUE).values(itemId,propertyId,value).execute(db).close(); - db.setAutoCommit(true); return new Property(propertyId,name,value,unit); } catch (SQLException e) { + try { + db.rollback(); + } catch (SQLException ignored){}; throw failedToStoreObject(t(PROPERTY)).causedBy(e); + } finally { + try { + db.setAutoCommit(true); + } catch (SQLException ignored){}; } } @@ -601,13 +607,16 @@ public class SqliteDb extends BaseDb implements StockDb { replaceLocationsTable(); replaceItemsTable(); replaceItemPropsTable(); - db.setAutoCommit(true); } catch (Exception e) { try { db.rollback(); } catch (SQLException ignored) { } throw databaseException(FAILED_TO_UPDATE_OBJECT, OBJECT, t(TABLE_WITH_NAME,NAME,TABLE_LOCATIONS)).causedBy(e); + } finally { + try { + db.setAutoCommit(true); + } catch (SQLException ignored){}; } } diff --git a/task/src/main/java/de/srsoftware/umbrella/task/SqliteDb.java b/task/src/main/java/de/srsoftware/umbrella/task/SqliteDb.java index 6f35a3f9..9c832d45 100644 --- a/task/src/main/java/de/srsoftware/umbrella/task/SqliteDb.java +++ b/task/src/main/java/de/srsoftware/umbrella/task/SqliteDb.java @@ -340,7 +340,6 @@ CREATE TABLE IF NOT EXISTS {0} ( var addQuery = replaceInto(TABLE_TASK_DEPENDENCIES, TASK_ID, REQUIRED_TASK_ID); for (var reqId : task.requiredTasksIds()) addQuery.values(task.id(), reqId); addQuery.execute(db).close(); - db.setAutoCommit(true); } task.clean(REQUIRED_TASKS_IDS); @@ -354,7 +353,14 @@ CREATE TABLE IF NOT EXISTS {0} ( } return task; } catch (SQLException e){ + try { + db.rollback(); + } catch (SQLException ignored){}; throw failedToStoreObject(task.name()).causedBy(e); + } finally { + try { + db.setAutoCommit(true); + } catch (SQLException ignored){}; } } diff --git a/time/src/main/java/de/srsoftware/umbrella/time/SqliteDb.java b/time/src/main/java/de/srsoftware/umbrella/time/SqliteDb.java index d68ca5a9..714386c4 100644 --- a/time/src/main/java/de/srsoftware/umbrella/time/SqliteDb.java +++ b/time/src/main/java/de/srsoftware/umbrella/time/SqliteDb.java @@ -84,10 +84,16 @@ CREATE TABLE IF NOT EXISTS {0} ( db.setAutoCommit(false); Query.delete().from(TABLE_TASK_TIMES).where(TIME_ID,equal(timeId)).execute(db); Query.delete().from(TABLE_TIMES).where(ID,equal(timeId)).execute(db); - db.setAutoCommit(false); return timeId; } catch (SQLException e) { + try { + db.rollback(); + } catch (SQLException ignored) {} throw failedToDropObject(t(TIME_WITH_ID, ID,timeId)).causedBy(e); + } finally { + try { + db.setAutoCommit(true); + } catch (SQLException ignored){}; } } From c7382cb1d3c6c557ce9ad233b330f693bbe82e6c Mon Sep 17 00:00:00 2001 From: Stephan Richter Date: Tue, 21 Jul 2026 20:41:57 +0200 Subject: [PATCH 2/2] implemented button to make document positions optional Signed-off-by: Stephan Richter --- frontend/src/routes/document/Position.svelte | 8 +++++++- translations/src/main/resources/de.json | 2 ++ translations/src/main/resources/en.json | 2 ++ web/src/main/resources/web/css/bloodshed-color.css | 8 ++++++++ web/src/main/resources/web/css/bloodshed.css | 9 +++++++++ web/src/main/resources/web/css/default-color.css | 8 ++++++++ web/src/main/resources/web/css/default.css | 9 +++++++++ web/src/main/resources/web/css/winter-color.css | 9 +++++++++ web/src/main/resources/web/css/winter.css | 9 +++++++++ 9 files changed, 63 insertions(+), 1 deletion(-) diff --git a/frontend/src/routes/document/Position.svelte b/frontend/src/routes/document/Position.svelte index e746422f..b195b0e3 100644 --- a/frontend/src/routes/document/Position.svelte +++ b/frontend/src/routes/document/Position.svelte @@ -1,6 +1,7 @@