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

HHH-9392 : SQLGrammarException while executing a entity graph with subgraphs 

(cherry picked from commit 8284b9ae2c)
This commit is contained in:
Gail Badner 2015-03-18 17:51:11 -07:00
parent 9a7740002f
commit 33e490e6b9
3 changed files with 66 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hibernate-core/src/main/java/org/hibernate/hql/internal/ast/HqlSqlWalker.java
View File

@ -151,6 +151,8 @@ public class HqlSqlWalker extends HqlSqlBaseWalker implements ErrorReporter, Par
private JoinType impliedJoinType = JoinType.INNER_JOIN;
private boolean inEntityGraph;
/**
* Create a new tree transformer.
*
@ -282,6 +284,10 @@ public class HqlSqlWalker extends HqlSqlBaseWalker implements ErrorReporter, Par
return collectionFilterRole;
}
public boolean isInEntityGraph() {
return inEntityGraph;
}
public SessionFactoryHelper getSessionFactoryHelper() {
return sessionFactoryHelper;
}
@ -673,9 +679,16 @@ public class HqlSqlWalker extends HqlSqlBaseWalker implements ErrorReporter, Par
// Add in the EntityGraph attribute nodes.
if ( queryTranslatorImpl.getEntityGraphQueryHint() != null ) {
qn.getFromClause().getFromElements().addAll(
queryTranslatorImpl.getEntityGraphQueryHint().toFromElements( qn.getFromClause(), this )
);
final boolean oldInEntityGraph = inEntityGraph;
try {
inEntityGraph = true;
qn.getFromClause().getFromElements().addAll(
queryTranslatorImpl.getEntityGraphQueryHint().toFromElements( qn.getFromClause(), this )
);
}
finally {
inEntityGraph = oldInEntityGraph;
}
}
if ( !explicitSelect ) {

2
hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/FromElement.java
View File

@ -403,7 +403,7 @@ public class FromElement extends HqlSqlWalkerNode implements DisplayableNode, Pa
ASTUtil.appendSibling( origin, this );
}
else {
if ( !getWalker().isInFrom() && !getWalker().isInSelect() ) {
if ( !getWalker().isInFrom() && !getWalker().isInSelect() && !getWalker().isInEntityGraph()) {
getFromClause().addChild( this );
}
else {

53
hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/graphs/EntityGraphUsingFetchGraphTest.java
View File

@ -42,6 +42,7 @@ import java.util.List;
import org.hibernate.Hibernate;
import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
import org.hibernate.testing.TestForIssue;
import org.junit.Test;
@ -58,6 +59,7 @@ public class EntityGraphUsingFetchGraphTest extends BaseEntityManagerFunctionalT
}
@Test
@TestForIssue( jiraKey = "HHH-9392")
public void fetchSubGraphFromSubgraph() {
EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
@ -107,6 +109,7 @@ public class EntityGraphUsingFetchGraphTest extends BaseEntityManagerFunctionalT
}
@Test
@TestForIssue( jiraKey = "HHH-9392")
public void fetchAttributeNodeFromSubgraph() {
EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
@ -134,15 +137,15 @@ public class EntityGraphUsingFetchGraphTest extends BaseEntityManagerFunctionalT
em.getTransaction().begin();
final EntityGraph<CustomerOrder> entityGraph = em.createEntityGraph( CustomerOrder.class );
//entityGraph.addAttributeNodes( "shippingAddress", "orderDate" );
entityGraph.addAttributeNodes( "shippingAddress", "orderDate" );
entityGraph.addAttributeNodes( "shippingAddress" );
final Subgraph<OrderPosition> orderProductsSubgraph = entityGraph.addSubgraph( "orderPosition" );
//orderProductsSubgraph.addAttributeNodes( "amount" );
orderProductsSubgraph.addAttributeNodes( "amount" );
orderProductsSubgraph.addAttributeNodes( "product" );
//final Subgraph<Product> productSubgraph = orderProductsSubgraph.addSubgraph( "product" );
//productSubgraph.addAttributeNodes( "productName" );
final Subgraph<Product> productSubgraph = orderProductsSubgraph.addSubgraph( "product" );
productSubgraph.addAttributeNodes( "productName" );
TypedQuery<CustomerOrder> query = em.createQuery(
"SELECT o FROM EntityGraphUsingFetchGraphTest$CustomerOrder o", CustomerOrder.class
@ -156,6 +159,48 @@ public class EntityGraphUsingFetchGraphTest extends BaseEntityManagerFunctionalT
em.close();
}
@Test
@TestForIssue( jiraKey = "HHH-9392")
public void fetchUsingHql() {
// This test is here only for comparison with results from fetchAttributeNodeFromSubgraph.
// At the time this was written, the generated SQL from the HQL is the same as that generated with the
// query hint in fetchAttributeNodeFromSubgraph. I am leaving this here for future debugging purposes.
EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
Address address = new Address();
address.city = "TestCity";
CustomerOrder customerOrder = new CustomerOrder();
customerOrder.shippingAddress = address;
Product product = new Product();
OrderPosition orderPosition = new OrderPosition();
orderPosition.product = product;
customerOrder.orderPosition = orderPosition;
em.persist( address );
em.persist( orderPosition );
em.persist( product );
em.persist( customerOrder );
em.getTransaction().commit();
em.clear();
em.getTransaction().begin();
TypedQuery<CustomerOrder> query = em.createQuery(
"SELECT o FROM EntityGraphUsingFetchGraphTest$CustomerOrder o left join fetch o.orderPosition pos left join fetch pos.product left join fetch o.shippingAddress", CustomerOrder.class
);
final List<CustomerOrder> results = query.getResultList();
assertTrue( Hibernate.isInitialized( results ) );
em.getTransaction().commit();
em.close();
}
@Entity
public static class CustomerOrder {
@Id