mirror of
https://github.com/gnustep/libs-gdl2.git
synced 2025-02-21 02:20:55 +00:00
* *.h/m, *.h/m): Used #include instead of depricated #import. Avoid including entire library headers. Use export macro where applicable. * EOControl/GNUmakefile: Removed EOKeyValueCodingBase.m/h and EOUndoMananger.h. Added EOArrayDataSource.m/h, EODefines.h and EODepricated.h. * EOControl/EODefines.h: Updated for GDL2 & gnustep-make. * EOControl/EODebug.h: Updated. * EOControl/EODepricated.h: Updated for current state of GDL2. ([NSObject +flushClassKeyBindings]): Added declaration. ([EOClassDescription +setDelegate:]): Added declaration. ([EOClassDescription +delegate]): Added declaration. (EOUndoManager): Moved declaration of interface here. * EOControl/EOKeyValueCoding.m ([EOClassDescription +flushClassKeyBindings]): Added empty implementation. ([NSObject takeStoredValuesFromDictionary:]): Cache EONull instance and use it instead of isKindOfClass:. * EOControl/EOEditingContext.m ([EOEditingContext +initialize]): Tidied. ([EOEditingContest -deleteObject]): Use NSUndoManager instead of EOUndoManager. * EOControl/EOQualifier.m ([NSArray -filteredArrayUsingQualifier:]): Added minor optimization tweak. * EOControl/EOClassDescription.m: Removed inactive commented code. Added private declerations of EOAccess methods to avoid compiler warnings. ([EOClassDescription +initialize]): Tidied. ([EOClassDescription -classDescriptionForClass:]): Use GSObjCName() instead of objc runtime routines. * EOControl/EOFault.m: Exchanged direct usages of ObjC runtime routines with NS/GSObjCRuntime abstraction API. ([EOFault +superclass]): Ditto. ([EOFault +targetClassForFault:]): Ditto. ([EOFault -respondsToSelector:]): Ditto. ([EOFault +initialize]): Cache static class variable. ([EOFault +isKindOfClass]): Use static class variable. ([EOFault +handlerForFault:]): Ditto. ([EOFault +targetClassForFault:]): Ditto. ([EOFault -dealloc]): Ditto. * EOControl/EOGenericRecord.m: ([EOGenericRecord +initialize]): Tidied. * EOControl/EOKeyComparisonQualifier.m: Tidied documentation. * EOControl/EOKeyValueQualifier.m: Ditto. * EOControl/EONSAddOns.h/m: Added declarations to surpress compiler warnings. ([NSObject -eoCompareOnName:]): Adjusted casts to surpress compiler warnings. (GSUseStrictWO451Compatibility): Added function. (GDL2GlobalLock, GDL2GlobalRecursive): Ditto. * EOControl/EONull: Remove implementations for foundation libraries without key value coding and fully rely on NSNull. Added assertions in all intance methods as instances should never be created. ([EONull +allocWithZone:]) Corrected method name so it will actually be used. * EOControl/EOSortOrdering.m ([NSArray sortedArrayUsingKeyOrderArray:]): Tidied. ([NSMutableArray sortUsingKeyOrderArray:]): Ditto. ([EONull compareAscending:]): Sync with referencs implementation. ([EONull compareDescending:]): Ditto. ([EONull compareCaseInsensitiveAscending:]): Ditto. ([EONull compareCaseInsensitiveDescending:]): Ditto. * EOAccess/EOAdaptor.h: Added comment about API compatibility. * EOAccess/EOAdaptor.m ([EOAdaptor -contexts]): Return array of adaptor contexts rather tham GC-wrapper objects containing adaptor contexts. ([EOAdaptor -databaseEncoding]): Use GSEncodingName() instead of GetEncodingName(). * EOAccess/EODatabaseContext.m ([EODatabaseContext -_turnFault:gid:editingContext:isComplete:]): Use GSObjCClass() instead of trying to access isa by dereferencing from id with incorrect member. * EOAccess/EOModel.m ([EOModel -entityNames]): Sort returned array to insure comparable output. * EOAccess/EOSQLExpression.m ([EOSQLExpression sqlStringForArrayOfQualifiers:operation:]): Added cast to surpress compiler warning. * EOAccess/EOUtilities.m ([EOObjectStoreCoordinator setModelGroup:]): Ditto. * EOAccess/EORelationship.h ([EORelationship -docComment]): Added declaration. * EOAccess/GNUmakefile: Added EODefines.h and EODepricated.h. * Tools/*.m: Use RCS_ID macro. * Tools/EOAttribute+GSDoc.h: ([EOAttribute gsdocContentWithTagName:idPtr:]): Corrected Typo. * Tools/EOModel+GSDoc.h/m: ([EOModel gsdocContentSplittedByEntities:idPtr:]): Ditto. * Tools/EORelationship+GSDoc.m: ([EORelationship gsdocContentWithTagName:idPtr:]): Change variable type to supress compiler warnings. * Tools/eoutil.m (dump): Initialize variables to supress compiler warnings. * Tools/gsdoc-model.m: Include GSCategories.h to supress compiler warnings. (main): Added cast to supress compiler warning. Fixed typo in method invocation. 2003-03-25 Stephane Corthesy <stephane@sente.ch> * EOControl/EODefines.h: Added new file for export/win32 support. * EOControl/EODepricated.h: Added new file for depricated features. * EOControl/EOControl.h: Added EOArrayDataSource.h and EODefines.h. * EOControl/EOArrayDataSource.h/m: Added new files. Some methods (<NSCoding> and qualifier bindings) are empty stubs. * EOControl/EODebug.h: Use export macro instead of explicit extern for function and symbol declarations. * EOControl/EOGlobalID.h: Ditto. * EOControl/EONull.h: Ditto. * EOControl/EOObjectStore.h: Ditto. * EOControl/EOOrQualifier.m: Replaced autorelease by AUTORELEASE and fixed typo. * EOControl/EOQualifier.m ([NSArray -filteredArrayUsingQualifier:]): Implemented. * EOControl/EONSAddOns.m: Use volatile in some exception handlers (man longjmp for more info). * EOControl/EOSortOrdering.h/m ([EOSortOrdering -copyWithZone:]): Implemented <NSCopying>. ([EOSortOrdering -encodeWithKeyValueArchiver:]): Implemented. * EOAccess/EODefines.h: Added new file for export/win32 support. * EOAccess/EODepricated.h: Added new file for depricated features. * EOAccess/EOAccess.h: Added EODefines.h. * EOAccess/EOSQLExpression.h/m: Fixed typo for EOPrimaryKeyConstraintKey. * EOAccess/EOExpressionArray.h/m: Use volatile for variables usein in exception handlers. (man longjmp for more info) * EOAccess/EODatabase.h: Use export macro instead of explicit extern for function and symbol declarations. * EOAccess/EOEntity.h: Ditto. * EOAccess/EOModel.h: Ditto. * EOAccess/EOSchemaGeneration.h: Ditto. * EOAccess/EOSQLExpression.h: Ditto. * EOAccess/EOUtilities.h: Ditto. * Tools/eoutil.m (dump): Implemented use of -postinstall option. Corrected bug when getting adaptor's expression class. Renamed symbol EOPrimaryKeyContraintsKey into EOPrimaryKeyConstraintsKey. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@16298 72102866-910b-0410-8b05-ffd578937521
409 lines
9.5 KiB
Objective-C
409 lines
9.5 KiB
Objective-C
/**
|
|
EOExpressionArray.m <title>EOExpressionArray</title>
|
|
|
|
Copyright (C) 1996-2002 Free Software Foundation, Inc.
|
|
|
|
Author: Ovidiu Predescu <ovidiu@bx.logicnet.ro>
|
|
Date: September 1996
|
|
|
|
Author: Mirko Viviani <mirko.viviani@rccr.cremona.it>
|
|
Date: February 2000
|
|
|
|
$Revision$
|
|
$Date$
|
|
|
|
<abstract></abstract>
|
|
|
|
This file is part of the GNUstep Database Library.
|
|
|
|
<license>
|
|
This library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2 of the License, or (at your option) any later version.
|
|
|
|
This library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with this library; see the file COPYING.LIB.
|
|
If not, write to the Free Software Foundation,
|
|
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
</license>
|
|
**/
|
|
|
|
#include "config.h"
|
|
|
|
RCS_ID("$Id$")
|
|
|
|
#include <ctype.h>
|
|
|
|
#ifndef NeXT_Foundation_LIBRARY
|
|
#include <Foundation/NSString.h>
|
|
#include <Foundation/NSAutoreleasePool.h>
|
|
#include <Foundation/NSValue.h>
|
|
#include <Foundation/NSDate.h>
|
|
#include <Foundation/NSException.h>
|
|
#include <Foundation/NSDebug.h>
|
|
#else
|
|
#include <Foundation/Foundation.h>
|
|
#endif
|
|
|
|
#include <gnustep/base/GSObjCRuntime.h>
|
|
|
|
#include <EOControl/EODebug.h>
|
|
|
|
#include <EOAccess/EOEntity.h>
|
|
#include <EOAccess/EOExpressionArray.h>
|
|
#include <EOAccess/EORelationship.h>
|
|
|
|
|
|
@implementation EOExpressionArray
|
|
|
|
+ (void) initialize
|
|
{
|
|
static BOOL initialized = NO;
|
|
|
|
if (!initialized)
|
|
{
|
|
initialized = YES;
|
|
GSObjCAddClassBehavior(self, [GCArray class]);
|
|
}
|
|
}
|
|
|
|
+ (EOExpressionArray*)expressionArray
|
|
{
|
|
return [[self new] autorelease];
|
|
}
|
|
|
|
- (id) init
|
|
{
|
|
EOFLOGObjectFnStart();
|
|
|
|
self = [super init];
|
|
|
|
EOFLOGObjectFnStop();
|
|
|
|
return self;
|
|
}
|
|
|
|
+ (EOExpressionArray*)expressionArrayWithPrefix: (NSString *)prefix
|
|
infix: (NSString *)infix
|
|
suffix: (NSString *)suffix
|
|
{
|
|
return [[[self alloc]initWithPrefix: prefix
|
|
infix: infix
|
|
suffix: suffix] autorelease];
|
|
}
|
|
|
|
- (id)initWithPrefix: (NSString *)prefix
|
|
infix: (NSString *)infix
|
|
suffix: (NSString *)suffix
|
|
{
|
|
EOFLOGObjectFnStart();
|
|
|
|
if ((self = [self init]))
|
|
{
|
|
ASSIGN(_prefix, prefix);
|
|
ASSIGN(_infix, infix);
|
|
ASSIGN(_suffix, suffix);
|
|
}
|
|
|
|
EOFLOGObjectFnStop();
|
|
|
|
return self;
|
|
}
|
|
|
|
- (void)dealloc
|
|
{
|
|
DESTROY(_realAttribute); //TODO mettere nei metodi GC
|
|
// DESTROY(_definition);
|
|
[_prefix release];
|
|
[_infix release];
|
|
[_suffix release];
|
|
|
|
[super dealloc];
|
|
}
|
|
|
|
- (BOOL)referencesObject: (id)anObject
|
|
{
|
|
return [self indexOfObject: anObject] != NSNotFound;
|
|
}
|
|
|
|
- (NSString *)expressionValueForContext: (id<EOExpressionContext>)ctx
|
|
{
|
|
if (ctx && [self count]
|
|
&& [[self objectAtIndex: 0] isKindOfClass: [EORelationship class]])
|
|
return [ctx expressionValueForAttributePath: self];
|
|
else
|
|
{
|
|
int i, count = [self count];
|
|
id result = [[NSMutableString new] autorelease];
|
|
SEL sel = @selector(appendString:);
|
|
IMP imp = [result methodForSelector: sel];
|
|
|
|
if (_prefix)
|
|
[result appendString:_prefix];
|
|
|
|
if (count)
|
|
{
|
|
(*imp)(result, sel, [[self objectAtIndex: 0]
|
|
expressionValueForContext: ctx]);
|
|
|
|
for (i = 1 ; i < count; i++)
|
|
{
|
|
if (_infix)
|
|
(*imp)(result, sel, _infix);
|
|
(*imp)(result, sel, [[self objectAtIndex: i]
|
|
expressionValueForContext: ctx]);
|
|
}
|
|
}
|
|
|
|
if(_suffix)
|
|
[result appendString: _suffix];
|
|
|
|
return result;
|
|
}
|
|
}
|
|
|
|
- (void)setPrefix: (NSString *)prefix
|
|
{
|
|
ASSIGN(_prefix, prefix);
|
|
}
|
|
|
|
- (void)setInfix: (NSString *)infix
|
|
{
|
|
ASSIGN(_infix, infix);
|
|
}
|
|
|
|
- (void)setSuffix: (NSString *)suffix
|
|
{
|
|
ASSIGN(_suffix, suffix);
|
|
}
|
|
|
|
- (NSString *)prefix
|
|
{
|
|
return _prefix;
|
|
}
|
|
|
|
- (NSString *)infix
|
|
{
|
|
return _infix;
|
|
}
|
|
|
|
- (NSString *)suffix
|
|
{
|
|
return _suffix;
|
|
}
|
|
|
|
- (NSString *)definition
|
|
{
|
|
// return _definition;
|
|
return [self valueForSQLExpression: nil];
|
|
}
|
|
|
|
- (BOOL)isFlattened
|
|
{
|
|
// return _flags.isFlattened;
|
|
return ([self count] > 1);
|
|
}
|
|
|
|
- (EOAttribute *)realAttribute
|
|
{
|
|
return _realAttribute;
|
|
}
|
|
|
|
/*
|
|
+ (EOExpressionArray *)parseExpression:(NSString *)expression
|
|
entity:(EOEntity *)entity
|
|
replacePropertyReferences:(BOOL)replacePropertyReferences
|
|
{
|
|
EOExpressionArray *array = nil;
|
|
const char *s = NULL;
|
|
const char *start=NULL;
|
|
id objectToken=nil;
|
|
EOFLOGObjectFnStart();
|
|
NSDebugMLLog(@"gsdb",@"expression=%@",expression);
|
|
NSDebugMLLog(@"gsdb",@"entity=%@",entity);
|
|
|
|
array = [[EOExpressionArray new] autorelease];
|
|
s = [expression cString];
|
|
|
|
// ASSIGN(array->_definition, expression);
|
|
array->_flags.isFlattened = NO;
|
|
|
|
if([expression isNameOfARelationshipPath])
|
|
{
|
|
NSArray *defArray;
|
|
NSString *realAttributeName;
|
|
int count, i;
|
|
|
|
array->_flags.isFlattened = YES;
|
|
defArray = [expression componentsSeparatedByString:@"."];
|
|
count = [defArray count];
|
|
|
|
for(i = 0; i < count - 1; i++)
|
|
{
|
|
id relationshipName = [defArray objectAtIndex:i];
|
|
id relationship=nil;
|
|
|
|
relationship = [entity relationshipNamed:relationshipName];
|
|
|
|
if(!relationship)
|
|
[NSException raise:NSInvalidArgumentException
|
|
format:@"%@ -- %@ 0x%x: '%@' for entity '%@' is an invalid property",
|
|
NSStringFromSelector(_cmd),
|
|
NSStringFromClass([self class]),
|
|
self,
|
|
relationshipName,
|
|
entity];
|
|
|
|
// if([relationship isToMany])
|
|
// [NSException raise:NSInvalidArgumentException format:@"%@ -- %@ 0x%x: '%@' for entity '%@' must be a to one relationship",
|
|
//NSStringFromSelector(_cmd),
|
|
//NSStringFromClass([self class]),
|
|
//self,
|
|
//relationshipName,
|
|
//entity];
|
|
|
|
[array addObject:relationship];
|
|
entity = [relationship destinationEntity];
|
|
}
|
|
realAttributeName = [defArray lastObject];
|
|
ASSIGN(array->_realAttribute, [entity attributeNamed:realAttributeName]);
|
|
|
|
if(!array->_realAttribute)
|
|
ASSIGN(array->_realAttribute, [entity relationshipNamed:realAttributeName]);
|
|
|
|
if(!array->_realAttribute)
|
|
[NSException raise:NSInvalidArgumentException
|
|
format:@"%@ -- %@ 0x%x: '%@' for entity '%@' is an invalid property",
|
|
NSStringFromSelector(_cmd),
|
|
NSStringFromClass([self class]),
|
|
self,
|
|
realAttributeName,
|
|
entity];
|
|
|
|
[array addObject:array->_realAttribute];
|
|
}
|
|
else
|
|
{
|
|
//IN eoentity persedescr
|
|
}
|
|
NSDebugMLLog(@"gsdb",@"_prefix=%@",array->_prefix);
|
|
NSDebugMLLog(@"gsdb",@"_infix=%@",array->_infix);
|
|
NSDebugMLLog(@"gsdb",@"_suffix=%@",array->_suffix);
|
|
// NSDebugMLLog(@"gsdb",@"_definition=%@",array->_definition);
|
|
NSDebugMLLog(@"gsdb",@"_realAttribute=%@",array->_realAttribute);
|
|
|
|
EOFLOGObjectFnStop();
|
|
return array;
|
|
}
|
|
*/
|
|
|
|
- (BOOL)_isPropertyPath
|
|
{
|
|
/*
|
|
int i=0;
|
|
int count=0;
|
|
|
|
count=[self count];
|
|
objectAtIndex:i
|
|
if it's a string return NO
|
|
*/
|
|
//TODO
|
|
|
|
return NO;
|
|
}
|
|
|
|
- (NSString *)valueForSQLExpression: (EOSQLExpression*)sqlExpression
|
|
{
|
|
//TODO verify
|
|
NSMutableString *value = [NSMutableString string];
|
|
volatile int i;
|
|
int count;
|
|
|
|
NS_DURING //Just for debugging
|
|
{
|
|
count = [self count];
|
|
|
|
for(i = 0; i < count; i++)
|
|
{
|
|
id obj = [self objectAtIndex: i];
|
|
NSString *relValue;
|
|
|
|
relValue = [obj valueForSQLExpression: sqlExpression];
|
|
|
|
if (i > 0)
|
|
[value appendString: @"."];
|
|
|
|
[value appendString: relValue];
|
|
}
|
|
}
|
|
NS_HANDLER
|
|
{
|
|
NSLog(@"exception in EOExpressionArray valueForSQLExpression: self=%p class=%@ i=%d", self, [self class], i);
|
|
NSLog(@"exception in EOExpressionArray valueForSQLExpression: self=%@ class=%@ i=%d", self, [self class], i);
|
|
NSLog(@"exception=%@", localException);
|
|
|
|
[localException raise];
|
|
}
|
|
NS_ENDHANDLER;
|
|
|
|
return value;
|
|
}
|
|
@end /* EOExpressionArray */
|
|
|
|
|
|
@implementation NSObject (EOExpression)
|
|
|
|
- (NSString*)expressionValueForContext: (id<EOExpressionContext>)ctx
|
|
{
|
|
if ([self respondsToSelector: @selector(stringValue)])
|
|
return [(id)self stringValue];
|
|
else
|
|
return [self description];
|
|
}
|
|
|
|
@end
|
|
|
|
|
|
@implementation NSString (EOExpression)
|
|
|
|
/* Avoid returning the description in case of NSString because if the string
|
|
contains whitespaces it will be quoted. Particular adaptors have to override
|
|
-formatValue:forAttribute: and they have to quote with the specific
|
|
database character the returned string. */
|
|
- (NSString*)expressionValueForContext: (id<EOExpressionContext>)ctx
|
|
{
|
|
return self;
|
|
}
|
|
|
|
@end
|
|
|
|
@implementation NSString (EOAttributeTypeCheck)
|
|
|
|
- (BOOL)isNameOfARelationshipPath
|
|
{
|
|
const char *s = [self cString];
|
|
BOOL result = NO;
|
|
|
|
if (isalnum(*s) || *s == '@' || *s == '_' || *s == '#')
|
|
{
|
|
for (++s; *s; s++)
|
|
{
|
|
if (!isalnum(*s) && *s != '@' && *s != '_' && *s != '#' && *s != '$'
|
|
&& *s != '.')
|
|
return NO;
|
|
|
|
if (*s == '.')
|
|
result = YES;
|
|
}
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
@end
|