Author: steve.ebersole(a)jboss.com Date: 2010-01-08 01:55:42 -0500 (Fri, 08 Jan 2010) New Revision: 18449 Added: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/criteria/subquery/ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/criteria/subquery/UncorrelatedSubqueryTest.java Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaSubqueryImpl.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/QueryStructure.java Log: HHH-4767 - Bug in how Criteria Subquery selections are handled Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaSubqueryImpl.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaSubqueryImpl.java 2010-01-08 06:10:24 UTC (rev 18448) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaSubqueryImpl.java 2010-01-08 06:55:42 UTC (rev 18449) @@ -53,7 +53,6 @@ private final AbstractQuery<?> parent; private final QueryStructure<T> queryStructure; - private Expression<T> selection; private Set<Join<?, ?>> correlatedJoins = new HashSet<Join<?,?>>(); private final FromImplementor.JoinScope joinScope = new FromImplementor.JoinScope() { @@ -144,12 +143,11 @@ } public Expression<T> getSelection() { - return selection; + return (Expression<T>) queryStructure.getSelection(); } public Subquery<T> select(Expression<T> expression) { - queryStructure.setSelection( selection ); - this.selection = expression; + queryStructure.setSelection( expression ); return this; } Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/QueryStructure.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/QueryStructure.java 2010-01-08 06:10:24 UTC (rev 18448) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/QueryStructure.java 2010-01-08 06:55:42 UTC (rev 18449) @@ -187,7 +187,7 @@ } - // SUBQUERIES ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // SUB-QUERIES ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ public List<Subquery<?>> getSubqueries() { return subqueries; Added: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/criteria/subquery/UncorrelatedSubqueryTest.java =================================================================== --- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/criteria/subquery/UncorrelatedSubqueryTest.java (rev 0) +++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/criteria/subquery/UncorrelatedSubqueryTest.java 2010-01-08 06:55:42 UTC (rev 18449) @@ -0,0 +1,63 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2010, Red Hat Inc. or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Inc. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.ejb.criteria.subquery; + +import javax.persistence.EntityManager; +import javax.persistence.criteria.CriteriaBuilder; +import javax.persistence.criteria.CriteriaQuery; +import javax.persistence.criteria.Join; +import javax.persistence.criteria.Root; +import javax.persistence.criteria.Subquery; + +import org.hibernate.ejb.metamodel.AbstractMetamodelSpecificTest; +import org.hibernate.ejb.metamodel.Customer; +import org.hibernate.ejb.metamodel.Customer_; +import org.hibernate.ejb.metamodel.Order; +import org.hibernate.ejb.metamodel.Order_; + +/** + * TODO : javadoc + * + * @author Steve Ebersole + */ +public class UncorrelatedSubqueryTest extends AbstractMetamodelSpecificTest { + public void testEqualAll() { + CriteriaBuilder builder = factory.getCriteriaBuilder(); + EntityManager em = getOrCreateEntityManager(); + em.getTransaction().begin(); + + CriteriaQuery<Customer> criteria = builder.createQuery( Customer.class ); + Root<Customer> customerRoot = criteria.from( Customer.class ); + Join<Customer, Order> orderJoin = customerRoot.join( Customer_.orders ); + criteria.select( customerRoot ); + Subquery<Double> subCriteria = criteria.subquery( Double.class ); + Root<Order> subqueryOrderRoot = subCriteria.from( Order.class ); + subCriteria.select( builder.min( subqueryOrderRoot.get( Order_.totalPrice ) ) ); + criteria.where( builder.equal( orderJoin.get( "totalPrice" ), builder.all( subCriteria ) ) ); + em.createQuery( criteria ).getResultList(); + + em.getTransaction().commit(); + em.close(); + } +}