[hibernate-commits] Hibernate SVN: r19722 - in core/trunk: testsuite/src/test/java/org/hibernate/test/hql and 1 other directory.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Mon Jun 14 00:27:41 EDT 2010
Author: gbadner
Date: 2010-06-14 00:27:40 -0400 (Mon, 14 Jun 2010)
New Revision: 19722
Modified:
core/trunk/core/src/main/java/org/hibernate/dialect/Oracle9iDialect.java
core/trunk/core/src/main/java/org/hibernate/dialect/SQLServerDialect.java
core/trunk/testsuite/src/test/java/org/hibernate/test/hql/CriteriaHQLAlignmentTest.java
Log:
HHH-5220 HHH-5231 : Fix unit test failures and DB lockups for SELECT COUNT(DISTINCT arg1, arg2) tests
Modified: core/trunk/core/src/main/java/org/hibernate/dialect/Oracle9iDialect.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/dialect/Oracle9iDialect.java 2010-06-13 22:19:34 UTC (rev 19721)
+++ core/trunk/core/src/main/java/org/hibernate/dialect/Oracle9iDialect.java 2010-06-14 04:27:40 UTC (rev 19722)
@@ -131,8 +131,11 @@
* HHH-4907, I don't know if oracle 8 supports this syntax, so I'd think it is better add this
* method here. Reopen this issue if you found/know 8 supports it.
*/
- public boolean supportsRowValueConstructorSyntaxInInList() {
- return true;
- }
-
+ public boolean supportsRowValueConstructorSyntaxInInList() {
+ return true;
+ }
+
+ public boolean supportsTupleDistinctCounts() {
+ return false;
+ }
}
Modified: core/trunk/core/src/main/java/org/hibernate/dialect/SQLServerDialect.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/dialect/SQLServerDialect.java 2010-06-13 22:19:34 UTC (rev 19721)
+++ core/trunk/core/src/main/java/org/hibernate/dialect/SQLServerDialect.java 2010-06-14 04:27:40 UTC (rev 19722)
@@ -164,4 +164,8 @@
public boolean doesRepeatableReadCauseReadersToBlockWriters() {
return false; // here assume SQLServer2005 using snapshot isolation, which does not have this problem
}
+
+ public boolean supportsTupleDistinctCounts() {
+ return false;
+ }
}
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/hql/CriteriaHQLAlignmentTest.java
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/hql/CriteriaHQLAlignmentTest.java 2010-06-13 22:19:34 UTC (rev 19721)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/hql/CriteriaHQLAlignmentTest.java 2010-06-14 04:27:40 UTC (rev 19722)
@@ -4,6 +4,7 @@
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Collections;
+import java.util.List;
import junit.framework.Test;
@@ -33,6 +34,12 @@
SelectClause.VERSION2_SQL = true;
}
+ public String[] getMappings() {
+ return new String[] {
+ "hql/Animal.hbm.xml",
+ };
+ }
+
public boolean createSchema() {
return true; // needed for the Criteria return type test
}
@@ -119,6 +126,7 @@
// HHH-1724 Align Criteria with HQL aggregation return types.
public void testCriteriaAggregationReturnType() {
Session s = openSession();
+ s.beginTransaction();
Human human = new Human();
human.setBigIntegerValue( new BigInteger("42") );
human.setBigDecimalValue( new BigDecimal(45) );
@@ -172,6 +180,7 @@
s.delete( human );
s.flush();
+ s.getTransaction().commit();
s.close();
}
@@ -224,7 +233,7 @@
.setProjection( Projections.count( "nickName" ).setDistinct() )
.uniqueResult();
assertEquals( 2, count.longValue() );
- s.clear();
+ s.close();
s = openSession();
t = s.beginTransaction();
@@ -336,5 +345,4 @@
t.commit();
s.close();
}
-
}
More information about the hibernate-commits
mailing list