HHH-17964 Hibernate using wrong column order for ElementCollection qu…

…ery when composite ID is present
hibernate · Apr 25, 2024 · 2811aad · 2811aad
1 parent 2b4ec1f
commit 2811aad
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/TableBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/TableBinder.java
@@ -743,9 +743,10 @@ private static void bindImplicitColumns(
 			PersistentClass referencedEntity,
 			AnnotatedJoinColumns joinColumns,
 			SimpleValue value) {
-		final List<Column> idColumns = referencedEntity instanceof JoinedSubclass
-				? referencedEntity.getKey().getColumns()
-				: referencedEntity.getIdentifier().getColumns();
+		final KeyValue keyValue = referencedEntity instanceof JoinedSubclass
+				? referencedEntity.getKey()
+				: referencedEntity.getIdentifier();
+		final List<Column> idColumns = keyValue.getColumns();
 		for ( int i = 0; i < idColumns.size(); i++ ) {
 			final Column column = idColumns.get(i);
 			final AnnotatedJoinColumn firstColumn = joinColumns.getJoinColumns().get(0);
@@ -767,6 +768,11 @@ private static void bindImplicitColumns(
 				}
 			}
 		}
+		if ( keyValue instanceof Component
+				&& ( (Component) keyValue ).isSorted()
+				&& value instanceof DependantValue ) {
+			( (DependantValue) value ).setSorted( true );
+		}
 	}
 
 	private static void bindUnownedAssociation(