gnustep/libs-gdl2
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gdl2.git synced 2025-02-16 08:20:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* EOAdaptors/Postgres95/Postgres95Channel.m ([Postgres95Channel

Browse source 
-describeTableNames]): implemented.

* EOAccess/EOSQLExpression.h: added missing declaration.
* EOAccess/EORelationship.m ([EORelationship -removeJoin:]): added cast.
* EOAccess/EOModel.m ([EOModel -dealloc]): removes observer correctly.
* EOAccess/EODatabaseContext.h: added missing declaration.
* EOControl/EOFetchSpecification.m ([EOFetchSpecification
-copyWithZone:]): fixed cast.
([EOFetchSpecification -hints]): added cast.
* EOControl/EOClassDescription.m  ([NSException
+validationExceptionWithFormat:]), ([NSException
+aggregateExceptionWithExceptions:]),
([NSException -exceptionAddingEntriesToUserInfo:]): renamed local
variables.
* rearranged header inclusion in all sources.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@15409 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Mirko Viviani 2002-12-30 22:10:43 +00:00
parent c8f5362d9f
commit b738a6145b
102 changed files with 693 additions and 365 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
ChangeLog
View file

@ -1,3 +1,30 @@
2002-12-30 Markus Hitter <mah@jump-ing.de>
* EOAdaptors/Postgres95/Postgres95Channel.m ([Postgres95Channel
-describeTableNames]): implemented.
2002-12-30 Mirko Viviani <mirko.viviani@rccr.cremona.it>
* EOAccess/EOSQLExpression.h: added missing declaration.
* EOAccess/EORelationship.m ([EORelationship -removeJoin:]): added cast.
* EOAccess/EOModel.m ([EOModel -dealloc]): removes observer correctly.
* EOAccess/EODatabaseContext.h: added missing declaration.
* EOControl/EOFetchSpecification.m ([EOFetchSpecification
-copyWithZone:]): fixed cast.
([EOFetchSpecification -hints]): added cast.
* EOControl/EOClassDescription.m ([NSException
+validationExceptionWithFormat:]), ([NSException
+aggregateExceptionWithExceptions:]),
([NSException -exceptionAddingEntriesToUserInfo:]): renamed local
variables.
* rearranged header inclusion in all sources.
2002-12-29 Mirko Viviani <mirko.viviani@rccr.cremona.it>
* EOAccess/EODatabaseContext.m ([EODatabaseContext -initializeObject:

21
EOAccess/EOAccess.h
View file

@ -27,27 +27,6 @@
#ifndef __EOAccess_h__
#define __EOAccess_h__
#import <Foundation/NSArray.h>
#import <Foundation/NSAutoreleasePool.h>
#import <Foundation/NSBundle.h>
#import <Foundation/NSCharacterSet.h>
#import <Foundation/NSData.h>
#import <Foundation/NSDate.h>
#import <Foundation/NSDictionary.h>
#import <Foundation/NSException.h>
#import <Foundation/NSNotification.h>
#import <Foundation/NSObjCRuntime.h>
#import <Foundation/NSObject.h>
#import <Foundation/NSPathUtilities.h>
#import <Foundation/NSRange.h>
#import <Foundation/NSScanner.h>
#import <Foundation/NSString.h>
#import <Foundation/NSUtilities.h>
#import <Foundation/NSValue.h>
#import <Foundation/NSZone.h>
#import <Foundation/NSCoder.h>
#import <Foundation/NSArchiver.h>
#import <EOAccess/EOAdaptor.h>
#import <EOAccess/EOAdaptorContext.h>
#import <EOAccess/EOAdaptorChannel.h>

6
EOAccess/EOAccessFault.h
View file

@ -28,11 +28,15 @@
#define __EOAccessFault_h__
#import <EOControl/EOControl.h>
#import <Foundation/NSObject.h>
#import <EOControl/EOFault.h>
@class EODatabaseContext;
@class EOEditingContext;
@class EOKeyGlobalID;
@class NSString;
@interface EOAccessGenericFaultHandler:EOFaultHandler

6
EOAccess/EOAccessFault.m
View file

@ -33,11 +33,15 @@
static char rcsId[] = "$Id$";
#ifdef GNUSTEP
#import <Foundation/NSObjCRuntime.h>
#endif
#import <Foundation/NSException.h>
#import <EOAccess/EOAccessFault.h>
#import <EOAccess/EOAccessFaultPriv.h>
#import <EOAccess/EODatabaseContext.h>
#import <EOAccess/EODatabaseContextPriv.h>
#import <EOControl/EOCheapArray.h>

9
EOAccess/EOAdaptor.h
View file

@ -28,12 +28,17 @@
#define __EOAdaptor_h__
#import <Foundation/NSObject.h>
#import <Foundation/NSString.h>
@class NSArray;
@class NSMutableArray;
@class NSDictionary;
@class NSString;
@class NSNumber;
@class NSException;
@class NSCalendarDate;
@class NSData;
@class NSTimeZone;
@class EOModel;
@class EOAttribute;
@ -119,7 +124,7 @@ extern NSString *EOGeneralAdaptorException;
- (id)delegate;
- (void)setDelegate: delegate;
- (BOOL) isValidQualifierType: (EOAttribute *)attribute
- (BOOL) isValidQualifierType: (NSString *)attribute
model: (EOModel *)model;
@end /* EOAdaptor */

3
EOAccess/EOAdaptor.m
View file

@ -53,6 +53,7 @@ static char rcsId[] = "$Id$";
#import <Foundation/NSValue.h>
#import <Foundation/NSProcessInfo.h>
#import <Foundation/NSException.h>
#import <Foundation/NSFileManager.h>
#import <EOAccess/EOAdaptor.h>
#import <EOAccess/EOAdaptorPriv.h>
@ -623,7 +624,7 @@ NSString *EOGeneralAdaptorException = @"EOGeneralAdaptorException";
[self notImplemented: _cmd];
}
- (BOOL) isValidQualifierType: (EOAttribute *)attribute
- (BOOL) isValidQualifierType: (NSString *)attribute
model: (EOModel *)model
{
[self subclassResponsibility: _cmd];

10
EOAccess/EOAdaptorChannel.h
View file

@ -28,10 +28,7 @@
#define __EOAdaptorChannel_h__
#import <Foundation/NSException.h>
#import <EOControl/EOFetchSpecification.h>
#import <EOAccess/EOAdaptorContext.h>
#import <Foundation/NSZone.h>
@class NSArray;
@ -45,10 +42,13 @@
@class EOModel;
@class EOEntity;
@class EOAttribute;
@class EOAdaptorContext;
@class EOQualifier;
@class EOStoredProcedure;
@class EOAdaptorOperation;
@class EOSQLExpression;
@class EOFetchSpecification;
/* The EOAdaptorChannel class could be overriden for a concrete database
adaptor. You have to override only those methods marked in this header
@ -191,7 +191,7 @@ shouldSelectAttributes: (NSArray *)attributes
- (void)adaptorChannel: channel
didSelectAttributes: (NSArray *)attributes
fetchSpecification: (EOFetchSpecification *)fetchSpecification
lock:(BOOL) flag
lock: (BOOL) flag
entity: (EOEntity *)entity;
- (void)adaptorChannelWillFetchRow: channel;

20
EOAccess/EOAdaptorChannel.m
View file

@ -35,11 +35,6 @@ static char rcsId[] = "$Id$";
#import <Foundation/Foundation.h>
#import <Foundation/NSDate.h>
#import <Foundation/NSValue.h>
#import <Foundation/NSException.h>
#import <EOAccess/EOAccess.h>
#import <EOAccess/EOEntity.h>
#import <EOAccess/EOAttribute.h>
#import <EOAccess/EOAdaptor.h>
@ -49,6 +44,7 @@ static char rcsId[] = "$Id$";
#import <EOAccess/EODatabaseOperation.h>
#import <EOControl/EOMutableKnownKeyDictionary.h>
#import <EOControl/EOFetchSpecification.h>
#import <EOControl/EONSAddOns.h>
@ -407,7 +403,7 @@ inRowsDescribedByQualifier: (EOQualifier *)qualifier
attributes,objects);
NSAssert(initializer,@"No initializer");
NSDebugMLLog(@"gsdb",@"initializer=%@",initializer);
NSDebugMLLog(@"gsdb", @"initializer=%@", initializer);
dict = [[[EOMutableKnownKeyDictionary allocWithZone: zone]
initWithInitializer:initializer] autorelease];
@ -488,7 +484,7 @@ inRowsDescribedByQualifier: (EOQualifier *)qualifier
switch(operator)
{
case EOAdaptorLockOperator:
NSDebugMLLog(@"gsdb", @"EOAdaptorLockOperator");
EOFLOGObjectLevel(@"gsdb", @"EOAdaptorLockOperator");
[self lockRowComparingAttributes: [adaptorOperation attributes]
entity: entity
@ -497,7 +493,7 @@ inRowsDescribedByQualifier: (EOQualifier *)qualifier
break;
case EOAdaptorInsertOperator:
NSDebugMLLog(@"gsdb", @"EOAdaptorInsertOperator");
EOFLOGObjectLevel(@"gsdb", @"EOAdaptorInsertOperator");
/*
//self adaptorContext
//adaptorcontext transactionNestingLevel
@ -516,7 +512,7 @@ prepareInsertExpressionWithRow:changedValues
break;
case EOAdaptorUpdateOperator:
NSDebugMLLog(@"gsdb", @"EOAdaptorUpdateOperator");
EOFLOGObjectLevel(@"gsdb", @"EOAdaptorUpdateOperator");
//OK
[self updateValues: [adaptorOperation changedValues]
inRowDescribedByQualifier: [adaptorOperation qualifier]
@ -524,19 +520,19 @@ prepareInsertExpressionWithRow:changedValues
break;
case EOAdaptorDeleteOperator:
NSDebugMLLog(@"gsdb", @"EOAdaptorDeleteOperator");
EOFLOGObjectLevel(@"gsdb", @"EOAdaptorDeleteOperator");
[self deleteRowDescribedByQualifier: [adaptorOperation qualifier]
entity: entity];
break;
case EOAdaptorStoredProcedureOperator:
NSDebugMLLog(@"gsdb", @"EOAdaptorStoredProcedureOperator");
EOFLOGObjectLevel(@"gsdb", @"EOAdaptorStoredProcedureOperator");
[self executeStoredProcedure: [adaptorOperation storedProcedure]
withValues: [adaptorOperation changedValues]];
break;
case EOAdaptorUndefinedOperator:
NSDebugMLLog(@"gsdb", @"EOAdaptorUndefinedOperator");
EOFLOGObjectLevel(@"gsdb", @"EOAdaptorUndefinedOperator");
default:
[NSException raise: NSInvalidArgumentException

3
EOAccess/EOAdaptorContext.h
View file

@ -29,11 +29,14 @@
#import <Foundation/NSObject.h>
@class NSMutableArray;
@class NSString;
@class EOAdaptor;
@class EOAdaptorChannel;
typedef enum {
EODelegateRejects,
EODelegateApproves,

2
EOAccess/EOAdaptorContext.m
View file

@ -39,8 +39,8 @@ static char rcsId[] = "$Id$";
#import <Foundation/NSNotification.h>
#import <Foundation/NSUserDefaults.h>
#import <EOAccess/EOAccess.h>
#import <EOAccess/EOAdaptor.h>
#import <EOAccess/EOAdaptorPriv.h>
#import <EOAccess/EOAdaptorContext.h>
#import <EOAccess/EOAdaptorChannel.h>

1
EOAccess/EOAdaptorOperation.m
View file

@ -36,7 +36,6 @@ static char rcsId[] = "$Id$";
#import <Foundation/NSObject.h>
#import <Foundation/NSException.h>
#import <EOAccess/EOAccess.h>
#import <EOAccess/EODatabaseOperation.h>
#import <EOAccess/EOAttribute.h>
#import <EOAccess/EOEntity.h>

12
EOAccess/EOAttribute.h
View file

@ -28,15 +28,19 @@
#define __EOAttribute_h__
#import <Foundation/NSString.h>
#import <Foundation/NSDictionary.h>
#import <Foundation/NSDate.h>
#import <Foundation/NSException.h>
#import <Foundation/NSZone.h>
#include <gnustep/base/GCObject.h>
#import <gnustep/base/GCObject.h>
#import <EOAccess/EOPropertyListEncoding.h>
@class NSDictionary;
@class NSData;
@class NSException;
@class NSCalendarDate;
@class NSTimeZone;
@class EOEntity;
@class EOExpressionArray;
@class EOStoredProcedure;

16
EOAccess/EOAttribute.m
View file

@ -36,14 +36,19 @@
static char rcsId[] = "$Id$";
#import <ctype.h>
#include <ctype.h>
#import <Foundation/NSUtilities.h>
#import <Foundation/NSArchiver.h>
#import <Foundation/NSObjCRuntime.h>
#import <Foundation/NSException.h>
#import <Foundation/NSTimeZone.h>
#import <Foundation/NSData.h>
#import <Foundation/NSInvocation.h>
#import <Foundation/NSDecimalNumber.h>
#import <Foundation/NSValue.h>
#import <Foundation/NSCalendarDate.h>
#import <EOAccess/EOAccess.h>
#import <EOAccess/EOModel.h>
#import <EOAccess/EOEntity.h>
#import <EOAccess/EOEntityPriv.h>
@ -56,6 +61,7 @@ static char rcsId[] = "$Id$";
#import <EOControl/EONull.h>
#import <EOControl/EOObserver.h>
@implementation EOAttribute
static NSString *defaultCalendarFormat = @"%b %d %Y %H:%M";
@ -291,13 +297,13 @@ static NSString *defaultCalendarFormat = @"%b %d %Y %H:%M";
EOFLOGObjectFnStart();
[_parent gcDecrementRefCount];
NSDebugMLLog(@"gsdb", @"prototype gcDecrementRefCount");
EOFLOGObjectLevel(@"gsdb", @"prototype gcDecrementRefCount");
[_prototype gcDecrementRefCount];
NSDebugMLLog(@"gsdb", @"definitionArray gcDecrementRefCount");
EOFLOGObjectLevel(@"gsdb", @"definitionArray gcDecrementRefCount");
[(id)_definitionArray gcDecrementRefCount];
NSDebugMLLog(@"gsdb", @"realAttribute gcDecrementRefCount");
EOFLOGObjectLevel(@"gsdb", @"realAttribute gcDecrementRefCount");
[_realAttribute gcDecrementRefCount];

10
EOAccess/EODatabase.h
View file

@ -27,7 +27,15 @@
#ifndef __EODatabase_h__
#define __EODatabase_h__
#import <EOControl/EOControl.h>
#import <Foundation/NSObject.h>
@class NSArray;
@class NSMutableArray;
@class NSDictionary;
@class NSMutableDictionary;
@class NSString;
@class EOAdaptor;
@class EOModel;

7
EOAccess/EODatabase.m
View file

@ -33,25 +33,24 @@
static char rcsId[] = "$Id$";
#import <Foundation/Foundation.h>
#import <Foundation/NSArray.h>
#import <Foundation/NSDictionary.h>
#import <Foundation/NSString.h>
#import <Foundation/NSException.h>
#import <Foundation/NSValue.h>
#import <Foundation/NSUtilities.h>
#import <Foundation/NSNotification.h>
#import <Foundation/NSSet.h>
#import <EOAccess/EOAccess.h>
#import <EOAccess/EOAccessFault.h>
#import <EOAccess/EOAdaptor.h>
#import <EOAccess/EOModel.h>
#import <EOAccess/EOEntity.h>
#import <EOAccess/EODatabase.h>
#import <EOAccess/EODatabaseContext.h>
#import <EOControl/EOObjectStore.h>
#import <EOControl/EOKeyGlobalID.h>
/* TODO

10
EOAccess/EODatabaseChannel.h
View file

@ -27,12 +27,18 @@
#ifndef __EODatabaseChannel_h__
#define __EODatabaseChannel_h__
#import <EOAccess/EOAdaptorChannel.h>
#import <EOControl/EOControl.h>
#import <Foundation/NSObject.h>
@class NSMutableArray;
@class EOEntity;
@class EOAdaptorChannel;
@class EORelationship;
@class EODatabaseContext;
@class EOEditingContext;
@class EOFetchSpecification;
@interface EODatabaseChannel : NSObject

16
EOAccess/EODatabaseChannel.m
View file

@ -38,7 +38,6 @@ static char rcsId[] = "$Id$";
#import <Foundation/Foundation.h>
#import <EOAccess/EOAccess.h>
#import <EOAccess/EODatabaseChannel.h>
#import <EOAccess/EODatabaseChannelPriv.h>
#import <EOAccess/EODatabaseContext.h>
@ -47,11 +46,14 @@ static char rcsId[] = "$Id$";
#import <EOAccess/EOAdaptor.h>
#import <EOAccess/EOAdaptorChannel.h>
#import <EOAccess/EOAdaptorContext.h>
#import <EOAccess/EOEntity.h>
#import <EOAccess/EOAttribute.h>
#import <EOAccess/EORelationship.h>
#import <EOAccess/EOModel.h>
#import <EOAccess/EOAccessFault.h>
#import <EOAccess/EOSQLExpression.h>
#import <EOAccess/EOSQLQualifier.h>
#import <EOControl/EOEditingContext.h>
#import <EOControl/EOKeyValueCoding.h>
@ -60,6 +62,7 @@ static char rcsId[] = "$Id$";
#import <EOControl/EOGlobalID.h>
#import <EOControl/EOObjectStore.h>
@implementation EODatabaseChannel
+ (void)load
@ -286,7 +289,7 @@ static char rcsId[] = "$Id$";
propertiesToFetch = [self _propertiesToFetch];
NSDebugMLLog(@"gsdb", @"Will fetchRow");
EOFLOGObjectLevel(@"gsdb", @"Will fetchRow");
row = [_adaptorChannel fetchRowWithZone: NULL];
@ -314,12 +317,12 @@ static char rcsId[] = "$Id$";
gid = [_currentEntity globalIDForRow: row
isFinal: YES];//OK
NSDebugMLLog(@"gsdb",@"gid=%@",gid);
NSDebugMLLog(@"gsdb", @"gid=%@", gid);
//NSDebugMLog(@"TEST attributesToFetch=%@",[_currentEntity attributesToFetch]);
object = [_currentEditingContext objectForGlobalID: gid]; //OK //nil
NSDebugMLLog(@"gsdb",@"object=%@",object);
NSDebugMLLog(@"gsdb", @"object=%@", object);
if (object)
isObjectNew = NO;
@ -385,7 +388,7 @@ static char rcsId[] = "$Id$";
}
if (!object)
{
{
EOClassDescription *entityClassDescripton = [_currentEntity classDescriptionForInstances];
object = [entityClassDescripton createInstanceWithEditingContext: _currentEditingContext
@ -401,7 +404,8 @@ static char rcsId[] = "$Id$";
}
else if (object && [EOFault isFault: object])
{
EOAccessFaultHandler *handler = [EOFault handlerForFault: object];
EOAccessFaultHandler *handler = (EOAccessFaultHandler *)
[EOFault handlerForFault: object];
EOKeyGlobalID *handlerGID = (EOKeyGlobalID *)[handler globalID];
isObjectNew = YES; //TODO

24
EOAccess/EODatabaseContext.h
View file

@ -27,8 +27,15 @@
#ifndef __EODatabaseContext_h__
#define __EODatabaseContext_h__
#import <EOControl/EOControl.h>
#import <Foundation/NSObject.h>
#import <Foundation/NSHashTable.h>
#import <Foundation/NSLock.h>
#import <EOControl/EOObjectStoreCoordinator.h>
@class NSMutableSet;
@class EOAdaptorContext;
@class EOAdaptorChannel;
@ -37,7 +44,6 @@
@class EOModel;
@class EORelationship;
@class EOAttribute;
@class EODatabase;
@class EODatabaseChannel;
@class EODatabaseOperation;
@ -83,11 +89,11 @@ struct _EOTransactionScope;
NSDictionary *_currentSnapshot;
objc_object *_currentBatch;
*/
NSMutableArray *_uniqueStack;// snaps
NSMutableArray *_uniqueArrayStack;//to many snaps
NSMutableArray *_deleteStack;
NSMutableArray *_uniqueStack;// snaps
NSMutableArray *_uniqueArrayStack;//to many snaps
NSMutableArray *_deleteStack;
NSHashTable *_nonPrimaryKeyGenerators;
NSHashTable *_nonPrimaryKeyGenerators;
struct {
unsigned int preparingForSave:1;
@ -149,12 +155,14 @@ struct _EOTransactionScope;
@end /* EODatabaseContext */
@interface EODatabaseContext(EOObjectStoreSupport)
@interface EODatabaseContext (EOObjectStoreSupport)
- (id)faultForRawRow: (NSDictionary *)row
entityNamed: (NSString *)entityName
editingContext: (EOEditingContext *)editingContext;
- (id) entityForGlobalID: (EOGlobalID *)globalID;
- (id)faultForGlobalID: (EOGlobalID *)globalID
editingContext: (EOEditingContext *)context;
@ -195,7 +203,7 @@ struct _EOTransactionScope;
@end
@interface EODatabaseContext(EOCooperatingObjectStoreSupport)
@interface EODatabaseContext (EOCooperatingObjectStoreSupport)
- (BOOL)ownsGlobalID:(EOGlobalID *)globalID;

11
EOAccess/EODatabaseContext.m
View file

@ -36,8 +36,6 @@
static char rcsId[] = "$Id$";
#import <Foundation/Foundation.h>
#import <Foundation/NSArray.h>
#import <Foundation/NSDictionary.h>
#import <Foundation/NSString.h>
@ -46,8 +44,11 @@ static char rcsId[] = "$Id$";
#import <Foundation/NSUtilities.h>
#import <Foundation/NSZone.h>
#import <Foundation/NSNotification.h>
#import <Foundation/NSSet.h>
#import <Foundation/NSData.h>
#import <EOAccess/EOAdaptor.h>
#import <EOAccess/EOAdaptorChannel.h>
#import <EOAccess/EOAdaptorContext.h>
#import <EOAccess/EOModel.h>
#import <EOAccess/EOModelGroup.h>
@ -64,17 +65,21 @@ static char rcsId[] = "$Id$";
#import <EOAccess/EODatabaseOperation.h>
#import <EOAccess/EOAccessFault.h>
#import <EOAccess/EOAccessFaultPriv.h>
#import <EOAccess/EOExpressionArray.h>
#import <EOControl/EOFault.h>
#import <EOControl/EOEditingContext.h>
#import <EOControl/EOClassDescription.h>
#import <EOControl/EOGenericRecord.h>
#import <EOControl/EOQualifier.h>
#import <EOControl/EOKeyGlobalID.h>
#import <EOControl/EOFetchSpecification.h>
#import <EOControl/EOSortOrdering.h>
#import <EOControl/EOKeyValueCoding.h>
#import <EOControl/EOMutableKnownKeyDictionary.h>
#import <EOControl/EOCheapArray.h>
#import <EOControl/EONSAddOns.h>
#import <EOControl/EONull.h>
#define _LOCK_BUFFER 128
@ -608,7 +613,7 @@ May raise an exception if transaction has began or if you want pessimistic lock
@end
@implementation EODatabaseContext(EOObjectStoreSupport)
@implementation EODatabaseContext (EOObjectStoreSupport)
/** Return a fault for row 'row' **/
- (id)faultForRawRow: (NSDictionary *)row

3
EOAccess/EODatabaseContextPriv.h
View file

@ -27,8 +27,11 @@
#ifndef __EODatabaseContextPriv_h__
#define __EODatabaseContextPriv_h__
@class EOAccessFaultHandler;
@class EOAccessArrayFaultHandler;
@class EOKeyGlobalID;
@class EOFault;
@interface EODatabaseContext (EODatabaseContextPrivate)

18
EOAccess/EODatabaseDataSource.h
View file

@ -24,10 +24,23 @@
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#import <EOControl/EOControl.h>
#ifndef __EODatabaseDataSource_h__
#define __EODatabaseDataSource_h__
#import <Foundation/NSObject.h>
#import <EOControl/EODataSource.h>
@class NSDictionary;
@class NSString;
@class EOEntity;
@class EODatabaseContext;
@class EOEditingContext;
@class EOFetchSpecification;
@class EOQualifier;
@interface EODatabaseDataSource : EODataSource <NSCoding>
@ -65,3 +78,6 @@
- (BOOL)isFetchEnabled;
@end
#endif /* __EODatabaseDataSource_h__ */

10
EOAccess/EODatabaseDataSource.m
View file

@ -41,8 +41,8 @@ static char rcsId[] = "$Id$";
#import <Foundation/NSObject.h>
#import <Foundation/NSString.h>
#import <Foundation/NSException.h>
#import <Foundation/NSCoder.h>
#import <EOAccess/EOAccess.h>
#import <EOAccess/EODatabaseDataSource.h>
#import <EOAccess/EOEntity.h>
#import <EOAccess/EOModel.h>
@ -50,6 +50,14 @@ static char rcsId[] = "$Id$";
#import <EOAccess/EODatabase.h>
#import <EOAccess/EODatabaseContext.h>
#import <EOControl/EOEditingContext.h>
#import <EOControl/EOQualifier.h>
#import <EOControl/EOFetchSpecification.h>
#import <EOControl/EOKeyValueArchiver.h>
#import <EOControl/EODataSource.h>
#import <EOControl/EODetailDataSource.h>
@implementation EODatabaseDataSource
- initWithEditingContext: (EOEditingContext *)editingContext

11
EOAccess/EODatabaseOperation.h
View file

@ -27,11 +27,20 @@
#ifndef __EODatabaseOperation_h__
#define __EODatabaseOperation_h__
#import <EOControl/EOControl.h>
#import <Foundation/NSObject.h>
@class NSArray;
@class NSMutableArray;
@class NSDictionary;
@class NSMutableDictionary;
@class NSException;
@class NSString;
@class EOStoredProcedure;
@class EOEntity;
@class EOQualifier;
@class EOGlobalID;
typedef enum {

4
EOAccess/EODatabaseOperation.m
View file

@ -33,15 +33,13 @@
static char rcsId[] = "$Id$";
#import <Foundation/NSObject.h>
#import <Foundation/NSException.h>
#import <EOAccess/EOAccess.h>
#import <EOAccess/EODatabaseOperation.h>
#import <EOAccess/EOAttribute.h>
#import <EOAccess/EOEntity.h>
@implementation EODatabaseOperation
+ (EODatabaseOperation *)databaseOperationWithGlobalID: (EOGlobalID *)globalID

3
EOAccess/EODatabaseOperationPriv.h
View file

@ -28,6 +28,9 @@
#define __EODatabaseOperationPriv_h__
@class EOGlobalID;
@interface EODatabaseOperation (private)
- (void)_setGlobalID: (EOGlobalID *)globalID;

4
EOAccess/EOEntity.h
View file

@ -32,7 +32,8 @@
#import <EOAccess/EOPropertyListEncoding.h>
#import <EOControl/EOClassDescription.h>
#include <gnustep/base/GCObject.h>
#import <gnustep/base/GCObject.h>
@class EOModel;
@class EOAttribute;
@ -50,6 +51,7 @@
@class EOMKKDInitializer;
@class EOMKKDSubsetMapping;
@interface EOEntity : GCObject <EOPropertyListEncoding>
{
NSString *_name;

6
EOAccess/EOEntity.m
View file

@ -36,12 +36,12 @@
static char rcsId[] = "$Id$";
#import <ctype.h>
#include <ctype.h>
#import <Foundation/Foundation.h>
#import <Foundation/NSException.h>
#include <gnustep/base/GCObject.h>
#import <gnustep/base/GCObject.h>
#import <EOAccess/EOModel.h>
#import <EOAccess/EOEntity.h>

7
EOAccess/EOEntityPriv.h
View file

@ -28,6 +28,12 @@
#define __EOEntityPriv_h__
@class NSString;
@class EORelationship;
@class EOExpressionArray;
@interface EOEntity (EOEntityPrivate)
- (void)setCreateMutableObjects: (BOOL)flag;
@ -48,7 +54,6 @@ toDestinationAttributeInLastComponentOfRelationshipPath: (NSString*)path;
- (BOOL) _relationshipPathHasIdenticalKeys: (id)param0;
@end
@class EOExpressionArray;
@interface EOEntity (EOEntitySQLExpression)
- (id) valueForSQLExpression: (id)param0;

25
EOAccess/EOExpressionArray.h
View file

@ -27,12 +27,17 @@
#ifndef __EOExpressionArray_h__
#define __EOExpressionArray_h__
#import <Foundation/NSString.h>
#include <gnustep/base/GCObject.h>
#import <gnustep/base/GCObject.h>
@class NSArray;
@class EOAttribute;
@class EOEntity;
@class EOExpressionArray;
@class EOSQLExpression;
@protocol EOExpressionContext <NSObject>
@ -44,16 +49,16 @@
@interface EOExpressionArray : GCMutableArray
{
NSString *_prefix;
NSString *_infix;
NSString *_suffix;
NSString *_prefix;
NSString *_infix;
NSString *_suffix;
// NSString *_definition; it's rebuilt
EOAttribute *_realAttribute;
EOAttribute *_realAttribute;
struct
{
unsigned int isFlattened:1; //TODO Why ?
} _flags;
struct
{
unsigned int isFlattened:1; //TODO Why ?
} _flags;
}
+ (EOExpressionArray*)expressionArray;

7
EOAccess/EOExpressionArray.m
View file

@ -36,20 +36,21 @@
static char rcsId[] = "$Id$";
#import <ctype.h>
#include <ctype.h>
#import <Foundation/NSString.h>
#import <Foundation/NSAutoreleasePool.h>
#import <Foundation/NSValue.h>
#import <Foundation/NSDate.h>
#import <Foundation/NSException.h>
#include <gnustep/base/GSObjCRuntime.h>
#import <gnustep/base/GSObjCRuntime.h>
#import <EOAccess/EOAccess.h>
#import <EOAccess/EOEntity.h>
#import <EOAccess/EOExpressionArray.h>
#import <EOAccess/EORelationship.h>
@implementation EOExpressionArray
+ (void) initialize

11
EOAccess/EOJoin.h
View file

@ -27,7 +27,10 @@
#ifndef __EOJoin_h__
#define __EOJoin_h__
#include <gnustep/base/GCObject.h>
#import <gnustep/base/GCObject.h>
@class NSString;
@class EOEntity;
@class EOAttribute;
@ -35,9 +38,9 @@
@interface EOJoin : GCObject
{
/* Garbage collectable objects */
EOAttribute *_sourceAttribute;
EOAttribute *_destinationAttribute;
/* Garbage collectable objects */
EOAttribute *_sourceAttribute;
EOAttribute *_destinationAttribute;
}
+ (EOJoin *)joinWithSourceAttribute: (EOAttribute *)source

7
EOAccess/EOJoin.m
View file

@ -33,12 +33,9 @@
static char rcsId[] = "$Id$";
#import <Foundation/Foundation.h>
#import <Foundation/NSString.h>
#import <Foundation/NSUtilities.h>
#import <EOAccess/EOAccess.h>
#import <EOAccess/EOModel.h>
#import <EOAccess/EOEntity.h>
#import <EOAccess/EOAttribute.h>
@ -78,10 +75,10 @@ static char rcsId[] = "$Id$";
{
EOFLOGObjectFnStart();
NSDebugMLLog(@"gsdb", @"sourceAttribute gcDecrementRefCount");
EOFLOGObjectLevel(@"gsdb", @"sourceAttribute gcDecrementRefCount");
[_sourceAttribute gcDecrementRefCount];
NSDebugMLLog(@"gsdb", @"destinationAttribute gcDecrementRefCount");
EOFLOGObjectLevel(@"gsdb", @"destinationAttribute gcDecrementRefCount");
[_destinationAttribute gcDecrementRefCount];

7
EOAccess/EOModel.h
View file

@ -27,11 +27,16 @@
#ifndef __EOModel_h__
#define __EOModel_h__
#import <Foundation/NSString.h>
#include <gnustep/base/GCObject.h>
#import <gnustep/base/GCObject.h>
#import <EOAccess/EOPropertyListEncoding.h>
@class NSArray;
@class NSDictionary;
@class EOEntity;
@class EOModelGroup;
@class EOStoredProcedure;

53
EOAccess/EOModel.m
View file

@ -34,30 +34,29 @@
static char rcsId[] = "$Id$";
#include <Foundation/Foundation.h>
#import <Foundation/NSBundle.h>
#import <Foundation/NSValue.h>
#import <Foundation/NSUtilities.h>
#import <Foundation/NSObjCRuntime.h>
#import <Foundation/NSException.h>
#import <Foundation/NSFileManager.h>
#import <Foundation/NSValue.h>
#import <Foundation/NSNotification.h>
#include <Foundation/NSBundle.h>
#include <Foundation/NSValue.h>
#include <Foundation/NSUtilities.h>
#include <Foundation/NSObjCRuntime.h>
#include <Foundation/NSException.h>
#include <Foundation/NSFileManager.h>
#include <Foundation/NSValue.h>
#import <EOAccess/EOModel.h>
#import <EOAccess/EOEntity.h>
#import <EOAccess/EOEntityPriv.h>
#import <EOAccess/EOStoredProcedure.h>
#import <EOAccess/EOModelGroup.h>
#import <EOAccess/EOAccessFault.h>
#include <EOAccess/EOModel.h>
#include <EOAccess/EOEntity.h>
#include <EOAccess/EOEntityPriv.h>
#include <EOAccess/EOStoredProcedure.h>
#include <EOAccess/EOModelGroup.h>
#include <EOAccess/EOAccessFault.h>
#include <EOControl/EOGenericRecord.h>
#include <EOControl/EOFault.h>
#include <EOControl/EOKeyGlobalID.h>
#include <EOControl/EOClassDescription.h>
#include <EOControl/EOObserver.h>
#include <EOControl/EONSAddOns.h>
#include <EOControl/EODebug.h>
#import <EOControl/EOGenericRecord.h>
#import <EOControl/EOFault.h>
#import <EOControl/EOKeyGlobalID.h>
#import <EOControl/EOClassDescription.h>
#import <EOControl/EOObserver.h>
#import <EOControl/EONSAddOns.h>
#import <EOControl/EODebug.h>
NSString *EOEntityLoadedNotification = @"EOEntityLoadedNotification";
@ -221,7 +220,7 @@ NSString *EOEntityLoadedNotification = @"EOEntityLoadedNotification";
- (void) dealloc
{
[NSNotificationCenter removeObserver: self];
[[NSNotificationCenter defaultCenter] removeObserver: self];
if (_entitiesByClass)
{
@ -245,16 +244,16 @@ NSString *EOEntityLoadedNotification = @"EOEntityLoadedNotification";
EOFLOGObjectFnStart();
[(id)_group gcDecrementRefCount];
NSDebugMLLog(@"gsdb", @"entities gcDecrementRefCount");
EOFLOGObjectLevel(@"gsdb", @"entities gcDecrementRefCount");
[(id)_entities gcDecrementRefCount];
NSDebugMLLog(@"gsdb", @"entitiesByName gcDecrementRefCount");
EOFLOGObjectLevel(@"gsdb", @"entitiesByName gcDecrementRefCount");
[(id)_entitiesByName gcDecrementRefCount];
NSDebugMLLog(@"gsdb", @"storedProcedures gcDecrementRefCount");
EOFLOGObjectLevel(@"gsdb", @"storedProcedures gcDecrementRefCount");
[(id)_storedProcedures gcDecrementRefCount];
NSDebugMLLog(@"gsdb", @"subEntitiesCache gcDecrementRefCount");
EOFLOGObjectLevel(@"gsdb", @"subEntitiesCache gcDecrementRefCount");
[(id)_subEntitiesCache gcDecrementRefCount];

14
EOAccess/EOModelGroup.h
View file

@ -27,16 +27,26 @@
#ifndef __EOModelGroup_h__
#define __EOModelGroup_h__
#include <EOControl/EOControl.h>
#import <Foundation/NSObject.h>
#import <gnustep/base/GCObject.h>
#import <EOControl/EOObjectStoreCoordinator.h>
@class NSArray;
@class NSDictionary;
@class NSMutableDictionary;
@class NSString;
@class EOModel;
@class EOEntity;
@class EORelationship;
@class EOGlobalID;
@class EOAttribute;
@class EOStoredProcedure;
@class EOFetchSpecification;
@interface EOModelGroup : GCObject
{
NSMutableDictionary *_modelsByName;

7
EOAccess/EOPropertyListEncoding.h
View file

@ -27,7 +27,12 @@
#ifndef __EOPropertyListEncoding_h__
#define __EOPropertyListEncoding_h__
#import <Foundation/NSDictionary.h>
#import <Foundation/NSObject.h>
@class NSDictionary;
@class NSMutableDictionary;
@protocol EOPropertyListEncoding

82
EOAccess/EORelationship.h
View file

@ -28,20 +28,26 @@
#define __EORelationship_h__
#import <Foundation/NSString.h>
#include <gnustep/base/GCObject.h>
#import <EOControl/EOClassDescription.h>
#import <EOControl/EOQualifier.h>
#import <gnustep/base/GCObject.h>
#import <EOAccess/EOJoin.h>
#import <EOAccess/EOPropertyListEncoding.h>
#import <EOControl/EOClassDescription.h>
@class NSArray;
@class NSMutableArray;
@class NSDictionary;
@class NSMutableDictionary;
@class NSException;
@class EOEntity;
@class EOAttribute;
@class EOExpressionArray;
@class EOMKKDSubsetMapping;
@class EOQualifier;
typedef enum {
EOInnerJoin = 0,
@ -53,44 +59,44 @@ typedef enum {
@interface EORelationship : GCObject <EOPropertyListEncoding>
{
NSString *_name;
EOQualifier *_qualifier;
NSMutableDictionary *_sourceNames;
NSMutableDictionary *_destinationNames;
NSDictionary *_userInfo;
NSDictionary *_internalInfo;
NSString *_docComment;
NSDictionary *_sourceToDestinationKeyMap;
unsigned int _batchCount;
EOJoinSemantic _joinSemantic;
NSString *_name;
EOQualifier *_qualifier;
NSMutableDictionary *_sourceNames;
NSMutableDictionary *_destinationNames;
NSDictionary *_userInfo;
NSDictionary *_internalInfo;
NSString *_docComment;
NSDictionary *_sourceToDestinationKeyMap;
unsigned int _batchCount;
EOJoinSemantic _joinSemantic;
struct {
unsigned int isToMany:1;
unsigned int useBatchFaulting:1;
unsigned int deleteRule:2;
unsigned int isMandatory:1;
unsigned int ownsDestination:1;
unsigned int propagatesPrimaryKey:1;
unsigned int createsMutableObjects:1;
unsigned int isBidirectional:1;
unsigned int extraRefCount:23;
} _flags;
id _sourceRowToForeignKeyMapping;
struct {
unsigned int isToMany:1;
unsigned int useBatchFaulting:1;
unsigned int deleteRule:2;
unsigned int isMandatory:1;
unsigned int ownsDestination:1;
unsigned int propagatesPrimaryKey:1;
unsigned int createsMutableObjects:1;
unsigned int isBidirectional:1;
unsigned int extraRefCount:23;
} _flags;
id _sourceRowToForeignKeyMapping;
/* Garbage collectable objects */
EOExpressionArray *_definitionArray;
/* Garbage collectable objects */
EOExpressionArray *_definitionArray;
EORelationship *_inverseRelationship;
EORelationship *_hiddenInverseRelationship;
EORelationship *_inverseRelationship;
EORelationship *_hiddenInverseRelationship;
EOEntity *_entity;
EOEntity *_destination;
GCMutableArray *_joins;
EOEntity *_entity;
EOEntity *_destination;
GCMutableArray *_joins;
/* Computed values */
GCArray *_sourceAttributes;
GCArray *_destinationAttributes;
GCMutableArray *_componentRelationships;//Used ????
/* Computed values */
GCArray *_sourceAttributes;
GCArray *_destinationAttributes;
GCMutableArray *_componentRelationships;//Used ????
}
+ (id) relationshipWithPropertyList: (NSDictionary *)propertyList

4
EOAccess/EORelationship.m
View file

@ -36,8 +36,6 @@
static char rcsId[] = "$Id$";
#import <Foundation/Foundation.h>
#import <Foundation/NSArray.h>
#import <Foundation/NSUtilities.h>
@ -1534,7 +1532,7 @@ relationships. Nil if none" **/
else
{
GCMutableArray *ma = [_joins mutableCopy];
GCArray *a = _joins;
GCArray *a = (GCArray *)_joins;
[ma removeObject: join];
_joins = ma;

21
EOAccess/EOSQLExpression.h
View file

@ -27,17 +27,26 @@
#ifndef __EOSQLExpression_h__
#define __EOSQLExpression_h__
#import <Foundation/NSDictionary.h>
#import <Foundation/NSArray.h>
#import <EOControl/EOFetchSpecification.h>
#import <EOControl/EOSortOrdering.h>
#import <Foundation/NSObject.h>
#import <Foundation/NSString.h>
#import <Foundation/NSValue.h>
#import <EOAccess/EOJoin.h>
#import <EOAccess/EORelationship.h>
@class NSArray;
@class NSMutableArray;
@class NSDictionary;
@class NSMutableDictionary;
@class EOAttribute;
@class EOEntity;
@class EOQualifier;
@class EOKeyValueQualifier;
@class EOKeyComparisonQualifier;
@class EOSortOrdering;
@class EOFetchSpecification;
extern NSString *EOBindVariableNameKey;
@ -81,6 +90,8 @@ extern NSString *EOBindVariableColumnKey;
fetchSpecification: (EOFetchSpecification *)fetchSpecification
entity: (EOEntity *)entity;
+ (id)sqlExpressionWithEntity: (EOEntity *)entity;
- initWithEntity: (EOEntity *)entity;
- (NSMutableDictionary *)aliasesByRelationshipPath;

10
EOAccess/EOSQLExpression.m
View file

@ -38,14 +38,11 @@ static char rcsId[] = "$Id$";
#include <string.h>
#import <Foundation/Foundation.h>
#import <Foundation/NSString.h>
#import <Foundation/NSSet.h>
#import <Foundation/NSUtilities.h>
#import <Foundation/NSException.h>
#import <Foundation/NSException.h>
#import <Foundation/NSUserDefaults.h>
#import <EOAccess/EOEntity.h>
#import <EOAccess/EOAttribute.h>
@ -61,8 +58,11 @@ static char rcsId[] = "$Id$";
#import <EOAccess/EOExpressionArray.h>
#import <EOAccess/EOSchemaGeneration.h>
#import <EOControl/EOFetchSpecification.h>
#import <EOControl/EOQualifier.h>
#import <EOControl/EOSortOrdering.h>
#import <EOControl/EODebug.h>
#import <EOControl/EONull.h>
NSString *EOBindVariableNameKey = @"EOBindVariableNameKey";
@ -483,7 +483,7 @@ NSString *EOBindVariableColumnKey = @"EOBindVariableColumnKey";
EOFLOGObjectLevelArgs(@"EOSQLExpression", @"qualifier=%@", qualifier);
whereClauseString = [(<EOQualifierSQLGeneration>)qualifier sqlStringForSQLExpression: self];
whereClauseString = [(id <EOQualifierSQLGeneration>)qualifier sqlStringForSQLExpression: self];
EOFLOGObjectLevelArgs(@"EOSQLExpression", @"whereClauseString=%@",
whereClauseString);

3
EOAccess/EOSQLExpressionPriv.h
View file

@ -27,6 +27,9 @@
#ifndef __EOSQLExpressionPriv_h__
#define __EOSQLExpressionPriv_h__
#import <EOAccess/EOJoin.h>
@class NSString;
@class EOEntity;

8
EOAccess/EOSQLQualifier.h
View file

@ -30,8 +30,11 @@
#ifndef __EOSQLQualifier_h__
#define __EOSQLQualifier_h__
#import <Foundation/Foundation.h>
#import <EOControl/EOControl.h>
#import <Foundation/NSObject.h>
#import <Foundation/NSString.h>
#import <EOControl/EOQualifier.h>
@class EOSQLExpression;
@ -39,6 +42,7 @@
@class EOEntity;
@class EOModel;
/** Protocol for all qualifiers used used to generate SQL queries **/
@protocol EOQualifierSQLGeneration

36
EOAccess/EOSQLQualifier.m
View file

@ -39,13 +39,19 @@ static char rcsId[] = "$Id$";
#import <Foundation/NSDictionary.h>
#import <Foundation/NSSet.h>
#import <Foundation/NSUtilities.h>
#import <Foundation/NSException.h>
#import <EOAccess/EOAccess.h>
#import <EOAccess/EOSQLQualifier.h>
#import <EOAccess/EOAttribute.h>
#import <EOAccess/EORelationship.h>
#import <EOAccess/EOJoin.h>
#import <EOAccess/EOEntity.h>
#import <EOAccess/EOSQLExpression.h>
#import <EOControl/EOControl.h>
#import <EOControl/EOQualifier.h>
#import <EOControl/EOEditingContext.h>
#import <EOControl/EOObjectStoreCoordinator.h>
#import <EOControl/EONull.h>
#import <EOControl/EODebug.h>
@ -102,13 +108,13 @@ static char rcsId[] = "$Id$";
if (!sqlString)
{
sqlString = [NSMutableString stringWithString:
[(<EOQualifierSQLGeneration>)qualifier sqlStringForSQLExpression:sqlExpression]];
[(id <EOQualifierSQLGeneration>)qualifier sqlStringForSQLExpression:sqlExpression]];
}
else
{
[sqlString appendFormat:@" %@ %@",
@"AND",
[(<EOQualifierSQLGeneration>)qualifier sqlStringForSQLExpression:sqlExpression]];
[(id <EOQualifierSQLGeneration>)qualifier sqlStringForSQLExpression:sqlExpression]];
}
}
return sqlString;
@ -133,11 +139,13 @@ static char rcsId[] = "$Id$";
{
EOQualifier *qualifier = [_qualifiers objectAtIndex: i];
EOQualifier *schemaBasedQualifierTmp =
[(<EOQualifierSQLGeneration>)qualifier
schemaBasedQualifierWithRootEntity:
entity];
[(id <EOQualifierSQLGeneration>)qualifier
schemaBasedQualifierWithRootEntity:
entity];
if (schemaBasedQualifierTmp != qualifier)
atLeastOneDifferentQualifier = YES;
[qualifiers addObject: schemaBasedQualifierTmp];
}
@ -167,13 +175,13 @@ static char rcsId[] = "$Id$";
if (!sqlString)
{
sqlString = [NSMutableString stringWithString:
[(<EOQualifierSQLGeneration>)qualifier sqlStringForSQLExpression: sqlExpression]];
[(id <EOQualifierSQLGeneration>)qualifier sqlStringForSQLExpression: sqlExpression]];
}
else
{
[sqlString appendFormat: @" %@ %@",
@"OR",
[(<EOQualifierSQLGeneration>)qualifier sqlStringForSQLExpression: sqlExpression]];
[(id <EOQualifierSQLGeneration>)qualifier sqlStringForSQLExpression: sqlExpression]];
}
}
@ -198,11 +206,13 @@ static char rcsId[] = "$Id$";
{
EOQualifier *qualifier = [_qualifiers objectAtIndex: i];
EOQualifier *schemaBasedQualifierTmp =
[(<EOQualifierSQLGeneration>)qualifier
schemaBasedQualifierWithRootEntity:
entity];
[(id <EOQualifierSQLGeneration>)qualifier
schemaBasedQualifierWithRootEntity:
entity];
if (schemaBasedQualifierTmp != qualifier)
atLeastOneDifferentQualifier = YES;
[qualifiers addObject: schemaBasedQualifierTmp];
}

22
EOAccess/EOStoredProcedure.h
View file

@ -27,25 +27,29 @@
#ifndef __EOStoredProcedure_h__
#define __EOStoredProcedure_h__
#import <Foundation/Foundation.h>
#import <Foundation/NSObject.h>
#import <gnustep/base/GCObject.h>
#import <EOAccess/EOPropertyListEncoding.h>
@class NSDictionary;
@class EOModel;
@class EOAttribute;
@class GCArray;
@class EOStoredProcedure;
@interface EOStoredProcedure : GCObject <EOPropertyListEncoding>
{
NSString *_name;
NSString *_externalName;
NSDictionary *_userInfo;
NSDictionary *_internalInfo;
NSString *_name;
NSString *_externalName;
NSDictionary *_userInfo;
NSDictionary *_internalInfo;
/* Garbage collectable objects */
EOModel *_model;
GCArray *_arguments;
/* Garbage collectable objects */
EOModel *_model;
GCArray *_arguments;
}
+ (EOStoredProcedure *)storedProcedureWithPropertyList: (NSDictionary *)propertyList

6
EOAccess/EOStoredProcedure.m
View file

@ -33,7 +33,9 @@
static char rcsId[] = "$Id$";
#include <gnustep/base/GCObject.h>
#import <Foundation/NSException.h>
#import <gnustep/base/GCObject.h>
#import <EOAccess/EOStoredProcedure.h>
#import <EOAccess/EOAttribute.h>
@ -59,7 +61,7 @@ static char rcsId[] = "$Id$";
{
EOFLOGObjectFnStart();
NSDebugMLLog(@"gsdb", @"model gcDecrementRefCount");
EOFLOGObjectLevel(@"gsdb", @"model gcDecrementRefCount");
[(id)_model gcDecrementRefCount];
[(id)_arguments gcDecrementRefCount];

11
EOAccess/EOUtilities.h
View file

@ -27,16 +27,23 @@
#ifndef __EOUtilities_h__
#define __EOUtilities_h__
#import <EOControl/EOControl.h>
#import <EOControl/EOEditingContext.h>
@class NSArray;
@class NSDictionary;
@class NSString;
@class EODatabaseContext;
@class EOModelGroup;
@class EOEntity;
extern NSString *EOMoreThanOneException;
@interface EOEditingContext(EOUtilities)
@interface EOEditingContext (EOUtilities)
- (NSArray*)objectsForEntityNamed: (NSString*)name;
- (NSArray*)objectsOfClass: (Class)classObject;

4
EOAccess/EOUtilities.m
View file

@ -37,6 +37,8 @@ static char rcsId[] = "$Id$";
#import <EOControl/EOEditingContext.h>
#import <EOControl/EOQualifier.h>
#import <EOControl/EOFetchSpecification.h>
#import <EOControl/EONull.h>
#import <EOControl/EODebug.h>
#import <EOAccess/EOAccess.h>
@ -227,7 +229,7 @@ static NSString *EOMoreThanOneException = @"EOMoreThanOneException";
{
NSDebugMLog(@"exception in EOEditingContext (EOUtilities) objectsMatchingValues:entityNamed:");
NSLog(@"exception in EOEditingContext (EOUtilities) objectsMatchingValues:entityNamed:");
NSDebugMLog(@"exception=%@",localException);
NSDebugMLog(@"exception=%@", localException);
NSLog(@"exception=%@", localException);
/* localException=ExceptionByAddingUserInfoObjectFrameInfo(localException,
@"In EOEditingContext (EOUtilities) objectsMatchingValues:entityNamed:");

3
EOAdaptors/Postgres95/Postgres95Adaptor.m
View file

@ -47,8 +47,7 @@ static char rcsId[] = "$Id$";
#import <Foundation/NSUtilities.h>
#import <Foundation/NSDate.h>
#import <Foundation/NSAutoreleasePool.h>
#include <Foundation/NSException.h>
#import <Foundation/NSException.h>
#import <EOAccess/EOAccess.h>
#import <EOAccess/EOAttribute.h>

39
EOAdaptors/Postgres95/Postgres95Channel.m
View file

@ -44,13 +44,13 @@ static char rcsId[] = "$Id$";
#import <Foundation/NSString.h>
#import <Foundation/NSObjCRuntime.h>
#import <Foundation/NSUtilities.h>
#include <Foundation/NSException.h>
#import <Foundation/NSException.h>
#import <EOAccess/EOAccess.h>
#import <EOControl/EONull.h>
#import <EOControl/EOQualifier.h>
#import <EOControl/EOFetchSpecification.h>
#import <Postgres95EOAdaptor/Postgres95Channel.h>
#import <Postgres95EOAdaptor/Postgres95Context.h>
@ -1306,9 +1306,38 @@ each key
- (NSArray *)describeTableNames
{
// TODO
[self notImplemented: _cmd];
return nil;
int i, count;
NSMutableArray *results = [NSMutableArray array];
NSAssert(_pgConn, @"Channel not opened");
_pgResult = PQexec(_pgConn,
"SELECT tablename FROM pg_tables WHERE
pg_tables.schemaname = 'public'");
if (_pgResult == NULL
|| PQresultStatus(_pgResult) != PGRES_TUPLES_OK)
{
_pgResult = NULL;
[NSException raise: Postgres95Exception
format: @"cannot read list of tables from database. "
@"bad response from server"];
}
[_oidToTypeName removeAllObjects];
count = PQntuples(_pgResult);
for (i = 0; i < count; i++)
{
char *oid = PQgetvalue(_pgResult, i, 0);
[results addObject: [NSString stringWithUTF8String: oid]];
}
PQclear(_pgResult);
_pgResult = NULL;
return [NSArray arrayWithArray: results];
}
- (NSArray *)describeStoredProcedureNames

1
EOAdaptors/Postgres95/Postgres95Values.h
View file

@ -31,6 +31,7 @@
#import <Foundation/NSValue.h>
#import <Foundation/NSData.h>
#import <Foundation/NSDate.h>
#import <Foundation/NSCalendarDate.h>
#import <EOControl/EONull.h>

4
EOAdaptors/Postgres95/Postgres95Values.m
View file

@ -37,8 +37,8 @@ static char rcsId[] = "$Id$";
#import <Foundation/NSDate.h>
#import <Foundation/NSString.h>
#import <Foundation/NSValue.h>
#include <Foundation/NSException.h>
#import <Foundation/NSDecimalNumber.h>
#import <Foundation/NSException.h>
#import <EOAccess/EOAccess.h>
#import <EOAccess/EOAttribute.h>

2
EOControl/EOAndQualifier.m
View file

@ -40,10 +40,10 @@ static char rcsId[] = "$Id$";
#import <Foundation/NSSet.h>
#import <Foundation/NSUtilities.h>
#import <EOControl/EOControl.h>
#import <EOControl/EOQualifier.h>
#import <EOControl/EODebug.h>
@implementation EOAndQualifier
+ (EOQualifier *)qualifierWithQualifierArray: (NSArray *)array

4
EOControl/EOCheapArray.h
View file

@ -27,6 +27,10 @@
#ifndef __EOCheapArray_h__
#define __EOCheapArray_h__
#import <Foundation/NSArray.h>
#import <Foundation/NSZone.h>
@interface EOCheapCopyArray : NSArray
{
unsigned int _count;

7
EOControl/EOClassDescription.h
View file

@ -30,6 +30,8 @@
#import <Foundation/NSObject.h>
#import <Foundation/NSArray.h>
#import <Foundation/NSException.h>
#import <Foundation/NSZone.h>
@class NSDictionary;
@class NSFormatter;
@ -45,6 +47,7 @@ typedef enum
EODeleteRuleNoAction
} EODeleteRule;
@interface EOClassDescription : NSObject
+ (void)registerClassDescription: (EOClassDescription *)description
@ -147,7 +150,7 @@ extern NSString *EOClassDescriptionNeededForClassNotification;
extern NSString *EOClassDescriptionNeededForEntityNameNotification;
@interface NSArray(EOShallowCopy)
@interface NSArray (EOShallowCopy)
- (NSArray *)shallowCopy;
@ -220,7 +223,7 @@ extern NSString *EOValidatedPropertyUserInfoKey;
@end
@interface NSObject (_EOEditingContext)
-(EOEditingContext*)editingContext;
- (EOEditingContext*)editingContext;
@end
#endif

95
EOControl/EOClassDescription.m
View file

@ -133,7 +133,7 @@ static id classDelegate = nil;
NSDebugMLLog(@"gsdb", @"entityName=%@", entityName);
classDescription = NSMapGet(classDescriptionForEntity, entityName);
NSDebugMLLog(@"gsdb",@"classDescription=%@",classDescription);
NSDebugMLLog(@"gsdb", @"classDescription=%@", classDescription);
/*?? if (classDescription==NOT_FOUND_CLASS_DESCRIPTION)
classDescription=nil;
@ -292,7 +292,8 @@ fromInsertionInEditingContext: (EOEditingContext *)anEditingContext
- (NSString *)displayNameForKey: (NSString *)key
{
const char *s, *ckey = [key cString];
NSMutableString *str = [NSMutableString initWithCapacity: [key length]];
NSMutableString *str = [[NSMutableString alloc] initWithCapacity:
[key length]];
char c;
BOOL init = NO;
@ -390,7 +391,7 @@ fromInsertionInEditingContext: (EOEditingContext *)anEditingContext
switch (deleteRule)
{
case EODeleteRuleNullify:
NSDebugMLLog(@"gsdb", @"EODeleteRuleNullify");
EOFLOGObjectLevel(@"gsdb", @"EODeleteRuleNullify");
[object removeObject: destination
fromBothSidesOfRelationshipWithKey: key];
@ -409,7 +410,7 @@ fromInsertionInEditingContext: (EOEditingContext *)anEditingContext
case EODeleteRuleCascade:
//OK
NSDebugMLLog(@"gsdb", @"EODeleteRuleCascade");
EOFLOGObjectLevel(@"gsdb", @"EODeleteRuleCascade");
[object removeObject: destination
fromBothSidesOfRelationshipWithKey: key];
[context deleteObject: destination];
@ -417,7 +418,7 @@ fromInsertionInEditingContext: (EOEditingContext *)anEditingContext
break;
case EODeleteRuleDeny:
NSDebugMLLog(@"gsdb", @"EODeleteRuleDeny");
EOFLOGObjectLevel(@"gsdb", @"EODeleteRuleDeny");
// TODO don't know how to do yet, if raise an exception
// or something else.
NSEmitTODO();
@ -425,7 +426,7 @@ fromInsertionInEditingContext: (EOEditingContext *)anEditingContext
break;
case EODeleteRuleNoAction:
NSDebugMLLog(@"gsdb", @"EODeleteRuleNoAction");
EOFLOGObjectLevel(@"gsdb", @"EODeleteRuleNoAction");
break;
}
}
@ -462,7 +463,7 @@ fromInsertionInEditingContext: (EOEditingContext *)anEditingContext
switch (deleteRule)
{
case EODeleteRuleNullify:
NSDebugMLLog(@"gsdb", @"EODeleteRuleNullify");
EOFLOGObjectLevel(@"gsdb", @"EODeleteRuleNullify");
NSDebugMLLog(@"gsdb", @"toManyArray %p=%@", toManyArray,
toManyArray);
@ -487,7 +488,7 @@ fromInsertionInEditingContext: (EOEditingContext *)anEditingContext
case EODeleteRuleCascade:
//OK
NSDebugMLLog(@"gsdb", @"EODeleteRuleCascade");
EOFLOGObjectLevel(@"gsdb", @"EODeleteRuleCascade");
NSDebugMLLog(@"gsdb", @"toManyArray %p=%@", toManyArray, toManyArray);
while ((destination = [toManyArray lastObject]))
@ -503,7 +504,7 @@ fromInsertionInEditingContext: (EOEditingContext *)anEditingContext
break;
case EODeleteRuleDeny:
NSDebugMLLog(@"gsdb", @"EODeleteRuleDeny");
EOFLOGObjectLevel(@"gsdb", @"EODeleteRuleDeny");
NSDebugMLLog(@"gsdb", @"toManyArray %p=%@", toManyArray, toManyArray);
if ([toManyArray count] > 0)
{
@ -515,7 +516,7 @@ fromInsertionInEditingContext: (EOEditingContext *)anEditingContext
break;
case EODeleteRuleNoAction:
NSDebugMLLog(@"gsdb", @"EODeleteRuleNoAction");
EOFLOGObjectLevel(@"gsdb", @"EODeleteRuleNoAction");
break;
}
}
@ -997,7 +998,7 @@ fromInsertionInEditingContext: (EOEditingContext *)anEditingContext
forKey: key];
}
NSDebugMLLog(@"gsdb",@"toManyRelationshipKeys=%@",toManyRelationshipKeys);
NSDebugMLLog(@"gsdb", @"toManyRelationshipKeys=%@", toManyRelationshipKeys);
for (i = 0; i < toManyRelationshipKeyCount; i++)
{
@ -1221,7 +1222,7 @@ toPropertyWithKey: (NSString *)key
if ([self isToManyKey: key] == YES)
{
NSDebugMLLog(@"gsdb", @"to many");
EOFLOGObjectLevel(@"gsdb", @"to many");
val = [self valueForKey: key]; //should use storedValueForKey: ?
@ -1236,7 +1237,7 @@ toPropertyWithKey: (NSString *)key
{
if ([val isKindOfClass: [NSMutableArray class]])
{
NSDebugMLLog(@"gsdb", @"to many2");
EOFLOGObjectLevel(@"gsdb", @"to many2");
[self willChange];
[val addObject: object];
}
@ -1263,7 +1264,7 @@ toPropertyWithKey: (NSString *)key
}
else
{
NSDebugMLLog(@"gsdb", @"key is not to many");
EOFLOGObjectLevel(@"gsdb", @"key is not to many");
[self takeValue: object
forKey: key];
@ -1316,7 +1317,7 @@ toPropertyWithKey: (NSString *)key
if (removeFromSelector && [self respondsToSelector: removeFromSelector])
{
NSDebugMLLog(@"gsdb", @"responds=YES");
EOFLOGObjectLevel(@"gsdb", @"responds=YES");
[self performSelector: removeFromSelector
withObject: object];
}
@ -1324,11 +1325,11 @@ toPropertyWithKey: (NSString *)key
{
id val = nil;
NSDebugMLLog(@"gsdb", @"responds=NO");
EOFLOGObjectLevel(@"gsdb", @"responds=NO");
if ([self isToManyKey:key] == YES)
{
NSDebugMLLog(@"gsdb", @"key is to many");
EOFLOGObjectLevel(@"gsdb", @"key is to many");
val = [self valueForKey: key];
NSDebugMLLog(@"gsdb", @"val=%@", val);
@ -1354,7 +1355,7 @@ toPropertyWithKey: (NSString *)key
}
else
{
NSDebugMLLog(@"gsdb", @"key is not to many");
EOFLOGObjectLevel(@"gsdb", @"key is not to many");
[self takeValue: nil
forKey: key];
}
@ -1394,7 +1395,7 @@ forBothSidesOfRelationshipWithKey: (NSString*)key
/* if ([object isToManyKey:inverseKey])
{
//??
NSDebugMLLog(@"gsdb",@"Inverse is to many");
EOFLOGObjectLevel(@"gsdb",@"Inverse is to many");
[oldObject removeObject:self
fromPropertyWithKey:inverseKey];
[object addObject:self
@ -1402,7 +1403,7 @@ forBothSidesOfRelationshipWithKey: (NSString*)key
}
else
{
NSDebugMLLog(@"gsdb",@"Inverse is not to many");
EOFLOGObjectLevel(@"gsdb",@"Inverse is not to many");
//OK
//MIRKO if ((inverseKey = [oldObject inverseForRelationshipKey:key]))
//MIRKO [oldObject removeObject:self
@ -1513,15 +1514,15 @@ fromBothSidesOfRelationshipWithKey: (NSString *)key
+ (NSException *)validationExceptionWithFormat: (NSString *)format, ...
{
NSException *exp;
NSString *name;
NSString *aName;
va_list args;
va_start(args, format);
name = [[[NSString alloc] initWithFormat: format arguments: args]
autorelease];
aName = [[[NSString alloc] initWithFormat: format arguments: args]
autorelease];
exp = [NSException exceptionWithName: EOValidationException
reason: name
reason: aName
userInfo: nil];
va_end(args);
@ -1537,21 +1538,21 @@ fromBothSidesOfRelationshipWithKey: (NSString *)key
exp = [subexceptions objectAtIndex: 0];
else if ([subexceptions count] > 1)
{
NSString *name, *reason;
NSMutableDictionary *userInfo;
NSString *aName, *aReason;
NSMutableDictionary *aUserInfo;
exp = [subexceptions objectAtIndex: 0];
name = [exp name];
reason = [exp reason];
userInfo = [[exp userInfo] mutableCopy];
[userInfo setObject: subexceptions
forKey: EOAdditionalExceptionsKey];
aName = [exp name];
aReason = [exp reason];
aUserInfo = [[exp userInfo] mutableCopy];
exp = [NSException exceptionWithName: name
reason: reason
userInfo: userInfo];
[aUserInfo setObject: subexceptions
forKey: EOAdditionalExceptionsKey];
exp = [NSException exceptionWithName: aName
reason: aReason
userInfo: aUserInfo];
}
return exp;
@ -1560,21 +1561,21 @@ fromBothSidesOfRelationshipWithKey: (NSString *)key
- (NSException *)exceptionAddingEntriesToUserInfo: (NSDictionary *)additions
{
NSException *exp;
NSString *name, *reason;
NSMutableDictionary *userInfo;
NSString *aName, *aReason;
NSMutableDictionary *aUserInfo;
name = [self name];
reason = [self reason];
userInfo = [[self userInfo] mutableCopy];
aName = [self name];
aReason = [self reason];
aUserInfo = [[self userInfo] mutableCopy];
[userInfo setObject: [additions allValues]
forKey: EOValidatedObjectUserInfoKey];
[userInfo setObject: [additions allKeys]
forKey: EOValidatedPropertyUserInfoKey];
[aUserInfo setObject: [additions allValues]
forKey: EOValidatedObjectUserInfoKey];
[aUserInfo setObject: [additions allKeys]
forKey: EOValidatedPropertyUserInfoKey];
exp = [NSException exceptionWithName: name
reason: reason
userInfo: userInfo];
exp = [NSException exceptionWithName: aName
reason: aReason
userInfo: aUserInfo];
return exp;
}

2
EOControl/EOControl.h
View file

@ -46,7 +46,7 @@
#import <EOControl/EODetailDataSource.h>
#import <EOControl/EOObserver.h>
#import <EOControl/EODebug.h>
#include <gnustep/base/GCObject.h>
#import <gnustep/base/GCObject.h>
#endif /* __EOControl_h__ */

2
EOControl/EODataSource.h
View file

@ -31,6 +31,8 @@
@class NSArray;
@class NSDictionary;
@class NSString;
@class EOEditingContext;
@class EOClassDescription;

2
EOControl/EODataSource.m
View file

@ -33,11 +33,11 @@
static char rcsId[] = "$Id$";
#import <EOControl/EOControl.h>
#import <EOControl/EODataSource.h>
#import <EOControl/EOClassDescription.h>
#import <EOControl/EOEditingContext.h>
@implementation EODataSource
- (id)createObject

5
EOControl/EODebug.h
View file

@ -30,8 +30,9 @@
#ifdef DEBUG
#include <Foundation/NSDebug.h>
#include <Foundation/NSAutoreleasePool.h>
#import <Foundation/NSDebug.h>
#import <Foundation/NSAutoreleasePool.h>
extern void EOFLogC_(const char* file,int line,const char* string);
extern void EOFLogDumpObject_(const char* file,int line,id object,int deep);

6
EOControl/EODebug.m
View file

@ -31,9 +31,9 @@
static char rcsId[] = "$Id$";
#include <Foundation/Foundation.h>
#include <Foundation/NSThread.h>
#include <Foundation/NSAutoreleasePool.h>
#import <Foundation/NSThread.h>
#import <Foundation/NSAutoreleasePool.h>
#include <unistd.h>
#define USTART NSAutoreleasePool* arp=[NSAutoreleasePool new];

8
EOControl/EODetailDataSource.h
View file

@ -24,9 +24,15 @@
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __EODetailDataSource_h__
#define __EODetailDataSource_h__
#import <EOControl/EODataSource.h>
@class EOKeyValueUnarchiver;
@interface EODetailDataSource : EODataSource <NSCoding>
{
EODataSource *_masterDataSource;
@ -60,3 +66,5 @@
- (EOEditingContext *)editingContext;
@end
#endif /* __EODetailDataSource_h__ */

3
EOControl/EODetailDataSource.m
View file

@ -37,9 +37,10 @@ static char rcsId[] = "$Id$";
#import <Foundation/NSString.h>
#import <Foundation/NSException.h>
#import <Foundation/NSCoder.h>
#import <EOControl/EOControl.h>
#import <EOControl/EODetailDataSource.h>
#import <EOControl/EOKeyValueCoding.h>
#import <EOControl/EOKeyValueArchiver.h>
#import <EOControl/EOClassDescription.h>

14
EOControl/EOEditingContext.h
View file

@ -26,10 +26,22 @@
#ifndef __EOEditingContext_h__
#define __EOEditingContext_h__
#import <Foundation/Foundation.h>
#import <Foundation/NSHashTable.h>
#import <Foundation/NSMapTable.h>
#import <Foundation/NSLock.h>
#import <EOControl/EOObjectStore.h>
#import <EOControl/EOObserver.h>
@class NSArray;
@class NSMutableArray;
@class NSDictionary;
@class NSMutableDictionary;
@class NSAutoreleasePool;
@class NSUndoManager;
@interface EOEditingContext : EOObjectStore <EOObserving>
{
EOObjectStore *_objectStore;

6
EOControl/EOEditingContext.m
View file

@ -33,12 +33,8 @@
static char rcsId[] = "$Id$";
//TODO EOMultiReaderLocks
#import <EOControl/EOControl.h>
#import <Foundation/Foundation.h>
#import <Foundation/NSObject.h>
#import <Foundation/NSNotification.h>
#import <EOControl/EOEditingContext.h>
#import <EOControl/EOObjectStoreCoordinator.h>
#import <EOControl/EOGlobalID.h>
@ -47,9 +43,9 @@ static char rcsId[] = "$Id$";
#import <EOControl/EOFault.h>
#import <EOControl/EONull.h>
#import <EOControl/EOUndoManager.h>
#import <EOControl/EONSAddOns.h>
#import <EOAccess/EOEntity.h>
#import <EOControl/EONSAddOns.h>
@implementation EOEditingContext

11
EOControl/EOFault.h
View file

@ -30,9 +30,16 @@
#ifndef __EOFault_h__
#define __EOFault_h__
#include <Foundation/Foundation.h>
#import <Foundation/NSObject.h>
#import <Foundation/NSZone.h>
#include <gnustep/base/GCObject.h>
#import <gnustep/base/GCObject.h>
@class NSInvocation;
@class NSMethodSignature;
@class NSDictionary;
@class NSString;
@class EOFaultHandler;

9
EOControl/EOFault.m
View file

@ -46,12 +46,14 @@ static char rcsId[] = "$Id$";
#import <Foundation/NSDictionary.h>
#import <Foundation/NSString.h>
#import <Foundation/NSObjCRuntime.h>
#import <Foundation/NSInvocation.h>
#import <Foundation/NSLock.h>
#import <Foundation/NSException.h>
#include <Foundation/NSException.h>
#include <objc/objc-api.h>
#import <EOControl/EOControl.h>
#import <EOControl/EOFault.h>
#import <EOControl/EOKeyGlobalID.h>
#import <EOAccess/EODatabaseContext.h>
@ -141,7 +143,7 @@ typedef struct {
EOFault *fault = object;
unsigned int refs;
NSAssert(handler,@"No Handler");
NSAssert(handler, @"No Handler");
refs = [object retainCount];
@ -579,4 +581,3 @@ typedef struct {
}
@end

4
EOControl/EOFaultHandler.m
View file

@ -41,8 +41,8 @@ static char rcsId[] = "$Id$";
#import <Foundation/NSObjCRuntime.h>
#import <Foundation/NSException.h>
#include <gnustep/base/GCObject.h>
#import <EOControl/EOControl.h>
#import <gnustep/base/GCObject.h>
#import <EOControl/EOFault.h>

40
EOControl/EOFetchSpecification.h
View file

@ -27,31 +27,37 @@
#ifndef __EOFetchSpecification_h__
#define __EOFetchSpecification_h__
#import <Foundation/Foundation.h>
#import <Foundation/NSObject.h>
@class NSArray;
@class NSDictionary;
@class NSString;
@class EOQualifier;
@class EOKeyValueArchiver;
@class EOKeyValueUnarchiver;
@class EOFetchSpecification;
@interface EOFetchSpecification : NSObject <NSCopying, NSCoding>
{
EOQualifier *_qualifier;
NSArray *_sortOrderings;
NSString *_entityName;
NSDictionary *_hints;
unsigned int _fetchLimit;
NSArray *_prefetchingRelationshipKeys;
NSArray *_rawAttributeKeys;
struct {
unsigned usesDistinct:1;
unsigned isDeep:1;
unsigned locksObjects:1;
unsigned refreshesRefetchedObjects:1;
unsigned promptsAfterFetchLimit:1;
unsigned allVariablesRequiredFromBindings:1;
unsigned :26; //padding
}_flags;
EOQualifier *_qualifier;
NSArray *_sortOrderings;
NSString *_entityName;
NSDictionary *_hints;
unsigned int _fetchLimit;
NSArray *_prefetchingRelationshipKeys;
NSArray *_rawAttributeKeys;
struct {
unsigned usesDistinct:1;
unsigned isDeep:1;
unsigned locksObjects:1;
unsigned refreshesRefetchedObjects:1;
unsigned promptsAfterFetchLimit:1;
unsigned allVariablesRequiredFromBindings:1;
unsigned :26; //padding
}_flags;
}
+ (EOFetchSpecification *)fetchSpecification;

7
EOControl/EOFetchSpecification.m
View file

@ -33,6 +33,9 @@
static char rcsId[] = "$Id$";
#import <Foundation/NSCoder.h>
#import <Foundation/NSValue.h>
#import <EOControl/EOFetchSpecification.h>
#import <EOControl/EOKeyValueArchiver.h>
#import <EOControl/EOObserver.h>
@ -162,7 +165,7 @@ setPromptsAfterFetchLimit: promptsAfterFetchLimit
setRequiresAllQualifierBindingVariables:requiresAllQualifierBindingVariables
*/
//call setXX fn instead to have "willChange" ??
ret->_qualifier = [(<NSCopying>)_qualifier copyWithZone: zone];
ret->_qualifier = [(id <NSCopying>)_qualifier copyWithZone: zone];
ret->_sortOrderings = [_sortOrderings copyWithZone: zone]; //mirko: ASSIGN(ret->_sortOrderings, _sortOrderings);
ret->_entityName = [_entityName copyWithZone: zone];
ret->_hints = [_hints copyWithZone: zone];
@ -431,7 +434,7 @@ setRequiresAllQualifierBindingVariables:requiresAllQualifierBindingVariables
- (NSDictionary *)hints
{
NSMutableDictionary *hints = _hints;
NSMutableDictionary *hints = (NSMutableDictionary *)_hints;
BOOL promptsAfterFetchLimit;
NSArray *prefetchingRelationshipKeyPaths;
unsigned fetchLimit;

7
EOControl/EOGenericRecord.h
View file

@ -29,13 +29,16 @@
#import <Foundation/NSObject.h>
@class NSString;
@class NSMutableDictionary;
@class EOClassDescription;
@class EOEditingContext;
@class EOGlobalID;
@class EOMutableKnownKeyDictionary;
@interface EOGenericRecord : NSObject
{
EOClassDescription *classDescription;
@ -54,6 +57,10 @@
+ (void)eoCalculateAllSizeWith: (NSMutableDictionary*)dict;
- (unsigned int)eoCalculateSizeWith: (NSMutableDictionary*)dict;
+ (unsigned int)eoCalculateSizeWith: (NSMutableDictionary *)dict
forArray: (NSArray *)array;
- (NSString *)debugDictionaryDescription;
@end /* EOGenericRecord */

7
EOControl/EOGenericRecord.m
View file

@ -36,11 +36,12 @@
static char rcsId[] = "$Id$";
#import <Foundation/Foundation.h>
#import <Foundation/NSArray.h>
#import <Foundation/NSDictionary.h>
#import <Foundation/NSObjCRuntime.h>
#import <Foundation/NSLock.h>
#import <Foundation/NSValue.h>
#import <Foundation/NSHashTable.h>
#import <gnustep/base/GSObjCRuntime.h>
#import <EOAccess/EOEntity.h>
@ -53,7 +54,7 @@ static char rcsId[] = "$Id$";
#import <EOControl/EOFault.h>
#import <EOControl/EOMutableKnownKeyDictionary.h>
#import <EOControl/EODebug.h>
#import <EOControl/EOKeyValueCoding.h>
@interface NSObject (EOCalculateSize)

3
EOControl/EOGlobalID.h
View file

@ -27,11 +27,12 @@
#ifndef __EOGlobalID_h__
#define __EOGlobalID_h__
#import <Foundation/Foundation.h>
#import <Foundation/NSObject.h>
extern NSString *EOGlobalIDChangedNotification;
@interface EOGlobalID : NSObject <NSCopying>
- (BOOL)isEqual:other;
- (unsigned)hash;

6
EOControl/EOGlobalID.m
View file

@ -33,11 +33,15 @@
static char rcsId[] = "$Id$";
#import <EOControl/EOControl.h>
#import <Foundation/NSCoder.h>
#import <Foundation/NSString.h>
#import <EOControl/EOGlobalID.h>
#include <time.h>
#include <unistd.h>
NSString *EOGlobalIDChangedNotification = @"EOGlobalIDChangedNotification";

1
EOControl/EOKeyComparisonQualifier.m
View file

@ -41,6 +41,7 @@ static char rcsId[] = "$Id$";
#import <EOControl/EOKeyValueCoding.h>
#import <EOControl/EODebug.h>
@implementation EOKeyComparisonQualifier
+ (EOQualifier *)qualifierWithLeftKey: (NSString *)leftKey

1
EOControl/EOKeyGlobalID.h
View file

@ -29,6 +29,7 @@
#import <EOControl/EOGlobalID.h>
@interface EOKeyGlobalID : EOGlobalID <NSCoding>
{
unsigned short _keyCount;

4
EOControl/EOKeyGlobalID.m
View file

@ -33,6 +33,10 @@
static char rcsId[] = "$Id$";
#import <Foundation/NSString.h>
#import <Foundation/NSCoder.h>
#import <Foundation/NSArray.h>
#import <EOControl/EOKeyGlobalID.h>
#import <EOControl/EODebug.h>
#import <EOControl/EONull.h>

16
EOControl/EOKeyValueArchiver.h
View file

@ -28,7 +28,15 @@
#define __EOKeyValueArchiving_h__
#import <Foundation/Foundation.h>
#import <Foundation/NSObject.h>
#import <Foundation/NSHashTable.h>
@class NSArray;
@class NSDictionary;
@class NSMutableDictionary;
@class NSString;
@interface EOKeyValueArchiver : NSObject
{
@ -77,12 +85,12 @@ referenceToEncodeForObject: (id)object;
@interface EOKeyValueUnarchiver : NSObject
{
NSDictionary* _propertyList;
NSDictionary *_propertyList;
id _parent;
id _nextParent;
NSMutableArray* _allUnarchivedObjects;
NSMutableArray *_allUnarchivedObjects;
id _delegate;
NSHashTable* _awakenedObjects;
NSHashTable *_awakenedObjects;
}
- (id)initWithDictionary: (NSDictionary *)dictionary;

2
EOControl/EOKeyValueArchiver.m
View file

@ -34,7 +34,7 @@
static char rcsId[] = "$Id$";
#import <Foundation/Foundation.h>
#import <EOControl/EOControl.h>
#import <EOControl/EOKeyValueArchiver.h>

3
EOControl/EOKeyValueCoding.m
View file

@ -52,13 +52,12 @@ static char rcsId[] = "$Id$";
#import <Foundation/NSDecimalNumber.h>
#import <Foundation/NSDebug.h>
#include <Foundation/NSException.h>
#include <objc/objc-api.h>
#import <EOControl/EOControl.h>
#import <EOControl/EOKeyValueCoding.h>
#import <EOControl/EONSAddOns.h>
#import <EOControl/EODebug.h>
#import <EOControl/EONull.h>
/*

3
EOControl/EOKeyValueCodingBase.h
View file

@ -28,11 +28,12 @@
#define __EOKeyValueCoding_h__
#if !FOUNDATION_HAS_KVC
#import <Foundation/NSObject.h>
#import <Foundation/NSArray.h>
@class NSDictionary;
@class NSDictionary;
@interface NSObject (EOKeyValueCodingPrimitives)

2
EOControl/EOKeyValueCodingBase.m
View file

@ -48,8 +48,8 @@ static char rcsId[] = "$Id$";
#import <Foundation/NSUtilities.h>
#import <Foundation/NSDecimalNumber.h>
#import <Foundation/NSDebug.h>
#import <Foundation/NSException.h>
#include <Foundation/NSException.h>
#include <objc/objc-api.h>
#include "config.h"

1
EOControl/EOKeyValueQualifier.m
View file

@ -45,6 +45,7 @@ static char rcsId[] = "$Id$";
#import <EOControl/EOEditingContext.h>
#import <EOControl/EODebug.h>
@implementation EOKeyValueQualifier
+ (EOKeyValueQualifier *)qualifierWithKey: (NSString *)key

13
EOControl/EOMutableKnownKeyDictionary.h
View file

@ -27,11 +27,20 @@
#ifndef __EOMultipleKnownKeyDictionary_h__
#define __EOMultipleKnownKeyDictionary_h__
#import <Foundation/Foundation.h>
#include <gnustep/base/GCObject.h>
#import <Foundation/NSObject.h>
#import <Foundation/NSEnumerator.h>
#import <Foundation/NSZone.h>
#import <gnustep/base/GCObject.h>
@class NSArray;
@class NSDictionary;
@class NSMutableDictionary;
@class EOMutableKnownKeyDictionary;
@interface EOMKKDInitializer : GCObject
{
unsigned int _count;

1
EOControl/EOMutableKnownKeyDictionary.m
View file

@ -35,7 +35,6 @@ static char rcsId[] = "$Id$";
#import <Foundation/Foundation.h>
#import <EOControl/EOControl.h>
#import <EOControl/EOMutableKnownKeyDictionary.h>
#import <EOControl/EODebug.h>

6
EOControl/EONSAddOns.h
View file

@ -27,7 +27,11 @@
#ifndef __EONSAddOns_h__
#define __EONSAddOns_h__
#import <Foundation/Foundation.h>
#import <Foundation/NSObject.h>
#import <Foundation/NSString.h>
@class NSArray;
@interface NSObject (NSObjectPerformingSelector)

1
EOControl/EONotQualifier.m
View file

@ -39,6 +39,7 @@ static char rcsId[] = "$Id$";
#import <EOControl/EOQualifier.h>
@implementation EONotQualifier
+ (EOQualifier *)qualifierWithQualifier: (EOQualifier *)qualifier

1
EOControl/EONull.h
View file

@ -29,6 +29,7 @@
#import <Foundation/NSObject.h>
@interface EONull : NSObject <NSCopying>
+ null;
@end /* EONull */

2
EOControl/EONull.m
View file

@ -38,8 +38,8 @@ static char rcsId[] = "$Id$";
#import <Foundation/NSNull.h>
#import <Foundation/NSString.h>
#import <EOControl/EOControl.h>
#import <EOControl/EONull.h>
#include "config.h"

7
EOControl/EOObjectStore.h
View file

@ -27,7 +27,12 @@
#ifndef __EOObjectStore_h__
#define __EOObjectStore_h__
#import <Foundation/Foundation.h>
#import <Foundation/NSObject.h>
@class NSArray;
@class NSDictionary;
@class NSString;
@class EOEditingContext;
@class EOGlobalID;

3
EOControl/EOObjectStore.m
View file

@ -33,7 +33,8 @@
static char rcsId[] = "$Id$";
#import <EOControl/EOControl.h>
#import <Foundation/NSString.h>
#import <EOControl/EOObjectStore.h>

9
EOControl/EOObjectStoreCoordinator.h
View file

@ -26,13 +26,20 @@
#ifndef __EOObjectStoreCoordinator_h__
#define __EOObjectStoreCoordinator_h__
#import <Foundation/Foundation.h>
#import <EOControl/EOObjectStore.h>
@class NSArray;
@class NSMutableArray;
@class NSDictionary;
@class NSString;
@class EOCooperatingObjectStore;
@class EOQualifier;
@class EOModelGroup;
@interface EOObjectStoreCoordinator:EOObjectStore
{
NSMutableArray *_stores;

1
EOControl/EOObjectStoreCoordinator.m
View file

@ -35,6 +35,7 @@ static char rcsId[] = "$Id$";
#import <Foundation/Foundation.h>
#import <EOControl/EOObjectStoreCoordinator.h>
#import <EOControl/EOEditingContext.h>
#import <EOAccess/EODatabaseContext.h>
#import <EOAccess/EOModelGroup.h>

33
EOControl/EOObserver.h
View file

@ -27,7 +27,12 @@
#ifndef __EOObserver_h__
#define __EOObserver_h__
#import <Foundation/Foundation.h>
#import <Foundation/NSObject.h>
@class NSArray;
@interface NSObject (EOObserver)
@ -75,10 +80,12 @@ typedef enum {
EOObserverPrioritySixth,
EOObserverPriorityLater
} EOObserverPriority;
#define EOObserverNumberOfPriorities ((unsigned)EOObserverPriorityLater + 1)
@interface EODelayedObserver : NSObject <EOObserving> {
@interface EODelayedObserver : NSObject <EOObserving>
{
@public
EODelayedObserver *_next; // linked list. Nil if not on list.
}
@ -97,17 +104,18 @@ typedef enum {
@end
// used with NSRunLoop's performSelector:target:argument:order:modes:
enum {
EOFlushDelayedObserversRunLoopOrdering = 400000
enum
{
EOFlushDelayedObserversRunLoopOrdering = 400000
};
@interface EODelayedObserverQueue : NSObject
{
EODelayedObserver *_queue[EOObserverNumberOfPriorities]; // lists for each priority
unsigned _highestNonEmptyQueue;
BOOL _haveEntryInNotificationQueue;
NSArray *_modes;
EODelayedObserver *_queue[EOObserverNumberOfPriorities]; // lists for each priority
unsigned _highestNonEmptyQueue;
BOOL _haveEntryInNotificationQueue;
NSArray *_modes;
}
+ (EODelayedObserverQueue *)defaultObserverQueue;
@ -123,10 +131,11 @@ enum {
@end
@interface EOObserverProxy : EODelayedObserver {
id _target;
SEL _action;
EOObserverPriority _priority;
@interface EOObserverProxy : EODelayedObserver
{
id _target;
SEL _action;
EOObserverPriority _priority;
}
- initWithTarget: (id)target

2
EOControl/EOObserver.m
View file

@ -37,12 +37,12 @@ static char rcsId[] = "$Id$";
#import <Foundation/NSMapTable.h>
#import <Foundation/NSNotification.h>
#import <EOControl/EOControl.h>
#import <EOControl/EOClassDescription.h>
#import <EOControl/EOKeyValueCoding.h>
#import <EOControl/EONull.h>
#import <EOControl/EOObserver.h>
@implementation NSObject (EOObserver)
- (void)willChange

2
EOControl/EOOrQualifier.m
View file

@ -38,9 +38,9 @@ static char rcsId[] = "$Id$";
#import <Foundation/NSUtilities.h>
#import <Foundation/NSString.h>
#import <EOControl/EOControl.h>
#import <EOControl/EOQualifier.h>
@implementation EOOrQualifier
+ (EOQualifier *)qualifierWithQualifierArray: (NSArray *)array

7
EOControl/EOQualifier.h
View file

@ -27,10 +27,15 @@
#ifndef __EOQualifier_h__
#define __EOQualifier_h__
#import <Foundation/Foundation.h>
#import <Foundation/NSObject.h>
#import <EOControl/EOKeyValueArchiver.h>
@class NSArray;
@class NSDictionary;
@class NSString;
@class EOClassDescription;
@class EOSQLExpression;
@class EOQualifier;

6
EOControl/EOQualifier.m
View file

@ -39,14 +39,16 @@ static char rcsId[] = "$Id$";
#import <Foundation/NSDictionary.h>
#import <Foundation/NSSet.h>
#import <Foundation/NSUtilities.h>
#import <Foundation/NSException.h>
#import <Foundation/NSValue.h>
#import <Foundation/NSCoder.h>
#import <EOControl/EOControl.h>
#import <EOControl/EOQualifier.h>
#import <EOControl/EODebug.h>
@implementation NSNumber (EOQualifierExtras)
- (id)initWithString:(NSString *)string
{
double dVal;

3
EOControl/EOSortOrdering.h
View file

@ -28,7 +28,8 @@
#define __EOSortOrdering_h__
#import <Foundation/Foundation.h>
#import <Foundation/NSObject.h>
#import <Foundation/NSArray.h>
#import <EOControl/EONull.h>

4
EOControl/EOSortOrdering.m
View file

@ -33,9 +33,11 @@
static char rcsId[] = "$Id$";
#import <EOControl/EOControl.h>
#import <Foundation/NSCoder.h>
#import <EOControl/EOSortOrdering.h>
#import <EOControl/EOKeyValueCoding.h>
#import <EOControl/EOKeyValueArchiver.h>
@implementation EOSortOrdering

1
EOControl/EOUndoManager.h
View file

@ -26,6 +26,7 @@
#import <Foundation/NSUndoManager.h>
@interface EOUndoManager : NSUndoManager
- (void) forgetAllWithTarget: (id)param0;

Some files were not shown because too many files have changed in this diff Show more