Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-17623 Test and fix use of association in @OrderBy

This commit is contained in:
Christian Beikov 2024-01-08 17:22:23 +01:00
parent 7f12b50f79
commit 66a723e251
3 changed files with 221 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractDomainPath.java
View File

@ -12,6 +12,7 @@ import java.util.List;
import org.hibernate.metamodel.mapping.BasicValuedModelPart;
import org.hibernate.metamodel.mapping.EmbeddableValuedModelPart;
import org.hibernate.metamodel.mapping.EntityValuedModelPart;
import org.hibernate.metamodel.mapping.ForeignKeyDescriptor;
import org.hibernate.metamodel.mapping.ModelPart;
import org.hibernate.metamodel.mapping.SelectableMapping;
import org.hibernate.metamodel.mapping.ordering.ast.DomainPath;
@ -161,19 +162,8 @@ public abstract class AbstractDomainPath implements DomainPath {
subPart = ( (EntityValuedModelPart) referenceModelPart ).getEntityMappingType().getIdentifierMapping();
}
else {
subPart = ( (EntityValuedModelPart) referenceModelPart ).findSubPart( modelPartName );
if ( subPart == null && referenceModelPart instanceof ToOneAttributeMapping ) {
// this is the case of sort by to-one attribute inside an embedded item,
// at this stage the foreign key descriptor should have been set on the attribute mapping,
// so we can generate a sub part valid for the order-by generation
ToOneAttributeMapping toOneAttribute = (ToOneAttributeMapping) referenceModelPart;
String foreignKeyModelPart = toOneAttribute.getAttributeName() + "."
+ toOneAttribute.getTargetKeyPropertyName();
if ( modelPartName.equals( foreignKeyModelPart ) ) {
subPart = toOneAttribute.findSubPart( toOneAttribute.getTargetKeyPropertyName() );
}
}
// Default to using the foreign key of an entity valued model part
subPart = ( (EntityValuedModelPart) referenceModelPart ).findSubPart( ForeignKeyDescriptor.PART_NAME );
}
apply(
subPart,

33
hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/FkDomainPathContinuation.java
View File

@ -21,15 +21,18 @@ public class FkDomainPathContinuation extends DomainPathContinuation {
private final Set<String> possiblePaths;
public FkDomainPathContinuation(
NavigablePath navigablePath, DomainPath lhs,
NavigablePath navigablePath,
DomainPath lhs,
ToOneAttributeMapping referencedModelPart) {
super( navigablePath, lhs, referencedModelPart );
this.possiblePaths = referencedModelPart.getTargetKeyPropertyNames();
}
public FkDomainPathContinuation(
NavigablePath navigablePath, DomainPath lhs,
ModelPart referencedModelPart, Set<String> possiblePaths) {
NavigablePath navigablePath,
DomainPath lhs,
ModelPart referencedModelPart,
Set<String> possiblePaths) {
super( navigablePath, lhs, referencedModelPart );
this.possiblePaths = possiblePaths;
}
@ -40,25 +43,17 @@ public class FkDomainPathContinuation extends DomainPathContinuation {
String identifier,
boolean isTerminal,
TranslationContext translationContext) {
HashSet<String> furtherPaths = new LinkedHashSet<>( possiblePaths.size() );
for ( String path : possiblePaths ) {
if ( !path.startsWith( name ) ) {
return new DomainPathContinuation(
navigablePath.append( name ),
this,
// unfortunately at this stage the foreign key descriptor could not be set
// on the attribute mapping yet, so we need to defer the sub part extraction later
referencedModelPart
);
}
furtherPaths.add( path.substring( name.length() + 1 ) );
}
if ( furtherPaths.isEmpty() ) {
if ( !possiblePaths.contains( name ) ) {
throw new PathResolutionException( "Domain path of type `" + referencedModelPart.getPartMappingType() + "` -> `" + name + "`" );
}
final HashSet<String> furtherPaths = new HashSet<>();
for ( String possiblePath : possiblePaths ) {
if ( possiblePath.startsWith( name ) && possiblePath.length() > name.length()
&& possiblePath.charAt( name.length() ) == '.' ) {
furtherPaths.add( possiblePath.substring( name.length() + 2 ) );
}
}
return new FkDomainPathContinuation(
navigablePath.append( name ),
this,

204
hibernate-core/src/test/java/org/hibernate/orm/test/orderby/OrderByToOneTest.java Normal file
View File

@ -0,0 +1,204 @@
package org.hibernate.orm.test.orderby;
import java.util.ArrayList;
import java.util.List;
import org.hibernate.testing.orm.junit.DomainModel;
import org.hibernate.testing.orm.junit.JiraKey;
import org.hibernate.testing.orm.junit.SessionFactory;
import org.hibernate.testing.orm.junit.SessionFactoryScope;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import jakarta.persistence.CascadeType;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.OneToMany;
import jakarta.persistence.OrderBy;
import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* @author Christian Beikov
*/
@DomainModel(
annotatedClasses = {
OrderByToOneTest.Task.class,
OrderByToOneTest.TaskVersion.class,
OrderByToOneTest.User.class
}
)
@SessionFactory
public class OrderByToOneTest {
@BeforeEach
protected void prepareTest(SessionFactoryScope scope) {
scope.inTransaction(
session -> {
User u1 = new User( 1L, "u1" );
session.persist( u1 );
User u2 = new User( 2L, "u2" );
session.persist( u2 );
Task t = new Task();
t.setId( 1L );
TaskVersion tv1 = new TaskVersion();
tv1.setName( "tv1" );
tv1.setAssignee( u2 );
List<TaskVersion> versions = new ArrayList<>();
versions.add( tv1 );
t.setTaskVersions( versions );
tv1.setTask( t );
TaskVersion tv2 = new TaskVersion();
tv2.setName( "tv2" );
tv2.setAssignee( u1 );
t.getTaskVersions().add( tv2 );
tv2.setTask( t );
session.persist( t );
}
);
}
@AfterEach
protected void cleanupTest(SessionFactoryScope scope) {
scope.inTransaction(
session -> {
session.createMutationQuery( "delete from TaskVersion" ).executeUpdate();
session.createMutationQuery( "delete from UUser" ).executeUpdate();
session.createMutationQuery( "delete from Task" ).executeUpdate();
}
);
}
@Test
@JiraKey("HHH-17623")
public void testOrderByToOne(SessionFactoryScope scope) {
scope.inTransaction(
session -> {
final Task task = session.createQuery( "from Task t", Task.class ).getSingleResult();
final List<TaskVersion> taskVersions = task.getTaskVersions();
assertEquals( 2, taskVersions.size() );
assertEquals( "tv2", taskVersions.get( 0 ).getName() );
assertEquals( "tv1", taskVersions.get( 1 ).getName() );
}
);
}
@Entity(name = "Task")
public static class Task {
@Id
private Long id;
@OneToMany(mappedBy = "task", cascade = CascadeType.ALL, fetch = FetchType.EAGER)
@OrderBy("assignee ASC")
private List<TaskVersion> taskVersions;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public List<TaskVersion> getTaskVersions() {
return taskVersions;
}
public void setTaskVersions(List<TaskVersion> taskVersions) {
this.taskVersions = taskVersions;
}
}
@Entity(name = "TaskVersion")
public static class TaskVersion {
@Id
@GeneratedValue
private Long id;
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "assignee", nullable = true)
private User assignee;
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "task_id", nullable = false)
private Task task;
private String name;
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public Task getTask() {
return task;
}
public void setTask(Task task) {
this.task = task;
}
public User getAssignee() {
return assignee;
}
public void setAssignee(User assignee) {
this.assignee = assignee;
}
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
}
@Entity(name = "UUser")
public static class User {
@Id
private Long id;
private String name;
public User() {
}
public User(Long id, String name) {
this.id = id;
this.name = name;
}
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
}
}