svn commit: r707904 - in /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src: main/java/org/apache/cayenne/access/PrefetchProcessorJointNode.java test/java/org/apache/cayenne/access/JointPrefetchTest.java

[aadamchik]

Author: aadamchik
Date: Sat Oct 25 13:48:19 2008
New Revision: 707904

URL: http://svn.apache.org/viewvc?rev=707904&view=rev
Log:
CAY-1128 Switch JOINT prefetches to generate OUTER Joins

support for optional relationships prefetching

Modified:
    
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/PrefetchProcessorJointNode.java
    
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/JointPrefetchTest.java

Modified: 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/PrefetchProcessorJointNode.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/PrefetchProcessorJointNode.java?rev=707904&r1=707903&r2=707904&view=diff
==============================================================================
--- 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/PrefetchProcessorJointNode.java
 (original)
+++ 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/PrefetchProcessorJointNode.java
 Sat Oct 25 13:48:19 2008
@@ -196,7 +196,7 @@
                                     + join);
                 }
 
-                appendColumn(targetSource, join.getTargetName(), source);
+                appendColumn(targetSource, join.getTargetName(), prefix + 
source);
             }
         }
 

Modified: 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/JointPrefetchTest.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/JointPrefetchTest.java?rev=707904&r1=707903&r2=707904&view=diff
==============================================================================
--- 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/JointPrefetchTest.java
 (original)
+++ 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/JointPrefetchTest.java
 Sat Oct 25 13:48:19 2008
@@ -78,12 +78,11 @@
             // row should contain columns from both entities minus those 
duplicated in a
             // join...
             int rowWidth = getDbEntity("ARTIST").getAttributes().size()
-                    + getDbEntity("PAINTING").getAttributes().size()
-                    - 1;
+                    + getDbEntity("PAINTING").getAttributes().size();
             Iterator it = rows.iterator();
             while (it.hasNext()) {
                 DataRow row = (DataRow) it.next();
-                assertEquals(rowWidth, row.size());
+                assertEquals("" + row, rowWidth, row.size());
 
                 // assert columns presence
                 assertTrue(row + "", row.containsKey("PAINTING_ID"));