[hibernate-commits] Hibernate SVN: r11666 - in branches/Branch_3_2/Hibernate3/test/org/hibernate/test: legacy and 1 other directory.

[hibernate-commits at lists.jboss.org]

Author: steve.ebersole at jboss.com
Date: 2007-06-08 14:58:14 -0400 (Fri, 08 Jun 2007)
New Revision: 11666

Modified:
   branches/Branch_3_2/Hibernate3/test/org/hibernate/test/hql/HQLTest.java
   branches/Branch_3_2/Hibernate3/test/org/hibernate/test/legacy/FooBarTest.java
Log:
HHH-2665 : oracle dialects

Modified: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/hql/HQLTest.java
===================================================================
--- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/hql/HQLTest.java	2007-06-08 18:58:01 UTC (rev 11665)
+++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/hql/HQLTest.java	2007-06-08 18:58:14 UTC (rev 11666)
@@ -14,10 +14,10 @@
 
 import org.hibernate.Hibernate;
 import org.hibernate.QueryException;
-import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
 import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.dialect.HSQLDialect;
 import org.hibernate.dialect.MySQLDialect;
+import org.hibernate.dialect.Oracle8iDialect;
 import org.hibernate.dialect.Oracle9Dialect;
 import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.dialect.SybaseDialect;
@@ -33,9 +33,10 @@
 import org.hibernate.hql.ast.QueryTranslatorImpl;
 import org.hibernate.hql.ast.tree.ConstructorNode;
 import org.hibernate.hql.ast.tree.DotNode;
+import org.hibernate.hql.ast.tree.FromReferenceNode;
 import org.hibernate.hql.ast.tree.IndexNode;
 import org.hibernate.hql.ast.tree.SelectClause;
-import org.hibernate.hql.ast.tree.FromReferenceNode;
+import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
 
 /**
  * Tests cases where the AST based query translator and the 'classic' query translator generate identical SQL.
@@ -671,6 +672,7 @@
 
 	public void testGroupByFunction() {
 		if ( getDialect() instanceof Oracle9Dialect ) return;
+		if ( getDialect() instanceof Oracle8iDialect ) return; // the new hiearchy...
 		if ( getDialect() instanceof PostgreSQLDialect ) return;
 		assertTranslation( "select count(*) from Human h group by year(h.birthdate)" );
 		assertTranslation( "select count(*) from Human h group by trunc( sqrt(h.bodyWeight*4)/2 )" );

Modified: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/legacy/FooBarTest.java
===================================================================
--- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/legacy/FooBarTest.java	2007-06-08 18:58:01 UTC (rev 11665)
+++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/legacy/FooBarTest.java	2007-06-08 18:58:14 UTC (rev 11666)
@@ -45,10 +45,12 @@
 import org.hibernate.criterion.Order;
 import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.dialect.DerbyDialect;
+import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.HSQLDialect;
 import org.hibernate.dialect.InterbaseDialect;
 import org.hibernate.dialect.MckoiDialect;
 import org.hibernate.dialect.MySQLDialect;
+import org.hibernate.dialect.Oracle8iDialect;
 import org.hibernate.dialect.Oracle9Dialect;
 import org.hibernate.dialect.OracleDialect;
 import org.hibernate.dialect.PointbaseDialect;
@@ -56,7 +58,6 @@
 import org.hibernate.dialect.SAPDBDialect;
 import org.hibernate.dialect.SybaseDialect;
 import org.hibernate.dialect.TimesTenDialect;
-import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.SessionFactoryImplementor;
 import org.hibernate.jmx.HibernateService;
 import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
@@ -2135,7 +2136,7 @@
 			s.find("select count(*) from Baz as baz where 1 in indices(baz.fooArray)");
 			s.find("select count(*) from Bar as bar where 'abc' in elements(bar.baz.fooArray)");
 			s.find("select count(*) from Bar as bar where 1 in indices(bar.baz.fooArray)");
-			if ( !(getDialect() instanceof DB2Dialect) &&  !(getDialect() instanceof Oracle9Dialect)  ) {
+			if ( !(getDialect() instanceof DB2Dialect) &&  !(getDialect() instanceof Oracle9Dialect) && !(getDialect() instanceof Oracle8iDialect ) ) {
 				s.find("select count(*) from Bar as bar, bar.component.glarch.proxyArray as g where g.id in indices(bar.baz.fooArray)");
 				s.find("select max( elements(bar.baz.fooArray) ) from Bar as bar, bar.component.glarch.proxyArray as g where g.id in indices(bar.baz.fooArray)");
 			}