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

* EOAccess/EOAdaptor.m ([EOAdaptor -isValidQualifierType:model:]):

Browse source 
implemented.

* EOControl/GNUmakefile (libgnustep-db2control_HEADER_FILES): removed
GCObject.h

* EOAccess/EODatabaseContext.m:
* EOAccess/EORelationship.m:
* EOAccess/EOEntity.m:
* EOControl/EOMutableKnownKeyDictionary.m:
* EOControl/EOEditingContext.m: replaced EOFLOGObjectLevelArgs with
EOFLOGObjectLevel in absence of args. (fixed problems with gcc 2.95)


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@15266 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Mirko Viviani 2002-12-08 10:07:26 +00:00
parent 1e33b5cb1d
commit ddeded95c1
11 changed files with 190 additions and 152 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
ChangeLog
View file

@ -1,7 +1,22 @@
2002-12-08 Mirko Viviani <mirko.viviani@rccr.cremona.it>
* EOAccess/EOAdaptor.m ([EOAdaptor -isValidQualifierType:model:]):
implemented.
* EOControl/GNUmakefile (libgnustep-db2control_HEADER_FILES): removed
GCObject.h
* EOAccess/EODatabaseContext.m:
* EOAccess/EORelationship.m:
* EOAccess/EOEntity.m:
* EOControl/EOMutableKnownKeyDictionary.m:
* EOControl/EOEditingContext.m: replaced EOFLOGObjectLevelArgs with
EOFLOGObjectLevel in absence of args. (fixed problems with gcc 2.95)
2002-12-07 Mirko Viviani <mirko.viviani@rccr.cremona.it>
* EOAccess/EOEntity.m ([EOEntity -isPrimaryKeyValidInObject:]): check for NSNull
objects.
* EOAccess/EOEntity.m ([EOEntity -isPrimaryKeyValidInObject:]): check
for NSNull objects.
2002-12-06 Mirko Viviani <mirko.viviani@rccr.cremona.it>

3
EOAccess/EOAdaptor.h
View file

@ -119,6 +119,9 @@ extern NSString *EOGeneralAdaptorException;
- (id)delegate;
- (void)setDelegate: delegate;
- (BOOL) isValidQualifierType: (EOAttribute *)attribute
model: (EOModel *)model;
@end /* EOAdaptor */

7
EOAccess/EOAdaptor.m
View file

@ -623,6 +623,13 @@ NSString *EOGeneralAdaptorException = @"EOGeneralAdaptorException";
[self notImplemented: _cmd];
}
- (BOOL) isValidQualifierType: (EOAttribute *)attribute
model: (EOModel *)model
{
[self subclassResponsibility: _cmd];
return NO;
}
@end /* EOAdaptor */

119
EOAccess/EODatabaseContext.m
View file

@ -752,7 +752,7 @@ classPropertyNames = [entity classPropertyNames];
editingContext: context
isComplete: isFinal];//??
EOFLOGObjectLevelArgs(@"EODatabaseContext", @"Record Object");
EOFLOGObjectLevel(@"EODatabaseContext", @"Record Object");
[context recordObject: object
globalID: globalID];
@ -1360,8 +1360,8 @@ userInfo = {
{
[_adaptorContext beginTransaction];
EOFLOGObjectLevelArgs(@"EODatabaseContext",
@"BEGAN TRANSACTION FLAG==>YES");
EOFLOGObjectLevel(@"EODatabaseContext",
@"BEGAN TRANSACTION FLAG==>YES");
_flags.beganTransaction = YES;
}
@ -1389,10 +1389,10 @@ userInfo = {
[cache addObject: gid];
}
EOFLOGObjectLevelArgs(@"EODatabaseContext", @"Finished fetch");
EOFLOGObjectLevel(@"EODatabaseContext", @"Finished fetch");
[channel cancelFetch];
EOFLOGObjectLevelArgs(@"EODatabaseContext", @"setResultCache");
EOFLOGObjectLevel(@"EODatabaseContext", @"setResultCache");
[_database setResultCache: cache
forEntityNamed: entityName];
}
@ -1511,8 +1511,8 @@ userInfo = {
{
[_adaptorContext beginTransaction];
EOFLOGObjectLevelArgs(@"EODatabaseContext",
@"BEGAN TRANSACTION FLAG==>YES");
EOFLOGObjectLevel(@"EODatabaseContext",
@"BEGAN TRANSACTION FLAG==>YES");
_flags.beganTransaction = YES;
}
@ -1527,13 +1527,14 @@ userInfo = {
[channel selectObjectsWithFetchSpecification: fetch
editingContext: context];//OK
EOFLOGObjectLevelArgs(@"EODatabaseContext", @"[channel isFetchInProgress]=%s",
EOFLOGObjectLevelArgs(@"EODatabaseContext",
@"[channel isFetchInProgress]=%s",
([channel isFetchInProgress] ? "YES" : "NO"));
limit = [fetch fetchLimit];//OK
promptsAfterFetchLimit = [fetch promptsAfterFetchLimit];
EOFLOGObjectLevelArgs(@"EODatabaseContext", @"Will Fetch");
EOFLOGObjectLevel(@"EODatabaseContext", @"Will Fetch");
NS_DURING
{
@ -1544,8 +1545,8 @@ userInfo = {
while ((obj = [channel fetchObject]))
{
EOFLOGObjectLevelArgs(@"EODatabaseContext",
@"fetched an object");
EOFLOGObjectLevel(@"EODatabaseContext",
@"fetched an object");
EOFLOGObjectLevelArgs(@"EODatabaseContext",
@"FETCH OBJECT object=%@\n\n",
obj);
@ -1572,8 +1573,8 @@ userInfo = {
continue;
}
EOFLOGObjectLevelArgs(@"EODatabaseContext",
@"AFTER FETCH");
EOFLOGObjectLevel(@"EODatabaseContext",
@"AFTER FETCH");
[array addObject: obj];
EOFLOGObjectLevelArgs(@"EODatabaseContext",
@"array count=%d",
@ -1601,25 +1602,27 @@ userInfo = {
else
autoreleaseStep--;
EOFLOGObjectLevelArgs(@"EODatabaseContext",
@"WILL FETCH NEXT OBJECT");
EOFLOGObjectLevel(@"EODatabaseContext",
@"WILL FETCH NEXT OBJECT");
EOFLOGObjectLevelArgs(@"EODatabaseContext",
@"[channel isFetchInProgress]=%s",
([channel isFetchInProgress] ? "YES" : "NO"));
}
EOFLOGObjectLevelArgs(@"EODatabaseContext",
@"finished fetch");
EOFLOGObjectLevel(@"EODatabaseContext",
@"finished fetch");
EOFLOGObjectLevelArgs(@"EODatabaseContext",
@"array=%@", array);
EOFLOGObjectLevelArgs(@"EODatabaseContext",@"step 0 channel is busy=%d",
EOFLOGObjectLevelArgs(@"EODatabaseContext",
@"step 0 channel is busy=%d",
(int)[channel isFetchInProgress]);
[channel cancelFetch]; //OK
EOFLOGObjectLevelArgs(@"EODatabaseContext",@"step 1 channel is busy=%d",
EOFLOGObjectLevelArgs(@"EODatabaseContext",
@"step 1 channel is busy=%d",
(int)[channel isFetchInProgress]);
EOFLOGObjectLevelArgs(@"EODatabaseContext",@"array=%@",
EOFLOGObjectLevelArgs(@"EODatabaseContext", @"array=%@",
array);
//TODO
@ -1652,7 +1655,8 @@ userInfo = {
NS_ENDHANDLER;
}
}
EOFLOGObjectLevelArgs(@"EODatabaseContext",@"step 2 channel is busy=%d",
EOFLOGObjectLevelArgs(@"EODatabaseContext",
@"step 2 channel is busy=%d",
(int)[channel isFetchInProgress]);
}
@ -1796,8 +1800,8 @@ userInfo = {
{
[[[channel adaptorChannel] adaptorContext] beginTransaction];
EOFLOGObjectLevelArgs(@"EODatabaseContext",
@"BEGAN TRANSACTION FLAG==>YES");
EOFLOGObjectLevel(@"EODatabaseContext",
@"BEGAN TRANSACTION FLAG==>YES");
_flags.beganTransaction = YES;
}
@ -2902,8 +2906,8 @@ Raises an exception is the adaptor is unable to perform the operations.
if ([_adaptorContext transactionNestingLevel] == 0) //??
[_adaptorContext beginTransaction];
EOFLOGObjectLevelArgs(@"EODatabaseContext",
@"BEGAN TRANSACTION FLAG==>YES");
EOFLOGObjectLevel(@"EODatabaseContext",
@"BEGAN TRANSACTION FLAG==>YES");
_flags.beganTransaction = YES;
}
@ -2917,8 +2921,8 @@ Raises an exception is the adaptor is unable to perform the operations.
adaptorChannel: adaptorChannel];
NS_DURING
{
EOFLOGObjectLevelArgs(@"EODatabaseContext",
@"performAdaptorOperations:");
EOFLOGObjectLevel(@"EODatabaseContext",
@"performAdaptorOperations:");
EOFLOGObjectLevelArgs(@"EODatabaseContext",
@"self=%p preparingForSave=%d beganTransaction=%d",
self,
@ -2932,8 +2936,8 @@ Raises an exception is the adaptor is unable to perform the operations.
self,
(int)_flags.preparingForSave,
(int)_flags.beganTransaction);
EOFLOGObjectLevelArgs(@"EODatabaseContext",
@"after performAdaptorOperations:");
EOFLOGObjectLevel(@"EODatabaseContext",
@"after performAdaptorOperations:");
}
NS_HANDLER
{
@ -3099,8 +3103,8 @@ Raises an exception is the adaptor is unable to perform the operations.
EOGlobalID *gid = nil;
EODatabaseOperation *dbOpe = nil;
EOFLOGObjectLevelArgs(@"EODatabaseContext",
@"BEGAN TRANSACTION FLAG==>NO");
EOFLOGObjectLevel(@"EODatabaseContext",
@"BEGAN TRANSACTION FLAG==>NO");
_flags.beganTransaction = NO;
[_adaptorContext commitTransaction]; //adaptorcontext transactionDidCommit
@ -3227,7 +3231,7 @@ Raises an exception is the adaptor is unable to perform the operations.
}
}
EOFLOGObjectLevelArgs(@"EODatabaseContext", @"call _cleanUpAfterSave");
EOFLOGObjectLevel(@"EODatabaseContext", @"call _cleanUpAfterSave");
[self _cleanUpAfterSave];//OK for update
@ -3236,8 +3240,8 @@ Raises an exception is the adaptor is unable to perform the operations.
//from mirko. seems ok
if (gidChangedUserInfo)
{
EOFLOGObjectLevelArgs(@"EODatabaseContext",
@"post EOGlobalIDChangedNotification");
EOFLOGObjectLevel(@"EODatabaseContext",
@"post EOGlobalIDChangedNotification");
[[NSNotificationCenter defaultCenter]
postNotificationName: EOGlobalIDChangedNotification
@ -3245,8 +3249,8 @@ Raises an exception is the adaptor is unable to perform the operations.
userInfo: gidChangedUserInfo];
}
EOFLOGObjectLevelArgs(@"EODatabaseContext",
@"post EOObjectsChangedInStoreNotification");
EOFLOGObjectLevel(@"EODatabaseContext",
@"post EOObjectsChangedInStoreNotification");
[[NSNotificationCenter defaultCenter]
postNotificationName: @"EOObjectsChangedInStoreNotification"
@ -3271,8 +3275,8 @@ Raises an exception is the adaptor is unable to perform the operations.
{
[_adaptorContext rollbackTransaction];
EOFLOGObjectLevelArgs(@"EODatabaseContext",
@"BEGAN TRANSACTION FLAG==>NO");
EOFLOGObjectLevel(@"EODatabaseContext",
@"BEGAN TRANSACTION FLAG==>NO");
_flags.beganTransaction = NO;
@ -3302,7 +3306,7 @@ Raises an exception is the adaptor is unable to perform the operations.
EOFLOGObjectFnStart();
EOFLOGObjectLevelArgs(@"EODatabaseContext",@"object=%p keys=%@",
object,keys);
object, keys);
EOFLOGObjectLevelArgs(@"EODatabaseContext", @"object=%p (class=%@)",
object, [object class]);
@ -3330,7 +3334,7 @@ Raises an exception is the adaptor is unable to perform the operations.
}
else
{
EOFLOGObjectLevelArgs(@"EODatabaseContext", @"No object");
EOFLOGObjectLevel(@"EODatabaseContext", @"No object");
values = [NSDictionary dictionary];
}
@ -3762,8 +3766,8 @@ Raises an exception is the adaptor is unable to perform the operations.
}
else
{
EOFLOGObjectLevelArgs(@"EODatabaseContext",
@"No _dbOperationsByGlobalID");
EOFLOGObjectLevel(@"EODatabaseContext",
@"No _dbOperationsByGlobalID");
}
EOFLOGObjectFnStop();
@ -3801,7 +3805,7 @@ Raises an exception is the adaptor is unable to perform the operations.
}
- (EODatabaseOperation*)databaseOperationForObject: (id)object
{
{
//OK
EODatabaseOperation *databaseOpe = nil;
EOGlobalID *gid = nil;
@ -3903,7 +3907,12 @@ Raises an exception is the adaptor is unable to perform the operations.
key, value);
if (!value)
value = [EONull null];
{
value = [EONull null];
[[[entity attributeNamed: key] validateValue: &value]
raise];
}
EOFLOGObjectLevelArgs(@"EODatabaseContext", @"key=%@ value=%@",
key, value);
@ -3932,10 +3941,11 @@ Raises an exception is the adaptor is unable to perform the operations.
EOFLOGObjectLevelArgs(@"EODatabaseContext", @"key=%@ value=%@",
key, value);
NSAssert1(value,@"No value for %@",key);
// NSAssert1(value,@"No value for %@",key);
[newRow setObject: value
forKey: key];
if (value)
[newRow setObject: value
forKey: key];
}
EOFLOGObjectLevelArgs(@"EODatabaseContext", @"newRow=%@", newRow);
@ -4908,6 +4918,9 @@ Raises an exception is the adaptor is unable to perform the operations.
{
if (![self isValidQualifierTypeForAttribute: attribute])
{
NSLog(@"Invalid externalType for attribute '%@' of entity named '%@' - model '%@'",
[attribute name], [[attribute entity] name],
[[[attribute entity] model] name]);
NSEmitTODO();
[self notImplemented: _cmd]; //TODO
}
@ -4928,7 +4941,7 @@ Raises an exception is the adaptor is unable to perform the operations.
if (!value)
{
EOFLOGObjectLevelArgs(@"EODatabaseContext", @"NO VALUE");
EOFLOGObjectLevel(@"EODatabaseContext", @"NO VALUE");
}
NSAssert3(value, @"no value for %@ in %p %@", snapName,
@ -5201,7 +5214,7 @@ Raises an exception is the adaptor is unable to perform the operations.
}
}
}
EOFLOGObjectLevelArgs(@"EODatabaseContext",@"** 3");
EOFLOGObjectLevel(@"EODatabaseContext",@"** 3");
//==> see _registerSnapshot:forSourceGlobalID:relationshipName:editingContext:
for (i = 0; i < count; i++)
@ -5210,7 +5223,7 @@ Raises an exception is the adaptor is unable to perform the operations.
[editingContext globalIDForObject: [objects objectAtIndex: i]]
relationshipName: [relationship name]];
EOFLOGObjectLevelArgs(@"EODatabaseContext", @"** 4");
EOFLOGObjectLevel(@"EODatabaseContext", @"** 4");
}
@end
@ -6128,7 +6141,7 @@ Raises an exception is the adaptor is unable to perform the operations.
}
}
EOFLOGObjectLevelArgs(@"EODatabaseContext", @"TakeStoredValue");
EOFLOGObjectLevel(@"EODatabaseContext", @"TakeStoredValue");
[object takeStoredValue: relObject
forKey: relName];
@ -6460,8 +6473,8 @@ _numLocked = 0;
if (_flags.beganTransaction == NO)
{
EOFLOGObjectLevelArgs(@"EODatabaseContext",
@"BEGAN TRANSACTION FLAG==>NO");
EOFLOGObjectLevel(@"EODatabaseContext",
@"BEGAN TRANSACTION FLAG==>NO");
_flags.beganTransaction = YES;
}
}

102
EOAccess/EOEntity.m
View file

@ -532,13 +532,13 @@ NSString *EONextPrimaryKeyProcedureOperation = @"EONextPrimaryKeyProcedureOperat
[_model gcDecrementRefCount];
where = 2;
EOFLOGObjectLevelArgs(@"EOEntity", @"attributes gcDecrementRefCount");
EOFLOGObjectLevel(@"EOEntity", @"attributes gcDecrementRefCount");
if (!_flags.attributesIsLazy)
[(id)_attributes gcDecrementRefCount];
where = 3;
EOFLOGObjectLevelArgs(@"EOEntity",
@"propertiesToFault gcDecrementRefCount");
EOFLOGObjectLevel(@"EOEntity",
@"propertiesToFault gcDecrementRefCount");
[(id)_attributesByName gcDecrementRefCount];
where = 4;
@ -568,30 +568,30 @@ NSString *EONextPrimaryKeyProcedureOperation = @"EONextPrimaryKeyProcedureOperat
[(id)_attributesToSave gcDecrementRefCount];
where = 6;
EOFLOGObjectLevelArgs(@"EOEntity",
@"propertiesToFault gcDecrementRefCount");
EOFLOGObjectLevel(@"EOEntity",
@"propertiesToFault gcDecrementRefCount");
[(id)_propertiesToFault gcDecrementRefCount];
where = 7;
EOFLOGObjectLevelArgs(@"EOEntity",
@"rrelationships gcDecrementRefCount");
EOFLOGObjectLevel(@"EOEntity",
@"rrelationships gcDecrementRefCount");
if (!_flags.relationshipsIsLazy)
[(id)_relationships gcDecrementRefCount];
where = 8;
EOFLOGObjectLevelArgs(@"EOEntity",
@"relationshipsByName gcDecrementRefCount");
EOFLOGObjectLevel(@"EOEntity",
@"relationshipsByName gcDecrementRefCount");
[(id)_relationshipsByName gcDecrementRefCount];
where = 9;
EOFLOGObjectLevelArgs(@"EOEntity",
@"primaryKeyAttributes gcDecrementRefCount");
EOFLOGObjectLevel(@"EOEntity",
@"primaryKeyAttributes gcDecrementRefCount");
if (!_flags.primaryKeyAttributesIsLazy)
[(id)_primaryKeyAttributes gcDecrementRefCount];
where = 10;
EOFLOGObjectLevelArgs(@"EOEntity",
@"classProperties gcDecrementRefCount");
EOFLOGObjectLevel(@"EOEntity",
@"classProperties gcDecrementRefCount");
if (!_flags.classPropertiesIsLazy)
[(id)_classProperties gcDecrementRefCount];
@ -603,15 +603,15 @@ NSString *EONextPrimaryKeyProcedureOperation = @"EONextPrimaryKeyProcedureOperat
[(id)_attributesUsedForLocking gcDecrementRefCount];
where = 12;
EOFLOGObjectLevelArgs(@"EOEntity", @"subEntities gcDecrementRefCount");
EOFLOGObjectLevel(@"EOEntity", @"subEntities gcDecrementRefCount");
[(id)_subEntities gcDecrementRefCount];
where = 13;
EOFLOGObjectLevelArgs(@"EOEntity", @"dbSnapshotKeys gcDecrementRefCount");
EOFLOGObjectLevel(@"EOEntity", @"dbSnapshotKeys gcDecrementRefCount");
[(id)_dbSnapshotKeys gcDecrementRefCount];
where = 14;
EOFLOGObjectLevelArgs(@"EOEntity", @"_parent gcDecrementRefCount");
EOFLOGObjectLevel(@"EOEntity", @"_parent gcDecrementRefCount");
[_parent gcDecrementRefCount];
}
NS_HANDLER
@ -650,22 +650,22 @@ NSString *EONextPrimaryKeyProcedureOperation = @"EONextPrimaryKeyProcedureOperat
NS_DURING
{
where = 1;
EOFLOGObjectLevelArgs(@"EOEntity", @"model gcIncrementRefCount");
EOFLOGObjectLevel(@"EOEntity", @"model gcIncrementRefCount");
[_model gcIncrementRefCount];
where = 2;
EOFLOGObjectLevelArgs(@"EOEntity", @"attributes gcIncrementRefCount");
EOFLOGObjectLevel(@"EOEntity", @"attributes gcIncrementRefCount");
if (!_flags.attributesIsLazy)
[(id)_attributes gcIncrementRefCount];
where = 3;
EOFLOGObjectLevelArgs(@"EOEntity",
@"attributesByName gcIncrementRefCount");
EOFLOGObjectLevel(@"EOEntity",
@"attributesByName gcIncrementRefCount");
[(id)_attributesByName gcIncrementRefCount];
where = 4;
EOFLOGObjectLevelArgs(@"EOEntity",
@"attributesToFetch gcIncrementRefCount");
EOFLOGObjectLevel(@"EOEntity",
@"attributesToFetch gcIncrementRefCount");
NSAssert3(!_attributesToFetch
|| [_attributesToFetch isKindOfClass: [NSArray class]],
@"entity %@ attributesToFetch is not an NSArray but a %@\n%@",
@ -683,69 +683,69 @@ NSString *EONextPrimaryKeyProcedureOperation = @"EONextPrimaryKeyProcedureOperat
_attributesToFetch);
where = 5;
EOFLOGObjectLevelArgs(@"EOEntity",
@"attributesToSave gcIncrementRefCount");
EOFLOGObjectLevel(@"EOEntity",
@"attributesToSave gcIncrementRefCount");
[(id)_attributesToSave gcIncrementRefCount];
where = 6;
EOFLOGObjectLevelArgs(@"EOEntity",
@"propertiesToFault gcIncrementRefCount");
EOFLOGObjectLevel(@"EOEntity",
@"propertiesToFault gcIncrementRefCount");
[(id)_propertiesToFault gcIncrementRefCount];
where = 7;
EOFLOGObjectLevelArgs(@"EOEntity", @"relationships gcIncrementRefCount");
EOFLOGObjectLevel(@"EOEntity", @"relationships gcIncrementRefCount");
if (!_flags.relationshipsIsLazy)
[(id)_relationships gcIncrementRefCount];
where = 8;
EOFLOGObjectLevelArgs(@"EOEntity",
@"relationshipsByName gcIncrementRefCount");
EOFLOGObjectLevel(@"EOEntity",
@"relationshipsByName gcIncrementRefCount");
[(id)_relationshipsByName gcIncrementRefCount];
where = 9;
EOFLOGObjectLevelArgs(@"EOEntity",
@"primaryKeyAttributes gcIncrementRefCount");
EOFLOGObjectLevel(@"EOEntity",
@"primaryKeyAttributes gcIncrementRefCount");
if (!_flags.primaryKeyAttributesIsLazy)
[(id)_primaryKeyAttributes gcIncrementRefCount];
where = 10;
EOFLOGObjectLevelArgs(@"EOEntity",
@"classProperties gcIncrementRefCount");
EOFLOGObjectLevel(@"EOEntity",
@"classProperties gcIncrementRefCount");
if (!_flags.classPropertiesIsLazy)
[(id)_classProperties gcIncrementRefCount];
where = 11;
EOFLOGObjectLevelArgs(@"EOEntity",
@"attributesUsedForLocking gcIncrementRefCount");
EOFLOGObjectLevel(@"EOEntity",
@"attributesUsedForLocking gcIncrementRefCount");
if (!_flags.attributesUsedForLockingIsLazy)
[(id)_attributesUsedForLocking gcIncrementRefCount];
where = 12;
EOFLOGObjectLevelArgs(@"EOEntity", @"subEntities gcIncrementRefCount");
EOFLOGObjectLevel(@"EOEntity", @"subEntities gcIncrementRefCount");
[(id)_subEntities gcIncrementRefCount];
where = 13;
EOFLOGObjectLevelArgs(@"EOEntity", @"dbSnapshotKeys gcIncrementRefCount");
EOFLOGObjectLevel(@"EOEntity", @"dbSnapshotKeys gcIncrementRefCount");
[(id)_dbSnapshotKeys gcIncrementRefCount];
where = 14;
EOFLOGObjectLevelArgs(@"EOEntity", @"parent gcIncrementRefCount");
EOFLOGObjectLevel(@"EOEntity", @"parent gcIncrementRefCount");
[_parent gcIncrementRefCount];
where = 15;
[_model gcIncrementRefCountOfContainedObjects];
where = 16;
EOFLOGObjectLevelArgs(@"EOEntity", @"attributes gcIncrementRefCountOfContainedObjects");
EOFLOGObjectLevel(@"EOEntity", @"attributes gcIncrementRefCountOfContainedObjects");
if (!_flags.attributesIsLazy)
[(id)_attributes gcIncrementRefCountOfContainedObjects];
where = 17;
EOFLOGObjectLevelArgs(@"EOEntity", @"attributesByName gcIncrementRefCountOfContainedObjects");
EOFLOGObjectLevel(@"EOEntity", @"attributesByName gcIncrementRefCountOfContainedObjects");
[(id)_attributesByName gcIncrementRefCountOfContainedObjects];
where = 18;
EOFLOGObjectLevelArgs(@"EOEntity", @"attributesToFetch gcIncrementRefCountOfContainedObjects");
EOFLOGObjectLevel(@"EOEntity", @"attributesToFetch gcIncrementRefCountOfContainedObjects");
[(id)_attributesToFetch gcIncrementRefCountOfContainedObjects];
where = 19;
@ -754,25 +754,25 @@ NSString *EONextPrimaryKeyProcedureOperation = @"EONextPrimaryKeyProcedureOperat
[(id)_attributesToSave gcIncrementRefCountOfContainedObjects];
where = 20;
EOFLOGObjectLevelArgs(@"EOEntity", @"propertiesToFault gcIncrementRefCountOfContainedObjects");
EOFLOGObjectLevel(@"EOEntity", @"propertiesToFault gcIncrementRefCountOfContainedObjects");
[(id)_propertiesToFault gcIncrementRefCountOfContainedObjects];
where = 21;
EOFLOGObjectLevelArgs(@"EOEntity", @"rrelationships gcIncrementRefCountOfContainedObjects");
EOFLOGObjectLevel(@"EOEntity", @"rrelationships gcIncrementRefCountOfContainedObjects");
if (!_flags.relationshipsIsLazy)
[(id)_relationships gcIncrementRefCountOfContainedObjects];
where = 22;
EOFLOGObjectLevelArgs(@"EOEntity", @"relationshipsByName gcIncrementRefCountOfContainedObjects");
EOFLOGObjectLevel(@"EOEntity", @"relationshipsByName gcIncrementRefCountOfContainedObjects");
[(id)_relationshipsByName gcIncrementRefCountOfContainedObjects];
where = 23;
EOFLOGObjectLevelArgs(@"EOEntity", @"primaryKeyAttributes gcIncrementRefCountOfContainedObjects");
EOFLOGObjectLevel(@"EOEntity", @"primaryKeyAttributes gcIncrementRefCountOfContainedObjects");
if (!_flags.primaryKeyAttributesIsLazy)
[(id)_primaryKeyAttributes gcIncrementRefCountOfContainedObjects];
where = 24;
EOFLOGObjectLevelArgs(@"EOEntity", @"classProperties gcIncrementRefCountOfContainedObjects");
EOFLOGObjectLevel(@"EOEntity", @"classProperties gcIncrementRefCountOfContainedObjects");
if (!_flags.classPropertiesIsLazy)
[(id)_classProperties gcIncrementRefCountOfContainedObjects];
@ -783,15 +783,15 @@ NSString *EONextPrimaryKeyProcedureOperation = @"EONextPrimaryKeyProcedureOperat
[(id)_attributesUsedForLocking gcIncrementRefCountOfContainedObjects];
where = 26;
EOFLOGObjectLevelArgs(@"EOEntity", @"subEntities gcIncrementRefCountOfContainedObjects");
EOFLOGObjectLevel(@"EOEntity", @"subEntities gcIncrementRefCountOfContainedObjects");
[(id)_subEntities gcIncrementRefCountOfContainedObjects];
where = 27;
EOFLOGObjectLevelArgs(@"EOEntity", @"dbSnapshotKeys gcIncrementRefCountOfContainedObjects");
EOFLOGObjectLevel(@"EOEntity", @"dbSnapshotKeys gcIncrementRefCountOfContainedObjects");
[(id)_dbSnapshotKeys gcIncrementRefCountOfContainedObjects];
where = 28;
EOFLOGObjectLevelArgs(@"EOEntity", @"_parent gcIncrementRefCountOfContainedObjects");
EOFLOGObjectLevel(@"EOEntity", @"_parent gcIncrementRefCountOfContainedObjects");
[_parent gcIncrementRefCountOfContainedObjects];
where = 29;
@ -1197,7 +1197,7 @@ NSString *EONextPrimaryKeyProcedureOperation = @"EONextPrimaryKeyProcedureOperat
forKey: relationshipName];
}
EOFLOGObjectLevelArgs(@"EOEntity", @"Rels added");
EOFLOGObjectLevel(@"EOEntity", @"Rels added");
[self _setIsEdited];//To Clean Buffers
relNames = [_relationships
@ -2667,7 +2667,7 @@ NSString *EONextPrimaryKeyProcedureOperation = @"EONextPrimaryKeyProcedureOperat
}
else
{
EOFLOGObjectLevelArgs(@"EOEntity", @"Will Rebuild attributes");
EOFLOGObjectLevel(@"EOEntity", @"Will Rebuild attributes");
[self attributes]; //To rebuild

41
EOAccess/EORelationship.m
View file

@ -98,23 +98,23 @@ static char rcsId[] = "$Id$";
EOFLOGObjectLevelArgs(@"EORelationship", @"self=%@", self);
EOFLOGObjectLevelArgs(@"EORelationship",
@"definitionArray gcDecrementRefCount");
EOFLOGObjectLevel(@"EORelationship",
@"definitionArray gcDecrementRefCount");
[(id)_definitionArray gcDecrementRefCount];
EOFLOGObjectLevelArgs(@"EORelationship",
@"_inverseRelationship gcDecrementRefCount");
EOFLOGObjectLevel(@"EORelationship",
@"_inverseRelationship gcDecrementRefCount");
[_inverseRelationship gcDecrementRefCount];
EOFLOGObjectLevelArgs(@"EORelationship",
@"_hiddenInverseRelationship gcDecrementRefCount");
EOFLOGObjectLevel(@"EORelationship",
@"_hiddenInverseRelationship gcDecrementRefCount");
[_hiddenInverseRelationship gcDecrementRefCount];
EOFLOGObjectLevelArgs(@"EORelationship", @"_entity gcDecrementRefCount");
EOFLOGObjectLevel(@"EORelationship", @"_entity gcDecrementRefCount");
[_entity gcDecrementRefCount];
EOFLOGObjectLevelArgs(@"EORelationship",
@"_destination gcDecrementRefCount");
EOFLOGObjectLevel(@"EORelationship",
@"_destination gcDecrementRefCount");
[_destination gcDecrementRefCount];
EOFLOGObjectLevelArgs(@"EORelationship",
@ -1000,7 +1000,7 @@ relationships. Nil if none" **/
EOFLOGObjectFnStart();
NSAssert([self isFlattened], @"Not Flatten Relationship");
EOFLOGObjectLevelArgs(@"EORelationship", @"add joins");
EOFLOGObjectLevel(@"EORelationship", @"add joins");
count = [_definitionArray count];
@ -1030,11 +1030,11 @@ relationships. Nil if none" **/
[inverseRelationship setName: name];
[inverseRelationship setDefinition: invDefinition];
EOFLOGObjectLevelArgs(@"EORelationship", @"add inverse rel");
EOFLOGObjectLevel(@"EORelationship", @"add inverse rel");
[(NSMutableArray*)[[self destinationEntity] _hiddenRelationships]
addObject: inverseRelationship]; //not very clean !!!
EOFLOGObjectLevelArgs(@"EORelationship", @"set inverse rel");
EOFLOGObjectLevel(@"EORelationship", @"set inverse rel");
[inverseRelationship setInverseRelationship: self];
@ -1066,7 +1066,7 @@ relationships. Nil if none" **/
joins = [self joins];
count = [joins count];
EOFLOGObjectLevelArgs(@"EORelationship", @"add joins");
EOFLOGObjectLevel(@"EORelationship", @"add joins");
for (i = 0; i < count; i++)
{
@ -1080,12 +1080,12 @@ relationships. Nil if none" **/
[inverseRelationship addJoin: inverseJoin];
}
EOFLOGObjectLevelArgs(@"EORelationship",@"add inverse rel");
EOFLOGObjectLevel(@"EORelationship",@"add inverse rel");
[(NSMutableArray*)[[self destinationEntity] _hiddenRelationships]
addObject: inverseRelationship]; //not very clean !!!
EOFLOGObjectLevelArgs(@"EORelationship", @"set inverse rel");
EOFLOGObjectLevel(@"EORelationship", @"set inverse rel");
[inverseRelationship setInverseRelationship: self];
@ -1454,9 +1454,9 @@ relationships. Nil if none" **/
[self _flushCache];
[self willChange];
EOFLOGObjectLevelArgs(@"EORelationship", @"really add");
EOFLOGObjectLevel(@"EORelationship", @"really add");
EOFLOGObjectLevelArgs(@"EORelationship", @"XXjoins %p class%@",
_joins, [_joins class]);
_joins, [_joins class]);
if ([self createsMutableObjects])
{
@ -1466,7 +1466,7 @@ relationships. Nil if none" **/
[(GCMutableArray *)_joins addObject: join];
EOFLOGObjectLevelArgs(@"EORelationship", @"XXjoins %p class%@",
_joins, [_joins class]);
_joins, [_joins class]);
//NO: will be recomputed [(GCMutableArray *)_sourceAttributes addObject:[join sourceAttribute]];
//NO: will be recomputed [(GCMutableArray *)_destinationAttributes addObject:[join destinationAttribute]];
@ -1480,7 +1480,7 @@ relationships. Nil if none" **/
_joins = [[GCArray arrayWithObject: join] retain];
EOFLOGObjectLevelArgs(@"EORelationship", @"XXjoins %p class%@",
_joins, [_joins class]);
_joins, [_joins class]);
/*NO: will be recomputed _sourceAttributes = [[[_sourceAttributes autorelease]
arrayByAddingObject:[join sourceAttribute]]
@ -1492,7 +1492,8 @@ relationships. Nil if none" **/
*/
}
EOFLOGObjectLevelArgs(@"EORelationship", @"added");
EOFLOGObjectLevel(@"EORelationship", @"added");
[self _joinsChanged];
[_entity _setIsEdited];
}

2
EOAccess/EOSQLExpression.m
View file

@ -674,7 +674,7 @@ NSString *EOBindVariableColumnKey = @"EOBindVariableColumnKey";
EOFLOGObjectLevelArgs(@"EOSQLExpression", @"_joinClauseString=%@",
_joinClauseString);
rootEntity=[self _rootEntityForExpression];
rootEntity = [self _rootEntityForExpression];
EOFLOGObjectLevelArgs(@"EOSQLExpression", @"rootEntity=%@",
[rootEntity name]);

2
EOControl/EODebug.h
View file

@ -183,7 +183,7 @@ extern void EOFLogAssertGood_(const char* file,int line,NSObject* object);
NSAutoreleasePool *tmpPool = [NSAutoreleasePool new]; \
NSString *fmt = GSDebugMethodMsg( \
self, _cmd, __FILE__, __LINE__, format); \
NSLog(fmt, ## args); [tmpPool release]; }} while (0)
NSLog(fmt, ## args); [tmpPool release]; }} while (0)
#define EOFLOGObject(format) \
do { \

36
EOControl/EOEditingContext.m
View file

@ -338,11 +338,11 @@ NSString *EOEditingContextDidSaveChangesNotification = @"EOEditingContextDidSave
RETAIN(snapshot);
[_snapshotsByGID removeObjectForKey: tempGID];
EOFLOGObjectLevelArgs(@"EOEditingContext", @"After Remove");
EOFLOGObjectLevel(@"EOEditingContext", @"After Remove");
[_snapshotsByGID setObject: snapshot
forKey: gid];
EOFLOGObjectLevelArgs(@"EOEditingContext", @"After SetObject");
EOFLOGObjectLevel(@"EOEditingContext", @"After SetObject");
AUTORELEASE(snapshot);
}
@ -715,8 +715,8 @@ NSString *EOEditingContextDidSaveChangesNotification = @"EOEditingContextDidSave
EOFLOGObjectLevelArgs(@"EOEditingContext", @"Objects: %@",
[self objectsDescription]);
//on inserted objects
EOFLOGObjectLevelArgs(@"EOEditingContext",
@"process _unprocessedInserts");
EOFLOGObjectLevel(@"EOEditingContext",
@"process _unprocessedInserts");
unprocessedInsertsArray = NSAllHashTableObjects(_unprocessedInserts);
EOFLOGObjectLevelArgs(@"EOEditingContext", @"unprocessedInsertsArray=%@",
@ -746,8 +746,8 @@ NSString *EOEditingContextDidSaveChangesNotification = @"EOEditingContextDidSave
}
//on deleted or updated
EOFLOGObjectLevelArgs(@"EOEditingContext",
@"process _unprocessedDeletes");
EOFLOGObjectLevel(@"EOEditingContext",
@"process _unprocessedDeletes");
unprocessedDeletesArray = NSAllHashTableObjects(_unprocessedDeletes);
EOFLOGObjectLevelArgs(@"EOEditingContext", @"unprocessedDeletesArray=%@",
@ -777,8 +777,8 @@ NSString *EOEditingContextDidSaveChangesNotification = @"EOEditingContextDidSave
}
//Changes
EOFLOGObjectLevelArgs(@"EOEditingContext",
@"process _unprocessedChanges");
EOFLOGObjectLevel(@"EOEditingContext",
@"process _unprocessedChanges");
unprocessedChangesArray = NSAllHashTableObjects(_unprocessedChanges);
EOFLOGObjectLevelArgs(@"EOEditingContext", @"unprocessedChangesArray=%@",
@ -1926,11 +1926,11 @@ validateTable:(NSHashTable*)table
_flags.ignoreChangeNotification = YES;
EOFLOGObjectLevelArgs(@"EOEditingContext",
@"_objectStore saveChangesInEditingContext");
EOFLOGObjectLevel(@"EOEditingContext",
@"_objectStore saveChangesInEditingContext");
[_objectStore saveChangesInEditingContext: self];
EOFLOGObjectLevelArgs(@"EOEditingContext", @"self didSaveChanges");
EOFLOGObjectLevel(@"EOEditingContext", @"self didSaveChanges");
[self didSaveChanges];
@ -2169,8 +2169,8 @@ validateTable:(NSHashTable*)table
////////
if (NSHashInsertIfAbsent(_unprocessedChanges, object)) //The object is already here
{
EOFLOGObjectLevelArgs(@"EOEditingContext",
@"_enqueueEndOfEventNotification");
EOFLOGObjectLevel(@"EOEditingContext",
@"_enqueueEndOfEventNotification");
[self _enqueueEndOfEventNotification];
/*
@ -2188,8 +2188,8 @@ validateTable:(NSHashTable*)table
//???????????
EOGlobalID *gid = [self globalIDForObject: object];
EOFLOGObjectLevelArgs(@"EOEditingContext",
@"insert into xxsnapshotsByGID");
EOFLOGObjectLevel(@"EOEditingContext",
@"insert into xxsnapshotsByGID");
[_eventSnapshotsByGID setObject: [object snapshot]
forKey: gid];
@ -2218,7 +2218,7 @@ validateTable:(NSHashTable*)table
NSAssert(object, @"No Object");
NSAssert(globalID, @"No GlobalID");
EOFLOGObjectLevelArgs(@"EOEditingContext", @"insertInto _objectsById");
EOFLOGObjectLevel(@"EOEditingContext", @"insertInto _objectsById");
NSMapInsert(_objectsById, object, globalID);
//TODO: delete
@ -2234,11 +2234,11 @@ validateTable:(NSHashTable*)table
NSAssert1(aGID2, @"Object %p recorded but can't retrieve it with globalIDForObject: !", object);
}
EOFLOGObjectLevelArgs(@"EOEditingContext", @"insertInto _objectsByGID");
EOFLOGObjectLevel(@"EOEditingContext", @"insertInto _objectsByGID");
NSMapInsert(_objectsByGID, globalID, object);
EOFLOGObjectLevelArgs(@"EOEditingContext", @"addObserver");
EOFLOGObjectLevel(@"EOEditingContext", @"addObserver");
[EOObserverCenter addObserver: self
forObject: object];

8
EOControl/EOMutableKnownKeyDictionary.m
View file

@ -577,7 +577,7 @@ static char rcsId[] = "$Id$";
newDict = [self newWithInitializer: subsetMapping->_destinationDescription
zone: zone];
EOFLOGObjectLevelArgs(@"EOMKKD", @"END");
EOFLOGObjectLevel(@"EOMKKD", @"END");
return newDict;
}
@ -656,7 +656,7 @@ static char rcsId[] = "$Id$";
int count;
NSAssert(initializer, @"No Initializer");
EOFLOGObjectLevelArgs(@"EOMKKD", @"suite");
EOFLOGObjectLevel(@"EOMKKD", @"suite");
ASSIGN(_MKKDInitializer, initializer);
@ -698,7 +698,7 @@ static char rcsId[] = "$Id$";
}
}
EOFLOGObjectLevelArgs(@"EOMKKD", @"END");
EOFLOGObjectLevel(@"EOMKKD", @"END");
return self;
}
@ -722,7 +722,7 @@ static char rcsId[] = "$Id$";
count: count] autorelease];
NSAssert(initializer, @"No Initializer");
EOFLOGObjectLevelArgs(@"EOMKKD", @"suite");
EOFLOGObjectLevel(@"EOMKKD", @"suite");
ASSIGN(_MKKDInitializer, initializer);

3
EOControl/GNUmakefile
View file

@ -95,8 +95,7 @@ EODataSource.h \
EODetailDataSource.h \
EOUndoManager.h \
EODebug.h \
EOControl.h \
GCObject.h
EOControl.h
gdl2control_AUTOGSDOC_HEADERS = $(libgnustep-db2control_HEADER_FILES)