Avoid use of UPDATE ... RETURNING ... on MariaDB

FraunhoferIOSB · Nov 16, 2024 · 4b98b30 · 4b98b30
1 parent 9fc17d3
commit 4b98b30
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,6 +24,7 @@ FROST-Server version 2.5 and higher requires Java 21. This is because some libra
 * Fixed the resolving of references in the URL of json batch requests.
 * Fixed differences in HTTP response code between GET and HEAD requests.
 * Fixed json batch requests without atomicity group all running in the same group.
+* Avoid use of UPDATE ... RETURNING ... on MariaDB.
 
 
 ## Release version 2.4.0

diff --git a/...in/java/de/fraunhofer/iosb/ilt/frostserver/persistence/pgjooq/JooqPersistenceManager.java b/...in/java/de/fraunhofer/iosb/ilt/frostserver/persistence/pgjooq/JooqPersistenceManager.java
@@ -106,4 +106,7 @@ public interface JooqPersistenceManager extends LiquibaseUser, PersistenceManage
      */
     boolean useClientSuppliedId(Entity entity) throws IncompleteEntityException;
 
+    public default boolean hasUpdateReturning() {
+        return true;
+    }
 }
diff --git a/...java/de/fraunhofer/iosb/ilt/frostserver/persistence/pgjooq/MariadbPersistenceManager.java b/...java/de/fraunhofer/iosb/ilt/frostserver/persistence/pgjooq/MariadbPersistenceManager.java
@@ -880,4 +880,10 @@ public boolean doUpgrades(Writer out) throws UpgradeFailedException, IOException
                 .build();
         return doUpgrades(LIQUIBASE_CHANGELOG_FILENAME, props, out);
     }
+
+    @Override
+    public boolean hasUpdateReturning() {
+        return false;
+    }
+
 }
diff --git a/...n/java/de/fraunhofer/iosb/ilt/frostserver/persistence/pgjooq/tables/StaTableAbstract.java b/...n/java/de/fraunhofer/iosb/ilt/frostserver/persistence/pgjooq/tables/StaTableAbstract.java
@@ -75,6 +75,7 @@
 import org.jooq.Record;
 import org.jooq.Table;
 import org.jooq.TableField;
+import org.jooq.exception.DataAccessException;
 import org.jooq.exception.TooManyRowsException;
 import org.jooq.impl.DSL;
 import org.jooq.impl.TableImpl;
@@ -449,16 +450,7 @@ public EntityChangedMessage updateInDatabase(JooqPersistenceManager pm, Entity e
         final Set<Field> selectFields = QueryState.propertiesToFields(thisTable, propertyFields);
         Record result = null;
         if (!updateFields.isEmpty()) {
-            try {
-                result = dslContext.update(thisTable)
-                        .set(updateFields)
-                        .where(where)
-                        .returningResult(selectFields)
-                        .fetchOne();
-            } catch (TooManyRowsException e) {
-                LOGGER.error("Updating {} {} caused too many rows to change (more than one)!", entityType, entityId);
-                throw new IllegalStateException(CHANGED_MULTIPLE_ROWS, e);
-            }
+            result = executeUpdate(pm, dslContext, thisTable, updateFields, where, selectFields);
         }
 
         for (NavigationPropertyMain<EntitySet> np : entityType.getNavigationSets()) {
@@ -483,6 +475,34 @@ public EntityChangedMessage updateInDatabase(JooqPersistenceManager pm, Entity e
         return message;
     }
 
+    public Record executeUpdate(JooqPersistenceManager pm, DSLContext dslContext, T thisTable, Map<Field, Object> updateFields, Condition where, Set<Field> selectFields) throws DataAccessException, IllegalStateException {
+        try {
+            if (pm.hasUpdateReturning()) {
+                return dslContext.update(thisTable)
+                        .set(updateFields)
+                        .where(where)
+                        .returningResult(selectFields)
+                        .fetchOne();
+            } else {
+                int execute = dslContext.update(thisTable)
+                        .set(updateFields)
+                        .where(where)
+                        .execute();
+                if (execute != 1) {
+                    LOGGER.error("Updating {} with WHERE {} caused too many rows to change (more than one)!", getName(), where);
+                    throw new IllegalStateException(CHANGED_MULTIPLE_ROWS);
+                }
+                return dslContext.select(selectFields)
+                        .from(thisTable)
+                        .where(where)
+                        .fetchOne();
+            }
+        } catch (TooManyRowsException e) {
+            LOGGER.error("Updating {} with WHERE {} caused too many rows to change (more than one)!", getName(), where);
+            throw new IllegalStateException(CHANGED_MULTIPLE_ROWS, e);
+        }
+    }
+
     @Override
     public void delete(JooqPersistenceManager pm, PkValue entityId) throws NoSuchEntityException {
         for (SortingWrapper<Double, HookPreDelete> hookWrapper : hooksPreDelete) {