[#701] Prevent expansion of basic element types in collection bindings

Blazebit · Dec 19, 2018 · 2ce6b63 · 2ce6b63
1 parent 3a3f369
commit 2ce6b63
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/JpaUtils.java b/core/impl/src/main/java/com/blazebit/persistence/impl/JpaUtils.java
@@ -57,6 +57,10 @@ public final class JpaUtils {
     private JpaUtils() {
     }
 
+    private static boolean isBasicElementType(Attribute<?, ?> attribute) {
+        return attribute instanceof PluralAttribute<?, ?, ?> && ((PluralAttribute<?, ?, ?>) attribute).getElementType().getPersistenceType() == Type.PersistenceType.BASIC;
+    }
+
     public static void expandBindings(EntityType<?> bindType, Map<String, Integer> bindingMap, Map<String, String> columnBindingMap, Map<String, ExtendedAttribute<?, ?>> attributeEntries, ClauseType clause, AbstractCommonQueryBuilder<?, ?, ?, ?, ?> queryBuilder) {
         SelectManager<?> selectManager = queryBuilder.selectManager;
         JoinManager joinManager = queryBuilder.joinManager;
@@ -77,7 +81,7 @@ public static void expandBindings(EntityType<?> bindType, Map<String, Integer> b
                 final Attribute<?, ?> lastAttribute = attributePath.get(attributePath.size() - 1);
                 boolean splitExpression = lastAttribute.getPersistentAttributeType() == Attribute.PersistentAttributeType.EMBEDDED;
 
-                if (!splitExpression && jpaMetamodelAccessor.isJoinable(lastAttribute)) {
+                if (!splitExpression && jpaMetamodelAccessor.isJoinable(lastAttribute) && !isBasicElementType(lastAttribute)) {
                     splitExpression = true;
                     if (needsElementCollectionIdCutoff) {
                         for (int i = 0; i < attributePath.size() - 1; i++) {