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

[HHH-16979] Change SqmPathSource resolution method call

This commit is contained in:
The-Huginn 2023-08-02 15:28:27 +02:00 committed by Christian Beikov
parent 71cb3477ca
commit f2b4454c0e
7 changed files with 192 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/NonAggregatedCompositeSimplePath.java
View File

@ -44,7 +44,7 @@ public class NonAggregatedCompositeSimplePath<T> extends SqmEntityValuedSimplePa
this,
new NonAggregatedCompositeSimplePath<>(
getNavigablePathCopy( lhsCopy ),
getReferencedPathSource(),
getModel(),
lhsCopy,
nodeBuilder()
)

2
hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmAnyValuedSimplePath.java
View File

@ -54,7 +54,7 @@ public class SqmAnyValuedSimplePath<T> extends AbstractSqmSimplePath<T> {
this,
new SqmAnyValuedSimplePath<>(
getNavigablePathCopy( lhsCopy ),
getReferencedPathSource(),
getModel(),
lhsCopy,
getExplicitAlias(),
nodeBuilder()

2
hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmBasicValuedSimplePath.java
View File

@ -55,7 +55,7 @@ public class SqmBasicValuedSimplePath<T>
this,
new SqmBasicValuedSimplePath<>(
getNavigablePathCopy( lhsCopy ),
getReferencedPathSource(),
getModel(),
lhsCopy,
getExplicitAlias(),
nodeBuilder()

2
hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmEmbeddedValuedSimplePath.java
View File

@ -64,7 +64,7 @@ public class SqmEmbeddedValuedSimplePath<T>
this,
new SqmEmbeddedValuedSimplePath<>(
getNavigablePathCopy( lhsCopy ),
getReferencedPathSource(),
getModel(),
lhsCopy,
getExplicitAlias(),
nodeBuilder()

2
hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmEntityValuedSimplePath.java
View File

@ -39,7 +39,7 @@ public class SqmEntityValuedSimplePath<T> extends AbstractSqmSimplePath<T> {
this,
new SqmEntityValuedSimplePath<>(
getNavigablePathCopy( lhsCopy ),
getReferencedPathSource(),
getModel(),
lhsCopy,
nodeBuilder()
)

7
hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPluralValuedSimplePath.java
View File

@ -61,7 +61,7 @@ public class SqmPluralValuedSimplePath<E> extends AbstractSqmSimplePath<E> {
this,
new SqmPluralValuedSimplePath<>(
getNavigablePathCopy( lhsCopy ),
getReferencedPathSource(),
getModel(),
lhsCopy,
getExplicitAlias(),
nodeBuilder()
@ -76,6 +76,11 @@ public class SqmPluralValuedSimplePath<E> extends AbstractSqmSimplePath<E> {
return (PluralPersistentAttribute<?, ?, E>) super.getReferencedPathSource();
}
@Override
public PluralPersistentAttribute<?, ?, E> getModel() {
return (PluralPersistentAttribute<?, ?, E>) super.getModel();
}
@Override
public PluralPersistentAttribute<?,?,E> getNodeType() {
return getReferencedPathSource();

181
hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/JoinedInheritanceImplicitJoinTest.java Normal file
View File

@ -0,0 +1,181 @@
package org.hibernate.orm.test.persister.entity;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Inheritance;
import jakarta.persistence.InheritanceType;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.OneToMany;
import jakarta.persistence.Tuple;
import jakarta.persistence.TypedQuery;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.Join;
import jakarta.persistence.criteria.Root;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
import org.hibernate.testing.orm.junit.Jpa;
import org.hibernate.testing.orm.junit.Setting;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import java.util.List;
import java.util.Set;
@TestForIssue(jiraKey = "HHH-16979")
@Jpa(annotatedClasses = {
JoinedInheritanceImplicitJoinTest.MasterEntity.class,
JoinedInheritanceImplicitJoinTest.ChildEntity.class,
JoinedInheritanceImplicitJoinTest.RelatedEntity.class
}, properties = {
@Setting(name = AvailableSettings.GLOBALLY_QUOTED_IDENTIFIERS, value = "true")
})
public class JoinedInheritanceImplicitJoinTest {
@BeforeEach
public void setup(EntityManagerFactoryScope scope) {
scope.inTransaction(entityManager -> {
final var childEntity = new ChildEntity();
childEntity.setMasterField("masterValue001");
childEntity.setChildField("childValue001");
RelatedEntity relatedEntity = new RelatedEntity();
relatedEntity.setRelatedField("relatedValue001");
relatedEntity.setChildEntity(childEntity);
RelatedEntity relatedEntity2 = new RelatedEntity();
relatedEntity2.setRelatedField("relatedValue002");
relatedEntity2.setChildEntity(childEntity);
Set<RelatedEntity> relatedEntityHashSet = Set.of(relatedEntity, relatedEntity2);
childEntity.setRelatedEntitySet(relatedEntityHashSet);
entityManager.persist(childEntity);
entityManager.persist(relatedEntity);
entityManager.persist(relatedEntity2);
});
}
@Test
public void testImplicitJoinWithoutRelatedEntity(EntityManagerFactoryScope scope) {
scope.inTransaction(entityManager -> {
CriteriaBuilder cb = entityManager.getCriteriaBuilder();
CriteriaQuery<Tuple> query = cb.createQuery(Tuple.class);
Root<ChildEntity> root = query.from(ChildEntity.class);
query.multiselect(
root.get("masterField"),
root.get("childField")
);
TypedQuery<Tuple> result = entityManager.createQuery(query);
List<Tuple> resultList = result.getResultList();
Assertions.assertFalse(resultList.isEmpty());
});
}
@Test
public void testImplicitJoinWithRelatedEntity(EntityManagerFactoryScope scope) {
scope.inTransaction(entityManager -> {
CriteriaBuilder cb = entityManager.getCriteriaBuilder();
CriteriaQuery<Tuple> query = cb.createQuery(Tuple.class);
Root<ChildEntity> root = query.from(ChildEntity.class);
Join<ChildEntity, RelatedEntity> relatedEntityJoin = root.join("relatedEntitySet");
query.multiselect(
root.get("masterField"),
root.get("childField"),
relatedEntityJoin.get("relatedField")
);
TypedQuery<Tuple> result = entityManager.createQuery(query);
List<Tuple> resultList = result.getResultList();
Assertions.assertFalse(resultList.isEmpty());
});
}
@Entity
@Inheritance(strategy = InheritanceType.JOINED)
public class MasterEntity {
@Id
@GeneratedValue
public Long id;
public String masterField;
public Long getId() {
return id;
}
public String getMasterField() {
return masterField;
}
public void setMasterField(final String masterField) {
this.masterField = masterField;
}
}
@Entity
public class ChildEntity extends MasterEntity {
private String childField;
@OneToMany(mappedBy = "childEntity")
public Set<RelatedEntity> relatedEntitySet;
public String getChildField() {
return childField;
}
public void setChildField(final String childField) {
this.childField = childField;
}
public Set<RelatedEntity> getRelatedEntitySet() {
return relatedEntitySet;
}
public void setRelatedEntitySet(final Set<RelatedEntity> relatedEntitySet) {
this.relatedEntitySet = relatedEntitySet;
}
}
@Entity
public class RelatedEntity {
@Id
@GeneratedValue
public Long id;
public String relatedField;
@ManyToOne
public ChildEntity childEntity;
public Long getId() {
return id;
}
public String getRelatedField() {
return relatedField;
}
public void setRelatedField(final String relatedField) {
this.relatedField = relatedField;
}
public ChildEntity getChildEntity() {
return childEntity;
}
public void setChildEntity(final ChildEntity childEntity) {
this.childEntity = childEntity;
}
}
}