You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by an...@apache.org on 2010/01/20 22:59:49 UTC
svn commit: r901396 -
/cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/DbEntity.java
Author: andrey
Date: Wed Jan 20 21:59:49 2010
New Revision: 901396
URL: http://svn.apache.org/viewvc?rev=901396&view=rev
Log:
CAY-1368 Left Join and Prefetches do not work together
Modified:
cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/DbEntity.java
Modified: cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/DbEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/DbEntity.java?rev=901396&r1=901395&r2=901396&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/DbEntity.java (original)
+++ cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/DbEntity.java Wed Jan 20 21:59:49 2010
@@ -809,9 +809,10 @@
private void appendPath(
LinkedList<String> finalPath,
PathComponent<Attribute, Relationship> pathComponent) {
- String name = (pathComponent.getAttribute() != null ?
- pathComponent.getAttribute() :
- pathComponent.getRelationship()).getName();
+ CayenneMapEntry mapEntry = pathComponent.getAttribute() != null ?
+ pathComponent.getAttribute() :
+ pathComponent.getRelationship();
+ String name = mapEntry.getName();
if (pathComponent.getJoinType() == JoinType.LEFT_OUTER) {
name += OUTER_JOIN_INDICATOR;
}