* EOAccess/EORelationship.m

(-[setDefinition:]): Allow definition to unset.
        (-[setEntity:]): Mark both old and new entity as edited.

        * EOAccess/EOStoredProcedure.m
        (-[initWithPropertyList:]): Make return type explicit.


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

ChangeLog

@@ -3,17 +3,24 @@
 	* EOAccess/EOAttribute.h
 	* EOAccess/EOAttribute.m (_parent, -[setParent:]): Do not retain
 	backward reference.
-	(-[setName:): Mark as editited if parent is an entity.
+	(-[setName:]): Mark as editited if parent is an entity.
 
 	* EOAccess/EOModel.m (-[_updateCache]): New method.
 	* EOAccess/EOEntity.m
 	(-[EOModel _updateCache]): Declare private EOModel method.
 	(-[setName:]): Insure model updates its cache.
-	(-[setModel]): Set instance variable directly without 
+	(-[setModel:]): Set instance variable directly without 
 	retaining it.
-	(-[_setModel]): Remove.
+	(-[_setModel:]): Remove.
 	(-[gcDecrementRefCountOfContainedObjects]): Do not decrement
 	backward reference to owning model.
+
+	* EOAccess/EORelationship.m
+	(-[setDefinition:]): Allow definition to unset.
+	(-[setEntity:]): Mark both old and new entity as edited.
+
+	* EOAccess/EOStoredProcedure.m
+	(-[initWithPropertyList:]): Make return type explicit.
 	
 2004-06-23  David Ayers  <d.ayers@inode.at>
 

EOAccess/EORelationship.m

@@ -1295,11 +1295,11 @@ relationships. Nil if none" **/
 
   EOFLOGObjectLevelArgs(@"EORelationship", @"definition=%@", definition);
 
+  [self _flushCache];
+  [self willChange];
+
   if (definition)
     {
-      [self _flushCache];
-      [self willChange];
-
       _flags.isToMany = NO;
 
       ASSIGN(_definitionArray, [_entity _parseRelationshipPath: definition]);
@@ -1331,8 +1331,13 @@ relationships. Nil if none" **/
         }
       }
 
-      [_entity _setIsEdited];
     }
+  else /* definition == nil */
+    {
+      DESTROY(_definitionArray);
+    }
+  /* Ayers: Not sure what justifies this. */
+  [_entity _setIsEdited];
 
   EOFLOGObjectFnStop();
 }
@@ -1344,6 +1349,8 @@ relationships. Nil if none" **/
     {
       [self _flushCache];
       [self willChange];
+      [_entity _setIsEdited];
+      [entity _setIsEdited];
       ASSIGN(_entity, entity);
     }
 }
@@ -1353,6 +1360,7 @@ relationships. Nil if none" **/
   //OK
   [self willChange];
   ASSIGN(_userInfo, dictionary);
+  /* Ayers: Not sure what justifies this. */
   [_entity _setIsEdited];
 }
 
@@ -1361,6 +1369,7 @@ relationships. Nil if none" **/
   //OK
   [self willChange];
   ASSIGN(_internalInfo, dictionary);
+  /* Ayers: Not sure what justifies this. */
   [_entity _setIsEdited];
 }
 
@@ -1369,6 +1378,7 @@ relationships. Nil if none" **/
   //OK
   [self willChange];
   ASSIGN(_docComment, docComment);
+  /* Ayers: Not sure what justifies this. */
   [_entity _setIsEdited];
 }
 
@@ -1550,7 +1560,8 @@ relationships. Nil if none" **/
                 EOFLOGObjectLevel(@"EORelationship", @"added");
 
                 [self _joinsChanged];
-                [_entity _setIsEdited];
+		/* Ayers: Not sure what justifies this. */
+		[_entity _setIsEdited];
             }
         }
     }
@@ -1613,6 +1624,7 @@ relationships. Nil if none" **/
         }
 
       [self _joinsChanged];
+      /* Ayers: Not sure what justifies this. */
       [_entity _setIsEdited];
     }
 

EOAccess/EOStoredProcedure.m

@@ -102,7 +102,7 @@ RCS_ID("$Id$")
 			owner: owner] autorelease];
 }
 
-- initWithPropertyList: (NSDictionary *)propertyList owner: (id)owner
+- (id)initWithPropertyList: (NSDictionary *)propertyList owner: (id)owner
 {
   NSArray *array;
   NSEnumerator *enumerator;