gnustep/libs-gdl2
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gdl2.git synced 2025-04-22 12:55:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* EOAccess/EODatabaseContext.m

Browse source 
valuesForKeys: -> dictionaryWithValuesForKeys:
(The old valuesForKeys: causes a log message on OSX)
some reformats and DebugLog removals



git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@30924 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
dwetzel 2010-07-05 08:17:00 +00:00
parent d164ae0490
commit 87005f5ae5
2 changed files with 25 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2010-07-05 David Wetzel <dave@turbocat.de>
* EOAccess/EODatabaseContext.m
valuesForKeys: -> dictionaryWithValuesForKeys:
(The old valuesForKeys: causes a log message on OSX)
some reformats and DebugLog removals
2010-07-04 David Wetzel <dave@turbocat.de>
* EOAccess/EOModel.m
-writeToFile:

73
EOAccess/EODatabaseContext.m
View file

@ -2840,16 +2840,11 @@ Raises an exception is the adaptor is unable to perform the operations.
newRow = [dbOpe newRow];
values = [newRow valuesForKeys: dbSnapshotKeys];
NSDebugMLLog(@"EODatabaseContext",
@"RECORDSNAPSHOT values=%@", values);
values = [newRow dictionaryWithValuesForKeys: dbSnapshotKeys];
//if update: forgetSnapshotForGlobalID:
[self recordSnapshot: values
forGlobalID: gid];
NSDebugMLLog(@"EODatabaseContext",
@"self=%p _uniqueStack %p=%@",
self, _uniqueStack, _uniqueStack);
if (databaseOperator == EODatabaseUpdateOperator) //OK for update //Do it forInsert too //TODO
{
@ -2934,7 +2929,7 @@ Raises an exception is the adaptor is unable to perform the operations.
{
case EODatabaseInsertOperator:
newRowValues = [newRow valuesForKeys:[entity classPropertyAttributeNames]];
newRowValues = [newRow dictionaryWithValuesForKeys:[entity classPropertyAttributeNames]];
break;
case EODatabaseUpdateOperator:
@ -3059,49 +3054,27 @@ Raises an exception is the adaptor is unable to perform the operations.
- (NSDictionary *)valuesForKeys: (NSArray *)keys
object: (id)object
{
//OK
EOEntity *entity;
EODatabaseOperation *dbOpe;
NSDictionary *newRow;
NSDictionary *values = nil;
NSDebugMLLog(@"EODatabaseContext", @"object=%p (class=%@)",
object, [object class]);
//NSAssert(object, @"No object");
if (!_isNilOrEONull(object))
{
entity = [_database entityForObject: object];
NSAssert1(entity, @"No entity for object %@", object);
dbOpe = [self databaseOperationForObject: object];
newRow = [dbOpe newRow];
values = [newRow valuesForKeys: keys];
}
{
entity = [_database entityForObject: object];
NSAssert1(entity, @"No entity for object %@", object);
dbOpe = [self databaseOperationForObject: object];
newRow = [dbOpe newRow];
values = [newRow dictionaryWithValuesForKeys: keys];
}
else
{
values = [NSDictionary dictionary];
}
//
{
values = [NSDictionary dictionary];
}
return values;
}
@ -3415,7 +3388,7 @@ Raises an exception is the adaptor is unable to perform the operations.
IMP srcObjectAIndexIMP=[sourceKeys methodForSelector: @selector(objectAtIndex:)];
IMP dstObjectAIndexIMP=[destinationKeys methodForSelector: @selector(objectAtIndex:)];
relayedValues = AUTORELEASE([[sourceNewRow valuesForKeys: sourceKeys]
relayedValues = AUTORELEASE([[sourceNewRow dictionaryWithValuesForKeys: sourceKeys]
mutableCopy]);// {code = 0; }
NSDebugMLLog(@"EODatabaseContext", @"relayedValues=%@",
relayedValues);
@ -3456,17 +3429,9 @@ Raises an exception is the adaptor is unable to perform the operations.
IMP srcObjectAIndexIMP=[sourceKeys methodForSelector: @selector(objectAtIndex:)];
IMP dstObjectAIndexIMP=[destinationKeys methodForSelector: @selector(objectAtIndex:)];
NSDebugMLLog(@"EODatabaseContext",
@"Call valuesForKeys destinationObject (%p-<%@>)",
destinationObject, [destinationObject class]);
NSDebugMLLog(@"EODatabaseContext", @"destinationKeys=%@",
destinationKeys);
//Now take destinationKeys values
destinationValues = [self valuesForKeys: destinationKeys
object: destinationObject];
object: destinationObject];
NSDebugMLLog(@"EODatabaseContext", @"destinationValues=%@",
destinationValues);