7:03 a.m.
Author: steve.ebersole(a)jboss.com
Date: 2006-12-08 08:03:52 -0500 (Fri, 08 Dec 2006)
New Revision: 10962
Modified:
trunk/Hibernate3/test/org/hibernate/test/hql/ASTParserLoadingTest.java
trunk/Hibernate3/test/org/hibernate/test/hql/HQLTest.java
Log:
fixed org.hibernate.test.hql.HQLTest#testExpressionWithParamInFunction failure on sql
server
Modified: trunk/Hibernate3/test/org/hibernate/test/hql/ASTParserLoadingTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/hql/ASTParserLoadingTest.java 2006-12-08
13:03:23 UTC (rev 10961)
+++ trunk/Hibernate3/test/org/hibernate/test/hql/ASTParserLoadingTest.java 2006-12-08
13:03:52 UTC (rev 10962)
@@ -31,6 +31,7 @@
import org.hibernate.dialect.Oracle9Dialect;
import org.hibernate.dialect.SQLServerDialect;
import org.hibernate.dialect.SybaseDialect;
+import org.hibernate.dialect.PostgreSQLDialect;
import org.hibernate.stat.QueryStatistics;
import org.hibernate.test.TestCase;
import org.hibernate.test.any.PropertyValue;
@@ -95,6 +96,9 @@
cfg.setProperty( Environment.GENERATE_STATISTICS, "true" );
}
+ /**
+ * Copied from {@link HQLTest#testConcatenation}
+ */
public void testConcatenation() {
// simple syntax checking...
Session s = openSession();
@@ -104,6 +108,25 @@
s.close();
}
+ /**
+ * Copied from {@link HQLTest#testExpressionWithParamInFunction}
+ */
+ public void testExpressionWithParamInFunction() {
+ Session s = openSession();
+ s.beginTransaction();
+ s.createQuery( "from Animal a where abs(a.bodyWeight-:param) < 2.0"
).setLong( "param", 1 ).list();
+ s.createQuery( "from Animal a where abs(:param - a.bodyWeight) < 2.0"
).setLong( "param", 1 ).list();
+ s.createQuery( "from Animal where abs(:x - :y) < 2.0" ).setLong(
"x", 1 ).setLong( "y", 1 ).list();
+ s.createQuery( "from Animal where lower(upper(:foo)) like 'f%'"
).setString( "foo", "foo" ).list();
+ s.createQuery( "from Animal a where abs(abs(a.bodyWeight - 1.0 + :param) *
abs(length('ffobar')-3)) = 3.0" ).setLong( "param", 1 ).list();
+ s.createQuery( "from Animal where lower(upper('foo') || upper(:bar)) like
'f%'" ).setString( "bar", "xyz" ).list();
+ if ( ! ( getDialect() instanceof PostgreSQLDialect || getDialect() instanceof
MySQLDialect ) ) {
+ s.createQuery( "from Animal where abs(cast(1 as float) - cast(:param as float)) =
1.0" ).setLong( "param", 1 ).list();
+ }
+ s.getTransaction().commit();
+ s.close();
+ }
+
public void testCrazyIdFieldNames() {
MoreCrazyIdFieldNameStuffEntity top = new MoreCrazyIdFieldNameStuffEntity(
"top" );
HeresAnotherCrazyIdFieldName next = new HeresAnotherCrazyIdFieldName( "next"
);
Modified: trunk/Hibernate3/test/org/hibernate/test/hql/HQLTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/hql/HQLTest.java 2006-12-08 13:03:23 UTC (rev
10961)
+++ trunk/Hibernate3/test/org/hibernate/test/hql/HQLTest.java 2006-12-08 13:03:52 UTC (rev
10962)
@@ -198,10 +198,16 @@
assertTranslation("from Animal a where abs(:param - a.bodyWeight) <
2.0");
assertTranslation("from Animal where abs(:x - :y) < 2.0");
assertTranslation("from Animal where lower(upper(:foo)) like 'f%'");
- assertTranslation("from Animal a where abs(abs(a.bodyWeight - 1.0 + :param) *
abs(length('ffobar')-3)) = 3.0");
- if ( getDialect() instanceof MySQLDialect ) return;
- assertTranslation("from Animal where lower(upper('foo') || upper(:bar))
like 'f%'");
- if ( getDialect() instanceof PostgreSQLDialect ) return;
+ if ( ! ( getDialect() instanceof SybaseDialect ) ) {
+ // SybaseDialect maps the length function -> len; classic translator does not
consider that *when nested*
+ assertTranslation("from Animal a where abs(abs(a.bodyWeight - 1.0 + :param) *
abs(length('ffobar')-3)) = 3.0");
+ }
+ if ( !( getDialect() instanceof MySQLDialect || getDialect() instanceof SybaseDialect )
) {
+ assertTranslation("from Animal where lower(upper('foo') || upper(:bar))
like 'f%'");
+ }
+ if ( getDialect() instanceof PostgreSQLDialect ) {
+ return;
+ }
assertTranslation("from Animal where abs(cast(1 as float) - cast(:param as float))
= 1.0");
}