[hibernate-commits] Hibernate SVN: r19169 - core/trunk/testsuite/src/test/java/org/hibernate/test/hql.

[hibernate-commits at lists.jboss.org]

Author: stliu
Date: 2010-04-05 10:08:04 -0400 (Mon, 05 Apr 2010)
New Revision: 19169

Modified:
   core/trunk/testsuite/src/test/java/org/hibernate/test/hql/HQLTest.java
Log:
HHH-5045 org.hibernate.test.hql.HQLTest failure running testConcatenation with Ingres

Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/hql/HQLTest.java
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/hql/HQLTest.java	2010-04-05 13:37:52 UTC (rev 19168)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/hql/HQLTest.java	2010-04-05 14:08:04 UTC (rev 19169)
@@ -15,6 +15,7 @@
 import org.hibernate.QueryException;
 import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.dialect.HSQLDialect;
+import org.hibernate.dialect.IngresDialect;
 import org.hibernate.dialect.MySQLDialect;
 import org.hibernate.dialect.Oracle8iDialect;
 import org.hibernate.dialect.PostgreSQLDialect;
@@ -640,12 +641,19 @@
 	}
 
 	public void testConcatenation() {
-		if ( getDialect() instanceof MySQLDialect || getDialect() instanceof SybaseDialect || getDialect() instanceof Sybase11Dialect || getDialect() instanceof SybaseASE15Dialect || getDialect() instanceof SybaseAnywhereDialect || getDialect() instanceof SQLServerDialect ) {
+		if ( getDialect() instanceof MySQLDialect || getDialect() instanceof SybaseDialect
+				|| getDialect() instanceof Sybase11Dialect
+				|| getDialect() instanceof SybaseASE15Dialect
+				|| getDialect() instanceof SybaseAnywhereDialect
+				|| getDialect() instanceof SQLServerDialect 
+				|| getDialect() instanceof IngresDialect) {
 			// SybaseASE15Dialect and SybaseAnywhereDialect support '||'
 			// MySQL uses concat(x, y, z)
 			// SQL Server replaces '||' with '+'
 			//
 			// this is syntax checked in {@link ASTParserLoadingTest#testConcatenation} 
+			// Ingres supports both "||" and '+' but IngresDialect originally
+			// uses '+' operator; updated Ingres9Dialect to use "||".
 			return;
 		}
 		assertTranslation("from Human h where h.nickName = '1' || 'ov' || 'tha' || 'few'");