Improved generated queries when fetching entities over a one-to-many …

…relation
FraunhoferIOSB · Feb 23, 2024 · 9a2da38 · 9a2da38
1 parent 12c405b
commit 9a2da38
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 **New Features**
 
 **Internal changes & Bugfixes**
+* Improved generated queries when fetching entities over a one-to-many relation.
 
 
 ## Release version 2.3.0

diff --git a/...ooq/src/main/java/de/fraunhofer/iosb/ilt/frostserver/persistence/pgjooq/QueryBuilder.java b/...ooq/src/main/java/de/fraunhofer/iosb/ilt/frostserver/persistence/pgjooq/QueryBuilder.java
@@ -474,8 +474,10 @@ public TableRef queryEntityType(PathElementEntityType pe, Id targetId, TableRef
         }
 
         if (targetId != null) {
-            Object id = targetId.asBasicPersistenceType();
-            queryState.setSqlWhere(queryState.getSqlWhere().and(result.getTable().getId().eq(id)));
+            final Object id = targetId.asBasicPersistenceType();
+            final Field lastId = result.getTable().getId();
+            final Field optimisedLastId = result.getJoinEqual(lastId);
+            queryState.setSqlWhere(queryState.getSqlWhere().and(optimisedLastId.eq(id)));
         }
 
         if (mainTable == null) {