[hibernate-commits] Hibernate SVN: r19526 - in core/trunk: annotations/src/test/java/org/hibernate/test/annotations/subselect and 2 other directories.

[hibernate-commits at lists.jboss.org]

Author: gbadner
Date: 2010-05-16 17:33:05 -0400 (Sun, 16 May 2010)
New Revision: 19526

Modified:
   core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytomany/ManyToManyTest.java
   core/trunk/annotations/src/test/java/org/hibernate/test/annotations/subselect/SubselectTest.java
   core/trunk/core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java
   core/trunk/testsuite/src/test/java/org/hibernate/test/instrument/domain/Documents.hbm.xml
Log:
HHH-5231 HHH-5220 : Fixes for DB2 and PostgreSQL unit tests

Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytomany/ManyToManyTest.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytomany/ManyToManyTest.java	2010-05-15 16:05:09 UTC (rev 19525)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytomany/ManyToManyTest.java	2010-05-16 21:33:05 UTC (rev 19526)
@@ -99,9 +99,11 @@
 		s.close();
 
 		s = openSession();
+		tx = s.beginTransaction();
 		List result = s.createCriteria( Supplier.class ).createAlias( "suppStores", "s" ).add(
 				Restrictions.eq( "s.name", "Fnac" ) ).list();
 		assertEquals( 1, result.size() );
+		tx.commit();
 		s.close();
 	}
 	public void testDefaultCompositePk() throws Exception {

Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/subselect/SubselectTest.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/subselect/SubselectTest.java	2010-05-15 16:05:09 UTC (rev 19525)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/subselect/SubselectTest.java	2010-05-16 21:33:05 UTC (rev 19526)
@@ -71,7 +71,7 @@
 		HighestBid highestBid = (HighestBid) query.list().iterator().next();
 		
 		assertEquals(200.0, highestBid.getAmount());
-		
+		tx.rollback();		
 		s.close();	
 		
 		

Modified: core/trunk/core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java	2010-05-15 16:05:09 UTC (rev 19525)
+++ core/trunk/core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java	2010-05-16 21:33:05 UTC (rev 19526)
@@ -290,6 +290,10 @@
 		return "select now()";
 	}
 
+	public boolean supportsTupleDistinctCounts() {
+		return false;
+	}
+
 	public String toBooleanValueString(boolean bool) {
 		return bool ? "true" : "false";
 	}

Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/instrument/domain/Documents.hbm.xml
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/instrument/domain/Documents.hbm.xml	2010-05-15 16:05:09 UTC (rev 19525)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/instrument/domain/Documents.hbm.xml	2010-05-16 21:33:05 UTC (rev 19526)
@@ -56,7 +56,7 @@
     	<property name="sizeKb" lazy="true">
     		<column name="size_mb"
     			read="size_mb * 1024.0"
-    			write="? / 1024.0"/>
+    			write="? / cast( 1024.0 as float )"/>
     	</property>
     </class>