From c8f5362d9f6daf34a0afba09317f2c534cf72617 Mon Sep 17 00:00:00 2001 From: Mirko Viviani Date: Sun, 29 Dec 2002 15:13:21 +0000 Subject: [PATCH] * EOAccess/EODatabaseContext.m ([EODatabaseContext -initializeObject: row:entity:editingContext:]): set nil instead of EONull * EOControl/EONull.m: included config.h git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@15370 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 7 +++++++ EOAccess/EODatabaseContext.m | 7 ++++++- EOControl/EONull.m | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index dddec78..6d871cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2002-12-29 Mirko Viviani + + * EOAccess/EODatabaseContext.m ([EODatabaseContext -initializeObject: + row:entity:editingContext:]): set nil instead of EONull + + * EOControl/EONull.m: included config.h + 2002-12-17 Mirko Viviani * EOAccess/EOEntity.m ([EOEntityClassDescription diff --git a/EOAccess/EODatabaseContext.m b/EOAccess/EODatabaseContext.m index 9bf7740..6fe7f05 100644 --- a/EOAccess/EODatabaseContext.m +++ b/EOAccess/EODatabaseContext.m @@ -6008,6 +6008,7 @@ Raises an exception is the adaptor is unable to perform the operations. //really near ok NSArray *relationships = nil; NSArray *classPropertyAttributeNames = nil; + EONull *null = [EONull null]; int i, count = 0; EOFLOGObjectFnStart(); @@ -6026,7 +6027,11 @@ Raises an exception is the adaptor is unable to perform the operations. id value = nil; EOFLOGObjectLevelArgs(@"EODatabaseContext", @"key=%@", key); - value = [row objectForKey: key]; + value = [row objectForKey: key]; + + if (value == null) + value = nil; + EOFLOGObjectLevelArgs(@"EODatabaseContext", @"value=%@", value); [object takeStoredValue: value diff --git a/EOControl/EONull.m b/EOControl/EONull.m index e0d856a..fdadb00 100644 --- a/EOControl/EONull.m +++ b/EOControl/EONull.m @@ -40,6 +40,7 @@ static char rcsId[] = "$Id$"; #import #import #import +#include "config.h" @implementation EONull