* EOAccess/EORelationship.m ([-setEntity:]): Modify remove

relatioship from previous entity and add recursion detection.
	Add documention.
	* EOAccess/EOEntity.m ([-removeRelationship:]): Move call
	to [EORelationship-setEntity:] to allow recursion detection.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@26222 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,11 @@
+2008-03-06  David Ayers  <ayers@fsfe.org>
+
+	* EOAccess/EORelationship.m ([-setEntity:]): Modify remove
+	relatioship from previous entity and add recursion detection.
+	Add documention.
+	* EOAccess/EOEntity.m ([-removeRelationship:]): Move call
+	to [EORelationship-setEntity:] to allow recursion detection.
+	
 2008-03-05  David Ayers  <ayers@fsfe.org>
 
 	* EOControl/EOKeyGlobalID.m ([+assignGloballyUniqueBytes:]):

EOAccess/EOEntity.m

@@ -1908,13 +1908,9 @@ createInstanceWithEditingContext:globalID:zone:
  */
 - (void)removeRelationship: (EORelationship *)relationship
 {
-  NSEmitTODO();  //TODO
-
-  //TODO
   if (relationship)
     {
       [self willChange]; 
-      [relationship setEntity:nil];
 
       if(_relationshipsByName != nil)
 	[_relationshipsByName removeObjectForKey:[relationship name]];
@@ -1940,6 +1936,10 @@ createInstanceWithEditingContext:globalID:zone:
 		  		initWithArray:AUTORELEASE(_classProperties)
 		  		    copyItems:NO];
         }
+      /* We call this after adjusting the arrays so that setEntity: has
+	 the opportunity to check the relationships before calling
+	 removeRelationshipt which would lead to an infinite loop.  */
+      [relationship setEntity:nil];
       [self _setIsEdited];//To clean caches
     }
 }

EOAccess/EORelationship.m

@@ -1302,6 +1302,15 @@ relationships. Nil if none" **/
   EOFLOGObjectFnStop();
 }
 
+/**
+ * <p>Sets the entity of the reciever.</p>
+ * <p>If the receiver already has an entity assigned to it the old relationship
+ * will will be removed first.</p>
+ * <p>This method is used by [EOEntity-addRelationship:] and
+ * [EOEntity-removeRelationship:] which should be used for general relationship
+ * manipulations.  This method should only be useful
+ * when creating flattend relationships programmatically.</p>
+ */
 - (void)setEntity: (EOEntity *)entity
 {
   //OK
@@ -1309,13 +1318,26 @@ relationships. Nil if none" **/
     {
       [self _flushCache];
       [self willChange];
-      /* FIXME docs say we should... but currently -removeRelationship 
+
-       * calls us, so it would cause an infinite loop */
+      if (_entity)
-      // [_entity removeRelationship:self];
+	{
-      [_entity _setIsEdited];
+	  NSString *relationshipName;
-      [entity _setIsEdited];
+	  EORelationship *relationship;
+
+	  /* Check if we are still in the entities arrays to
+	     avoid recursive loop when removeRelationship:
+	     calls this method.  */
+	  relationshipName = [self name];
+	  relationship = [_entity relationshipNamed: relationshipName];
+          if (self == relationship)
+	    {
+	      [_entity removeRelationship: self];
+	    }
+	}
       _entity = entity;
     }
+  /* This method is used by EOEntity's remove/addRelatinship: and is not
+     responsible for calling _setIsEdited on the entity.  */
 }
 
 - (void)setUserInfo: (NSDictionary *)dictionary