You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by ht...@apache.org on 2014/06/12 05:53:21 UTC
svn commit: r1602059 - in /openjpa/branches/2.3.x: ./
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/
openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/
Author: hthomann
Date: Thu Jun 12 03:53:20 2014
New Revision: 1602059
URL: http://svn.apache.org/r1602059
Log:
OPENJPA-2502: Update accessPath metas in CriteriaExpressionBuilder. Merged changes from trunk. Patch contributed by Albert Lee.
Added:
openjpa/branches/2.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/Department.java
- copied unchanged from r1600682, openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/Department.java
openjpa/branches/2.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/Department_.java
- copied unchanged from r1600682, openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/Department_.java
openjpa/branches/2.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/Employee.java
- copied unchanged from r1600682, openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/Employee.java
openjpa/branches/2.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/Employee_.java
- copied unchanged from r1600682, openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/Employee_.java
openjpa/branches/2.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/TestJoinFetchWithQueryDataCache.java
- copied unchanged from r1600682, openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/TestJoinFetchWithQueryDataCache.java
Modified:
openjpa/branches/2.3.x/ (props changed)
openjpa/branches/2.3.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaExpressionBuilder.java
Propchange: openjpa/branches/2.3.x/
------------------------------------------------------------------------------
Merged /openjpa/trunk:r1600682
Modified: openjpa/branches/2.3.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaExpressionBuilder.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.3.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaExpressionBuilder.java?rev=1602059&r1=1602058&r2=1602059&view=diff
==============================================================================
--- openjpa/branches/2.3.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaExpressionBuilder.java (original)
+++ openjpa/branches/2.3.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaExpressionBuilder.java Thu Jun 12 03:53:20 2014
@@ -98,10 +98,9 @@ class CriteriaExpressionBuilder {
metas.add(meta);
}
}
- for (Fetch<?,?> fetch : root.getFetches()) {
- metas.add(metamodel.getRepository().getCachedMetaData(fetch.getAttribute().getJavaType()));
- }
}
+ // TODO -- need to handle subqueries
+
exps.accessPath = metas.toArray(new ClassMetaData[metas.size()]);
}