[hibernate-commits] Hibernate SVN: r15753 - in core/trunk: testsuite/src/test/java/org/hibernate/test/hql and 1 other directory.

[hibernate-commits at lists.jboss.org]

Author: steve.ebersole at jboss.com
Date: 2009-01-07 15:33:16 -0500 (Wed, 07 Jan 2009)
New Revision: 15753

Modified:
   core/trunk/core/src/main/java/org/hibernate/engine/query/HQLQueryPlan.java
   core/trunk/testsuite/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java
Log:
HHH-3693 : implicit polymorphism + pagination

Modified: core/trunk/core/src/main/java/org/hibernate/engine/query/HQLQueryPlan.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/engine/query/HQLQueryPlan.java	2009-01-07 20:12:43 UTC (rev 15752)
+++ core/trunk/core/src/main/java/org/hibernate/engine/query/HQLQueryPlan.java	2009-01-07 20:33:16 UTC (rev 15753)
@@ -205,7 +205,7 @@
 				final int size = tmp.size();
 				for ( int x = 0; x < size; x++ ) {
 					final Object result = tmp.get( x );
-					if ( distinction.add( result ) ) {
+					if ( ! distinction.add( result ) ) {
 						continue;
 					}
 					includedCount++;

Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java	2009-01-07 20:12:43 UTC (rev 15752)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java	2009-01-07 20:33:16 UTC (rev 15753)
@@ -102,6 +102,29 @@
 		return new FunctionalTestClassTestSuite( ASTParserLoadingTest.class );
 	}
 
+	public void testPaginationWithPolymorphicQuery() {
+		Session s = openSession();
+		s.beginTransaction();
+		Human h = new Human();
+		h.setName( new Name( "Steve", null, "Ebersole" ) );
+		s.save( h );
+		s.getTransaction().commit();
+		s.close();
+
+		s = openSession();
+		s.beginTransaction();
+		List results = s.createQuery( "from java.lang.Object" ).setMaxResults( 2 ).list();
+		assertEquals( 1, results.size() );
+		s.getTransaction().commit();
+		s.close();
+
+		s = openSession();
+		s.beginTransaction();
+		s.delete( h );
+		s.getTransaction().commit();
+		s.close();
+	}
+
 	public void testComponentNullnessChecks() {
 		Session s = openSession();
 		s.beginTransaction();