svn commit: r423568 - in /incubator/cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src: cayenne/java/org/objectstyle/cayenne/query/RelationshipQuery.java tests/java/org/objectstyle/cayenne/access/NestedDataContextReadTst.java

[aadamchik]

Author: aadamchik
Date: Wed Jul 19 12:04:02 2006
New Revision: 423568

URL: http://svn.apache.org/viewvc?rev=423568&view=rev
Log:
CAY-601

Modified:
    
incubator/cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/query/RelationshipQuery.java
    
incubator/cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/tests/java/org/objectstyle/cayenne/access/NestedDataContextReadTst.java

Modified: 
incubator/cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/query/RelationshipQuery.java
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/query/RelationshipQuery.java?rev=423568&r1=423567&r2=423568&view=diff
==============================================================================
--- 
incubator/cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/query/RelationshipQuery.java
 (original)
+++ 
incubator/cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/query/RelationshipQuery.java
 Wed Jul 19 12:04:02 2006
@@ -112,11 +112,6 @@
             throw new CayenneRuntimeException("Null objectID");
         }
 
-        if (objectID.isTemporary()) {
-            throw new CayenneRuntimeException(
-                    "Temporary id can't be used in RelationshipQuery: " + 
objectID);
-        }
-
         this.objectId = objectID;
         this.relationshipName = relationshipName;
         this.refreshing = refreshing;

Modified: 
incubator/cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/tests/java/org/objectstyle/cayenne/access/NestedDataContextReadTst.java
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/tests/java/org/objectstyle/cayenne/access/NestedDataContextReadTst.java?rev=423568&r1=423567&r2=423568&view=diff
==============================================================================
--- 
incubator/cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/tests/java/org/objectstyle/cayenne/access/NestedDataContextReadTst.java
 (original)
+++ 
incubator/cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/tests/java/org/objectstyle/cayenne/access/NestedDataContextReadTst.java
 Wed Jul 19 12:04:02 2006
@@ -233,6 +233,30 @@
         }
     }
 
+    public void testLocalObjectRelationship() throws Exception {
+        deleteTestData();
+
+        DataContext context = createDataContext();
+        DataContext childContext = context.createChildDataContext();
+
+        Artist _new = (Artist) 
context.createAndRegisterNewObject(Artist.class);
+        Painting _newP = (Painting) 
context.createAndRegisterNewObject(Painting.class);
+        _new.addToPaintingArray(_newP);
+
+        blockQueries();
+
+        try {
+
+            Painting painting = (Painting) 
childContext.localObject(_newP.getObjectId(), _newP);
+            assertEquals(PersistenceState.COMMITTED, 
painting.getPersistenceState());
+            assertNotNull(painting.getToArtist());
+            assertEquals(PersistenceState.COMMITTED, 
painting.getToArtist().getPersistenceState());
+        }
+        finally {
+            unblockQueries();
+        }
+    }
+
     public void testSelect() throws Exception {
         deleteTestData();
         createTestData("testArtists");