openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r612348 - in /openjpa/trunk: openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/GroupingTestCase.java
Date Wed, 16 Jan 2008 04:35:27 GMT
Author: pcl
Date: Tue Jan 15 20:35:26 2008
New Revision: 612348

URL: http://svn.apache.org/viewvc?rev=612348&view=rev
Log:
OPENJPA-488, OPENJPA-489, OPENJPA-490, OPENJPA-491, OPENJPA-492. Reduce logging in test case;
use onlyChild() to validate tree structure.

Modified:
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/GroupingTestCase.java

Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java?rev=612348&r1=612347&r2=612348&view=diff
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java
(original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java
Tue Jan 15 20:35:26 2008
@@ -1075,13 +1075,13 @@
                 return factory.getCurrentTimestamp();
 
             case JJTSELECTEXTENSION:
-                return eval(node.children[0]);
+                return eval(onlyChild(node));
 
             case JJTGROUPBYEXTENSION:
-                return eval(node.children[0]);
+                return eval(onlyChild(node));
 
             case JJTORDERBYEXTENSION:
-                return eval(node.children[0]);
+                return eval(onlyChild(node));
 
             default:
                 throw parseException(EX_FATAL, "bad-tree",

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/GroupingTestCase.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/GroupingTestCase.java?rev=612348&r1=612347&r2=612348&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/GroupingTestCase.java
(original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/GroupingTestCase.java
Tue Jan 15 20:35:26 2008
@@ -38,7 +38,7 @@
     protected abstract void prepareQuery(Query q);
 
     public void setUp() {
-        super.setUp(AllFieldTypes.class, CLEAR_TABLES, "openjpa.Log", "SQL=TRACE");
+        super.setUp(AllFieldTypes.class, CLEAR_TABLES);
 
         AllFieldTypes pc1 = new AllFieldTypes();
         AllFieldTypes pc2 = new AllFieldTypes();



Mime
View raw message