svn commit: r705996 - /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPrefetchQualifierOverlapTest.java

[aadamchik]

Author: aadamchik
Date: Sun Oct 19 05:07:51 2008
New Revision: 705996

URL: http://svn.apache.org/viewvc?rev=705996&view=rev
Log:
CAY-1025 Do something about to-many prefetch limitations

changing joint prefetches to use OUTER joins; some tests are broken as a result

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

Modified: 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPrefetchQualifierOverlapTest.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPrefetchQualifierOverlapTest.java?rev=705996&r1=705995&r2=705996&view=diff
==============================================================================
--- 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPrefetchQualifierOverlapTest.java
 (original)
+++ 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPrefetchQualifierOverlapTest.java
 Sun Oct 19 05:07:51 2008
@@ -22,6 +22,7 @@
 
 import org.apache.art.Artist;
 import org.apache.cayenne.exp.ExpressionFactory;
+import org.apache.cayenne.query.Ordering;
 import org.apache.cayenne.query.PrefetchTreeNode;
 import org.apache.cayenne.query.QueryChain;
 import org.apache.cayenne.query.SQLTemplate;
@@ -36,7 +37,7 @@
         deleteTestData();
     }
 
-    public void testToManyOverlappingQualifier() {
+    public void testToManyOverlappingQualifierWithInnerJoin() {
         QueryChain data = new QueryChain();
         data.addQuery(new SQLTemplate(
                 Artist.class,
@@ -62,7 +63,8 @@
         SelectQuery query = new SelectQuery(Artist.class);
         query.andQualifier(ExpressionFactory
                 .likeExp("paintingArray.paintingTitle", "AB%"));
-        
query.addPrefetch(Artist.PAINTING_ARRAY_PROPERTY).setSemantics(PrefetchTreeNode.JOINT_PREFETCH_SEMANTICS);
+        query.addPrefetch(Artist.PAINTING_ARRAY_PROPERTY).setSemantics(
+                PrefetchTreeNode.JOINT_PREFETCH_SEMANTICS);
 
         List<Artist> result = createDataContext().performQuery(query);
         assertEquals(1, result.size());
@@ -71,4 +73,47 @@
         assertEquals(3, a.getPaintingArray().size());
     }
 
+    public void testToManyOverlappingQualifierWithOuterJoin() {
+        QueryChain data = new QueryChain();
+        data.addQuery(new SQLTemplate(
+                Artist.class,
+                "INSERT INTO ARTIST (ARTIST_ID, ARTIST_NAME) VALUES (1, 
'A1')"));
+        data.addQuery(new SQLTemplate(
+                Artist.class,
+                "INSERT INTO ARTIST (ARTIST_ID, ARTIST_NAME) VALUES (2, 
'A2')"));
+        data
+                .addQuery(new SQLTemplate(
+                        Artist.class,
+                        "INSERT INTO PAINTING (PAINTING_ID, ARTIST_ID, 
PAINTING_TITLE) VALUES (1, 1, 'ABC')"));
+        data
+                .addQuery(new SQLTemplate(
+                        Artist.class,
+                        "INSERT INTO PAINTING (PAINTING_ID, ARTIST_ID, 
PAINTING_TITLE) VALUES (2, 1, 'ABD')"));
+        data
+                .addQuery(new SQLTemplate(
+                        Artist.class,
+                        "INSERT INTO PAINTING (PAINTING_ID, ARTIST_ID, 
PAINTING_TITLE) VALUES (3, 1, 'ACC')"));
+
+        createDataContext().performGenericQuery(data);
+
+        SelectQuery query = new SelectQuery(Artist.class);
+        query.andQualifier(ExpressionFactory.likeExp(
+                "paintingArray+.paintingTitle",
+                "AB%"));
+        query.addPrefetch(Artist.PAINTING_ARRAY_PROPERTY).setSemantics(
+                PrefetchTreeNode.JOINT_PREFETCH_SEMANTICS);
+
+        query.orQualifier(ExpressionFactory.likeExp("artistName", "A%"));
+        query.addOrdering(Artist.ARTIST_NAME_PROPERTY, Ordering.ASC);
+
+
+        List<Artist> result = createDataContext().performQuery(query);
+        assertEquals(2, result.size());
+
+        Artist a = result.get(0);
+        assertEquals(3, a.getPaintingArray().size());
+        
+        Artist a1 = result.get(1);
+        assertEquals(0, a1.getPaintingArray().size());
+    }
 }