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

HHH-10561 - Join on treated root not rendered in HQL

This commit is contained in:
Sven Haster 2017-01-04 13:32:02 +01:00 committed by Vlad Mihalcea
parent 349df983f0
commit 904335a369
3 changed files with 103 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hibernate-core/src/main/java/org/hibernate/query/criteria/internal/QueryStructure.java
View File

@ -15,6 +15,7 @@ import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import javax.persistence.criteria.AbstractQuery;
import javax.persistence.criteria.Expression;
import javax.persistence.criteria.Fetch;
@ -29,6 +30,7 @@ import javax.persistence.metamodel.EntityType;
import org.hibernate.query.criteria.internal.compile.RenderingContext;
import org.hibernate.query.criteria.internal.path.RootImpl;
import org.hibernate.query.criteria.internal.path.RootImpl.TreatedRoot;
/**
* Models basic query structure. Used as a delegate in implementing both
@ -299,6 +301,12 @@ public class QueryStructure<T> implements Serializable {
for ( Root root : getRoots() ) {
renderJoins( jpaqlQuery, renderingContext, root.getJoins() );
if (root instanceof RootImpl) {
Set<TreatedRoot> treats = ((RootImpl)root).getTreats();
for ( TreatedRoot treat : treats ) {
renderJoins( jpaqlQuery, renderingContext, treat.getJoins() );
}
}
renderFetches( jpaqlQuery, renderingContext, root.getFetches() );
}

15
hibernate-core/src/main/java/org/hibernate/query/criteria/internal/path/RootImpl.java
View File

@ -7,6 +7,10 @@
package org.hibernate.query.criteria.internal.path;
import java.io.Serializable;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.persistence.criteria.Join;
import javax.persistence.criteria.Root;
import javax.persistence.metamodel.EntityType;
@ -24,6 +28,7 @@ import org.hibernate.query.criteria.internal.compile.RenderingContext;
public class RootImpl<X> extends AbstractFromImpl<X,X> implements Root<X>, Serializable {
private final EntityType<X> entityType;
private final boolean allowJoins;
private final Set<TreatedRoot<? extends X>> treats = new LinkedHashSet<>();
public RootImpl(CriteriaBuilderImpl criteriaBuilder, EntityType<X> entityType) {
this( criteriaBuilder, entityType, true );
@ -52,7 +57,7 @@ public class RootImpl<X> extends AbstractFromImpl<X,X> implements Root<X>, Seria
public RootImpl<X> correlateTo(CriteriaSubqueryImpl subquery) {
return (RootImpl<X>) super.correlateTo( subquery );
}
@Override
protected boolean canBeJoinSource() {
return allowJoins;
@ -90,10 +95,16 @@ public class RootImpl<X> extends AbstractFromImpl<X,X> implements Root<X>, Seria
public String renderProjection(RenderingContext renderingContext) {
return render( renderingContext );
}
public Set<TreatedRoot<? extends X>> getTreats() {
return treats;
}
@Override
public <T extends X> RootImpl<T> treatAs(Class<T> treatAsType) {
return new TreatedRoot<T>( this, treatAsType );
TreatedRoot<T> treatedRoot = new TreatedRoot<T>( this, treatAsType );
treats.add(treatedRoot);
return treatedRoot;
}
public static class TreatedRoot<T> extends RootImpl<T> {

142
hibernate-core/src/test/java/org/hibernate/jpa/test/criteria/TreatJoinTest.java
View File

@ -9,9 +9,11 @@ package org.hibernate.jpa.test.criteria;
import java.util.List;
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.EntityManager;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.persistence.Table;
@ -27,6 +29,7 @@ import org.junit.Before;
import org.junit.Test;
import static org.hamcrest.core.Is.is;
import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
import static org.junit.Assert.assertThat;
/**
@ -41,59 +44,40 @@ public class TreatJoinTest extends BaseEntityManagerFunctionalTestCase {
@Before
public void setUp(){
final EntityManager em = createEntityManager();
try {
em.getTransaction().begin();
try {
Price price = new Price( 10, "EUR" );
Author author = new Author( "Andrea Camilleri" );
Book book = new Book( author, "Il nipote del Negus", price );
Bid bid = new Bid( book );
em.persist( bid );
doInJPA( this::entityManagerFactory, entityManager -> {
Price price = new Price( 10, "EUR" );
Author author = new Author( "Andrea Camilleri" );
Book book = new Book( author, "Il nipote del Negus", price );
Bid bid = new Bid( book );
entityManager.persist( bid );
book = new Book( author, "La moneta di Akragas", price );
bid = new Bid( book );
em.persist( bid );
em.getTransaction().commit();
}catch (Exception e){
if(em.getTransaction().isActive()){
em.getTransaction().rollback();
}
}
}finally {
em.close();
}
book = new Book( author, "La moneta di Akragas", price );
bid = new Bid( book );
entityManager.persist( bid );
} );
}
@Test
@TestForIssue(jiraKey = "HHH-8488")
public void testTreatJoin() {
EntityManager em = createEntityManager();
try {
CriteriaBuilder cb = em.getCriteriaBuilder();
doInJPA( this::entityManagerFactory, entityManager -> {
CriteriaBuilder cb = entityManager.getCriteriaBuilder();
CriteriaQuery<Bid> query = cb.createQuery( Bid.class );
Root<Bid> bid = query.from( Bid.class );
Join<Bid, Book> book = cb.treat( bid.join( "item" ), Book.class );
query.select( book.get( "title" ) );
final List<Bid> resultList = em.createQuery( query ).getResultList();
final List<Bid> resultList = entityManager.createQuery( query ).getResultList();
assertThat(resultList.size(),is(2));
}
finally {
em.close();
}
} );
}
@Test
@TestForIssue(jiraKey = "HHH-8488")
public void testTreatJoin2() {
EntityManager em = createEntityManager();
try {
CriteriaBuilder cb = em.getCriteriaBuilder();
doInJPA( this::entityManagerFactory, entityManager -> {
CriteriaBuilder cb = entityManager.getCriteriaBuilder();
CriteriaQuery<Bid> query = cb.createQuery( Bid.class );
Root<Bid> bid = query.from( Bid.class );
@ -102,20 +86,16 @@ public class TreatJoinTest extends BaseEntityManagerFunctionalTestCase {
query.select( bid );
final List<Bid> resultList = em.createQuery( query ).getResultList();
final List<Bid> resultList = entityManager.createQuery( query ).getResultList();
assertThat(resultList.size(),is(2));
}
finally {
em.close();
}
} );
}
@Test
@TestForIssue(jiraKey = "HHH-8488")
public void testJoinMethodOnATreatedJoin() {
EntityManager em = createEntityManager();
try {
CriteriaBuilder cb = em.getCriteriaBuilder();
doInJPA( this::entityManagerFactory, entityManager -> {
CriteriaBuilder cb = entityManager.getCriteriaBuilder();
CriteriaQuery<Bid> query = cb.createQuery( Bid.class );
Root<Bid> bid = query.from( Bid.class );
@ -128,20 +108,16 @@ public class TreatJoinTest extends BaseEntityManagerFunctionalTestCase {
query.where( cb.equal( price.get("amount"), 10 ) );
final List<Bid> resultList = em.createQuery( query ).getResultList();
final List<Bid> resultList = entityManager.createQuery( query ).getResultList();
assertThat(resultList.size(),is(2));
}
finally {
em.close();
}
} );
}
@Test
@TestForIssue( jiraKey = "HHH-11081")
public void testTreatedJoinInWhereClause() {
EntityManager em = createEntityManager();
try {
CriteriaBuilder cb = em.getCriteriaBuilder();
doInJPA( this::entityManagerFactory, entityManager -> {
CriteriaBuilder cb = entityManager.getCriteriaBuilder();
CriteriaQuery<Bid> query = cb.createQuery( Bid.class );
Root<Bid> bid = query.from( Bid.class );
@ -149,21 +125,67 @@ public class TreatJoinTest extends BaseEntityManagerFunctionalTestCase {
Join<Bid, Book> book = cb.treat( item, Book.class );
query.where( cb.equal( book.get("title"), "La moneta di Akragas" ) );
final List<Bid> resultList = em.createQuery( query ).getResultList();
final List<Bid> resultList = entityManager.createQuery( query ).getResultList();
assertThat(resultList.size(),is(1));
}
finally {
em.close();
}
} );
}
@Test
@TestForIssue(jiraKey = "HHH-10561")
public void testJoinOnTreatedRoot() {
doInJPA( this::entityManagerFactory, entityManager -> {
CriteriaBuilder cb = entityManager.getCriteriaBuilder();
CriteriaQuery<Item> criteria = cb.createQuery(Item.class);
Root<Item> root = criteria.from(Item.class);
Root<Book> treatedRoot = cb.treat(root, Book.class);
criteria.where(
cb.equal(
treatedRoot.<Book, Author>join("author").<String>get("name"),
"Andrea Camilleri"));
entityManager.createQuery(criteria.select(treatedRoot)).getResultList();
} );
}
@Test
@TestForIssue(jiraKey = "HHH-10561")
public void testJoinOnTreatedRootWithJoin() {
doInJPA( this::entityManagerFactory, entityManager -> {
CriteriaBuilder cb = entityManager.getCriteriaBuilder();
CriteriaQuery<Item> criteria = cb.createQuery(Item.class);
Root<Item> root = criteria.from(Item.class);
root.join( "price" );
Root<Book> treatedRoot = cb.treat(root, Book.class);
criteria.where(
cb.equal(
treatedRoot.<Book, Author>join("author").<String>get("name"),
"Andrea Camilleri"));
entityManager.createQuery(criteria.select(treatedRoot)).getResultList();
} );
}
@Test
@TestForIssue(jiraKey = "HHH-10767")
public void testJoinOnTreatedJoin() {
doInJPA( this::entityManagerFactory, entityManager -> {
CriteriaBuilder cb = entityManager.getCriteriaBuilder();
CriteriaQuery<Bid> criteria = cb.createQuery(Bid.class);
Root<Bid> root = criteria.from(Bid.class);
Join<Book, Author> join = cb.treat(
root.<Bid, Item> join("item"), Book.class)
.join("author");
criteria.where(cb.equal(join.<String> get("name"), "Andrea Camilleri"));
entityManager.createQuery(criteria.select(root)).getResultList();
} );
}
@Entity(name = "Item")
@Inheritance(strategy = InheritanceType.JOINED)
public static class Item {
@Id
@GeneratedValue
private Long id;
@ManyToOne(cascade = CascadeType.PERSIST)
@ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
private Price price;
public Item() {
@ -197,7 +219,7 @@ public class TreatJoinTest extends BaseEntityManagerFunctionalTestCase {
public static class Book extends Item {
private String title;
@ManyToOne(cascade = CascadeType.PERSIST)
@ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
private Author author;
public Book() {
@ -226,7 +248,7 @@ public class TreatJoinTest extends BaseEntityManagerFunctionalTestCase {
@GeneratedValue
private Long id;
@ManyToOne(cascade = CascadeType.PERSIST)
@ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
private Item item;
public Bid() {