You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by pp...@apache.org on 2009/12/23 10:35:08 UTC

svn commit: r893448 - in /openjpa/trunk: openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StoreQuery.java openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java

Author: ppoddar
Date: Wed Dec 23 09:35:07 2009
New Revision: 893448

URL: http://svn.apache.org/viewvc?rev=893448&view=rev
Log:
OPENJPA-1444: distinct query

Modified:
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StoreQuery.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java

Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StoreQuery.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StoreQuery.java?rev=893448&r1=893447&r2=893448&view=diff
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StoreQuery.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StoreQuery.java Wed Dec 23 09:35:07 2009
@@ -303,6 +303,8 @@
          * Return true if the compiled query is an aggregate.
          */
         public boolean isAggregate(StoreQuery q);
+        
+        public boolean isDistinct(StoreQuery q);
 
         /**
          * Whether the compiled query has grouping.

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java?rev=893448&r1=893447&r2=893448&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java Wed Dec 23 09:35:07 2009
@@ -1544,7 +1544,6 @@
         ((OpenJPACriteriaQuery<T>)criteriaQuery).compile(); 
         
         org.apache.openjpa.kernel.Query kernelQuery =_broker.newQuery(CriteriaBuilderImpl.LANG_CRITERIA, criteriaQuery);
-        kernelQuery.setDistinct(((OpenJPACriteriaQuery<T>)criteriaQuery).isDistinct());
         
         QueryImpl<T> facadeQuery = new QueryImpl<T>(this, _ret, kernelQuery);
         Set<ParameterExpression<?>> params = criteriaQuery.getParameters();