[hibernate-commits] Hibernate SVN: r21038 - core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hqlfetchscroll.

[hibernate-commits at lists.jboss.org]

Author: stliu
Date: 2012-06-07 01:16:57 -0400 (Thu, 07 Jun 2012)
New Revision: 21038

Modified:
   core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hqlfetchscroll/HQLScrollFetchTest.java
Log:
JBPAPP-9227 Backport fix for HHH-1657 hql update generate wrong sql with joined subclass hierarchy to EAP5

Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hqlfetchscroll/HQLScrollFetchTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hqlfetchscroll/HQLScrollFetchTest.java	2012-06-05 09:07:40 UTC (rev 21037)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hqlfetchscroll/HQLScrollFetchTest.java	2012-06-07 05:16:57 UTC (rev 21038)
@@ -7,6 +7,7 @@
 import org.hibernate.ScrollableResults;
 import org.hibernate.Session;
 import org.hibernate.Transaction;
+import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.dialect.Oracle8iDialect;
 import org.hibernate.dialect.SQLServerDialect;
 import org.hibernate.junit.functional.FunctionalTestCase;
@@ -34,22 +35,24 @@
 	}
 
 	public void testScroll() {
-		if( getDialect() instanceof SQLServerDialect || getDialect() instanceof Oracle8iDialect ){
+		if( getDialect() instanceof SQLServerDialect || getDialect() instanceof Oracle8iDialect || getDialect() instanceof DB2Dialect){
 			reportSkip( "SQL Server and Oracle do not sort the result set automatically, so failure as expected","HQLScrollFetchTest" );
 			return;
 		}
+		insertTestData();
+		Session s = openSession();
 		try {
-			insertTestData();
-			Session s = openSession();
+			s.beginTransaction();
 			ScrollableResults results = s.createQuery( QUERY ).scroll();
 			List list = new ArrayList();
 			while ( results.next() ) {
 				list.add( results.get( 0 ) );
 			}
 			assertResultFromAllUsers( list );
-			s.close();
 		}
 		finally {
+			s.getTransaction().rollback();
+			s.close();
 			deleteAll();
 		}
 	}
@@ -139,7 +142,7 @@
 		Transaction t = s.beginTransaction();
 		List list = s.createQuery( "from Parent" ).list();
 		for ( Iterator i = list.iterator(); i.hasNext(); ) {
-			s.delete( (Parent) i.next() );
+			s.delete( i.next() );
 		}
 		t.commit();
 		s.close();