svn commit: r681906 - in /openjpa/branches/1.2.x: openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/ openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/ openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/p...

[ppoddar]

Author: ppoddar
Date: Fri Aug  1 16:47:01 2008
New Revision: 681906

URL: http://svn.apache.org/viewvc?rev=681906&view=rev
Log:
OPENJPA-28: Merged from 1.3.0 trunk : GROUP BY clause on nested sub query 
should not appear on top-level query

Added:
    
openjpa/branches/1.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestGroupByQuery.java
      - copied unchanged from r681904, 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestGroupByQuery.java
    
openjpa/branches/1.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Chess.java
      - copied unchanged from r681904, 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Chess.java
    
openjpa/branches/1.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Game.java
      - copied unchanged from r681904, 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Game.java
    
openjpa/branches/1.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/IndoorGame.java
      - copied unchanged from r681904, 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/IndoorGame.java
    
openjpa/branches/1.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Scrabble.java
      - copied unchanged from r681904, 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Scrabble.java
Modified:
    
openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java

Modified: 
openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java
URL: 
http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java?rev=681906&r1=681905&r2=681906&view=diff
==============================================================================
--- 
openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java
 (original)
+++ 
openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java
 Fri Aug  1 16:47:01 2008
@@ -345,7 +345,7 @@
 
     private void evalGroupingClause(QueryExpressions exps) {
         // handle GROUP BY clauses
-        JPQLNode groupByNode = root().findChildByID(JJTGROUPBY, true);
+        JPQLNode groupByNode = root().findChildByID(JJTGROUPBY, false);
 
         if (groupByNode == null)
             return;
@@ -362,7 +362,7 @@
 
     private void evalHavingClause(QueryExpressions exps) {
         // handle HAVING clauses
-        JPQLNode havingNode = root().findChildByID(JJTHAVING, true);
+        JPQLNode havingNode = root().findChildByID(JJTHAVING, false);
 
         if (havingNode == null)
             return;