You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by fa...@apache.org on 2010/07/07 20:37:30 UTC
svn commit: r961472 - in /openjpa:
branches/2.0.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/
trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/
Author: fancy
Date: Wed Jul 7 18:37:29 2010
New Revision: 961472
URL: http://svn.apache.org/viewvc?rev=961472&view=rev
Log:
OPENJPA-1715: OpenJPA generates wrong SQL if a result variable that references an aggregate expression is used in ORDER BY clause
fix testcase.
Modified:
openjpa/branches/2.0.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestJPQLScalarExpressions.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestJPQLScalarExpressions.java
Modified: openjpa/branches/2.0.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestJPQLScalarExpressions.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestJPQLScalarExpressions.java?rev=961472&r1=961471&r2=961472&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestJPQLScalarExpressions.java (original)
+++ openjpa/branches/2.0.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestJPQLScalarExpressions.java Wed Jul 7 18:37:29 2010
@@ -82,7 +82,11 @@ public class TestJPQLScalarExpressions e
query.setFirstResult(1);
query.setMaxResults(4);
List<Object[]> rs = query.getResultList();
- assertTrue((Long)((Object[]) rs.get(0))[1] > 0);
+ Object val = ((Object[]) rs.get(0))[1];
+ if (val instanceof Integer)
+ assertTrue((Integer) val > 0);
+ else if (val instanceof Long)
+ assertTrue((Long) val > 0);
}
}
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestJPQLScalarExpressions.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestJPQLScalarExpressions.java?rev=961472&r1=961471&r2=961472&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestJPQLScalarExpressions.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestJPQLScalarExpressions.java Wed Jul 7 18:37:29 2010
@@ -83,7 +83,11 @@ public class TestJPQLScalarExpressions e
query.setFirstResult(1);
query.setMaxResults(4);
List<Object[]> rs = query.getResultList();
- assertTrue((Long)((Object[]) rs.get(0))[1] > 0);
+ Object val = ((Object[]) rs.get(0))[1];
+ if (val instanceof Integer)
+ assertTrue((Integer) val > 0);
+ else if (val instanceof Long)
+ assertTrue((Long) val > 0);
}
}