2002-11-15 22:57:05 +00:00
|
|
|
/**
|
|
|
|
EOSQLQualifier.m <title>EOSQLQualifier Class</title>
|
|
|
|
|
|
|
|
Copyright (C) 2002 Free Software Foundation, Inc.
|
|
|
|
|
2004-11-03 12:03:14 +00:00
|
|
|
Author: Manuel Guesdon <mguesdon@orange-concept.com>
|
2002-11-15 22:57:05 +00:00
|
|
|
Date: February 2002
|
|
|
|
|
|
|
|
$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>
|
|
|
|
**/
|
|
|
|
|
2002-12-31 16:25:21 +00:00
|
|
|
#include "config.h"
|
|
|
|
|
|
|
|
RCS_ID("$Id$")
|
2002-11-15 22:57:05 +00:00
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <string.h>
|
|
|
|
|
2004-03-19 16:41:21 +00:00
|
|
|
#ifdef GNUSTEP
|
2003-03-31 00:24:15 +00:00
|
|
|
#include <Foundation/NSDictionary.h>
|
|
|
|
#include <Foundation/NSSet.h>
|
|
|
|
#include <Foundation/NSUtilities.h>
|
|
|
|
#include <Foundation/NSException.h>
|
|
|
|
#include <Foundation/NSDebug.h>
|
|
|
|
#else
|
|
|
|
#include <Foundation/Foundation.h>
|
|
|
|
#endif
|
|
|
|
|
2003-07-11 19:04:05 +00:00
|
|
|
#ifndef GNUSTEP
|
2003-08-25 20:01:59 +00:00
|
|
|
#include <GNUstepBase/GNUstep.h>
|
2004-01-29 13:23:22 +00:00
|
|
|
#include <GNUstepBase/GSCategories.h>
|
2003-07-11 19:04:05 +00:00
|
|
|
#endif
|
|
|
|
|
2003-03-31 00:24:15 +00:00
|
|
|
#include <EOAccess/EOSQLQualifier.h>
|
|
|
|
#include <EOAccess/EOAttribute.h>
|
|
|
|
#include <EOAccess/EORelationship.h>
|
|
|
|
#include <EOAccess/EOJoin.h>
|
|
|
|
#include <EOAccess/EOEntity.h>
|
|
|
|
#include <EOAccess/EOSQLExpression.h>
|
|
|
|
|
|
|
|
#include <EOControl/EOQualifier.h>
|
|
|
|
#include <EOControl/EOEditingContext.h>
|
|
|
|
#include <EOControl/EOObjectStoreCoordinator.h>
|
|
|
|
#include <EOControl/EONull.h>
|
|
|
|
#include <EOControl/EODebug.h>
|
COmmit Part 2
* EOAccess/EOAdaptor.m:
o optimization in 'for' loops
* EOAccess/EODatabase.m:
o include <EOCOntrol/EOPriv.h>
o replaced isNilOrEONull() by _isNilOrEONull()
* EOAccess/EODatabaseContext.h:
o added _snapshotForGlobalIDIMP
* EOAccess/EODatabaseContext.m:
o commented NSEmitTODO in
-objectsForSourceGlobalID:relationshipName:editingContext:
o added beter exception format in
qualifierForLockingAttributes:primaryKeyAttributes:entity:snapshot:
o fix compiler warning in -relayPrimaryKey:object:entity:
o logs
o optimizations in -objectsWithFetchSpecification:editingContext:
o replaced isNilOrEONull() by _isNilOrEONull()
o replace [EOFault isFault:] by _isFault()
o use _snapshotForGlobalIDIMP
o IMP usage optimization
* EOAccess/EOAttribute.[hm]:
o added EOAdaptorUnknownType
o added _adaptorValueType and avoid recomputing it each time
o added _valueTypeChar to avoid string comparaisons
o use EOPriv classes declarations
o Temporary reverted David changes in
-adaptorValueByConvertingAttributeValue
* EOAccess/EOAttributePriv.h:
o added _valueTypeChar to avoid string comparaisons
* EOAccess/EOEntityPriv.h:
o moved -attributeForPath: and -relationshipForPath: to
EOEntityGDL2Additions category
* EOAccess/EOEntity.h:
o moved private -attributeForPath: and -relationshipForPath: to
EOEntityGDL2Additions category
* EOAccess/EOEntity.m:
o better exception in classProperties
o fix compiler warning in -setClassProperties:,
-setPrimaryKeyAttributes:,
-setAttributesUsedForLocking:
o moved -attributeForPath: and -relationshipForPath: to
EOEntityGDL2Additions category
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOAccess/EOSQLExpression.m:
o optimization in -tableListWithRootEntity:
o optimization in -formatSQLString:format:
o optimization in +sqlPatternFromShellPattern:
o optimization in +sqlPatternFromShellPattern:withEscapeCharacter:
o fix in -sqlStringForKeyValueQualifier:
o added log in -sqlStringForKeyValueQualifier: for not handled
readFormat
o added log -addInsertListAttribute:value: for not handled
writeFormat
o added log -addUpdateListAttribute:value: for not handled
writeFormat
o changed EOFLOGObjectFnStart to EOFLOGObjectFnStartCond
o changed EOFLOGObjectFnStop to EOFLOGObjectFnStopCond
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOAccess/EOSQLQualifier.m:
o implemented EOKeyComparisonQualifier
-schemaBasedQualifierWithRootEntity
* EOAccess/EOUtilities.m:
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOControl/EOPriv.[hm]:
o added. Contains various classes/selectors/IMPs
* EOControl/EOClassDescription.m:
o handle EONull case in -propagateDeleteForObject:editingContext:,
-addObject:toPropertyWithKey:, -snapshot,
-removeObject:fromPropertyWithKey:,
_setObject:forBothSidesOfRelationshipWithKey:,
addObject:toBothSidesOfRelationshipWithKey:,
-removeObject:fromBothSidesOfRelationshipWithKey:
o fix compiler warning in
-dictionaryForInstanceProperties, -shallowCopy,
-updateFromSnapshot:, -snapshot
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
o replaced isNilOrEONull() by _isNilOrEONull()
o fix in -validateForSave
o rewritten -validateValue:forKey: selector build
* EOControl/EOEditingContext.h:
o added -hasUnprocessedChanges
* EOControl/EOEditingContext.m:
o added -hasUnprocessedChanges
o added NS_DURING,... to catch exceptions
o replace [EOFault isFault:] by _isFault()
o IMP usage optimization
* EOControl/EOKeyGlobalID.m:
o replaced isNilOrEONull() by _isNilOrEONull()
o include <EOCOntrol/EOPriv.h>
* EOControl/EOGenericRecord.m:
o partially rewritten -description
o include <EOCOntrol/EOPriv.h>
o replaced isNilOrEONull() by _isNilOrEONull()
o replace [EOFault isFault:] by _isFault()
o changed variable name type of
_infoForInstanceVariableNamed:retType:retSize:retOffset:
o rewritten valueForKey:,... to use cString NSKeyValueCoding
* EOControl/EOKeyValueCoding.m:
o changed NSAssert in NSArray -valueForKey:
o optimization in NSDictionary -takeValue:forKeyPath:isSmart:
o optimization in NSDictionary -takeStoredValue:forKeyPath:
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
o include <EOCOntrol/EOPriv.h>
* EOControl/EOKeyValueQualifier.m:
o fixes for EONull/nil in -evaluateWithObject:
o replaced [EONull null] by GDL2EONull
o include <EOCOntrol/EOPriv.h>
* EOControl/EOSortOrdering.m:
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOAdaptors/Postgres95SQLExpression.m:
o float formatting in +formatValue:forAttribute:
o added -externalNameQuoteCharacter
o added +sqlPatternFromShellPattern:
o added +sqlPatternFromShellPattern:withEscapeCharacter:
o replaced isNilOrEONull() by _isNilOrEONull()
* EOAdaptors/Postgres95Channel.m:
o logs
* EOAdaptors/Postgres95Values.m:
o logs
o fix in +setPostgres95Format:
o fix calendard format to handle timezone (%z)
o optimizations
* EOControl/EOMutableKnownKeyDictionary.m
o removed EOMKKDArrayMapping
+dictionaryFromDictionary:subsetMapping:
o include <EOCOntrol/EOPriv.h>
o replaced isNilOrEONull() by _isNilOrEONull()
* EOControl/EONSAddOns.[hm]:
o added NSString(ShellPattern)
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@20688 72102866-910b-0410-8b05-ffd578937521
2005-02-11 17:37:23 +00:00
|
|
|
#include <EOControl/EOPriv.h>
|
2002-11-15 22:57:05 +00:00
|
|
|
|
2004-07-23 18:33:29 +00:00
|
|
|
#include "EOEntityPriv.h"
|
2002-11-15 22:57:05 +00:00
|
|
|
|
|
|
|
@implementation EOSQLQualifier
|
|
|
|
|
|
|
|
+ (EOQualifier *)qualifierWithQualifierFormat: (NSString *)format, ...
|
|
|
|
{
|
|
|
|
NSEmitTODO(); //TODO
|
|
|
|
[self notImplemented: _cmd]; //TODO
|
|
|
|
|
|
|
|
return nil;
|
|
|
|
}
|
|
|
|
|
|
|
|
- (id)initWithEntity: (EOEntity *)entity
|
|
|
|
qualifierFormat: (NSString *)qualifierFormat, ...
|
|
|
|
{
|
|
|
|
NSEmitTODO(); //TODO
|
|
|
|
[self notImplemented: _cmd]; //TODO
|
|
|
|
|
|
|
|
return nil;
|
|
|
|
}
|
|
|
|
|
|
|
|
- (EOQualifier *)schemaBasedQualifierWithRootEntity:(EOEntity *)entity
|
|
|
|
{
|
|
|
|
[self notImplemented: _cmd];
|
|
|
|
return nil;
|
|
|
|
}
|
|
|
|
|
|
|
|
- (NSString *)sqlStringForSQLExpression:(EOSQLExpression *)sqlExpression
|
|
|
|
{
|
|
|
|
[self notImplemented: _cmd];
|
|
|
|
return nil;
|
|
|
|
}
|
|
|
|
|
|
|
|
@end
|
|
|
|
|
|
|
|
|
|
|
|
@implementation EOAndQualifier (EOQualifierSQLGeneration)
|
|
|
|
|
|
|
|
- (NSString *)sqlStringForSQLExpression: (EOSQLExpression *)sqlExpression
|
|
|
|
{
|
|
|
|
//OK?
|
2003-11-28 22:56:06 +00:00
|
|
|
//Ayers: Review (This looks correct, time to cleanup.)
|
2002-11-15 22:57:05 +00:00
|
|
|
return [sqlExpression sqlStringForConjoinedQualifiers: _qualifiers];
|
|
|
|
|
|
|
|
/*
|
|
|
|
//TODO finish to add sqlExpression
|
|
|
|
NSEnumerator *qualifiersEnum=nil;
|
|
|
|
EOQualifier *qualifier=nil;
|
|
|
|
NSMutableString *sqlString = nil;
|
|
|
|
|
|
|
|
qualifiersEnum = [_qualifiers objectEnumerator];
|
|
|
|
while ((qualifier = [qualifiersEnum nextObject]))
|
|
|
|
{
|
|
|
|
if (!sqlString)
|
|
|
|
{
|
|
|
|
sqlString = [NSMutableString stringWithString:
|
2002-12-30 22:10:43 +00:00
|
|
|
[(id <EOQualifierSQLGeneration>)qualifier sqlStringForSQLExpression:sqlExpression]];
|
2002-11-15 22:57:05 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
[sqlString appendFormat:@" %@ %@",
|
|
|
|
@"AND",
|
2002-12-30 22:10:43 +00:00
|
|
|
[(id <EOQualifierSQLGeneration>)qualifier sqlStringForSQLExpression:sqlExpression]];
|
2002-11-15 22:57:05 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return sqlString;
|
|
|
|
*/
|
|
|
|
}
|
|
|
|
|
|
|
|
- (EOQualifier *)schemaBasedQualifierWithRootEntity: (EOEntity *)entity
|
|
|
|
{
|
2002-12-01 17:58:42 +00:00
|
|
|
EOQualifier *returnedQualifier = self;
|
|
|
|
int qualifierCount = 0;
|
|
|
|
BOOL atLeastOneDifferentQualifier = NO; // YES if we find a changed qualifier
|
|
|
|
EOFLOGObjectFnStart();
|
|
|
|
|
|
|
|
qualifierCount = [_qualifiers count];
|
2002-11-15 22:57:05 +00:00
|
|
|
|
|
|
|
if (qualifierCount > 0)
|
|
|
|
{
|
|
|
|
NSMutableArray *qualifiers = [NSMutableArray array];
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < qualifierCount; i++)
|
|
|
|
{
|
|
|
|
EOQualifier *qualifier = [_qualifiers objectAtIndex: i];
|
|
|
|
EOQualifier *schemaBasedQualifierTmp =
|
2002-12-30 22:10:43 +00:00
|
|
|
[(id <EOQualifierSQLGeneration>)qualifier
|
|
|
|
schemaBasedQualifierWithRootEntity:
|
|
|
|
entity];
|
|
|
|
|
2002-12-01 17:58:42 +00:00
|
|
|
if (schemaBasedQualifierTmp != qualifier)
|
|
|
|
atLeastOneDifferentQualifier = YES;
|
2002-12-30 22:10:43 +00:00
|
|
|
|
2002-11-15 22:57:05 +00:00
|
|
|
[qualifiers addObject: schemaBasedQualifierTmp];
|
|
|
|
}
|
2002-12-01 17:58:42 +00:00
|
|
|
|
|
|
|
// If we've found at least a different qualifier, return a new EOAndQualifier
|
|
|
|
if (atLeastOneDifferentQualifier)
|
|
|
|
returnedQualifier = [[self class] qualifierWithQualifierArray:qualifiers];
|
2002-11-15 22:57:05 +00:00
|
|
|
}
|
2002-12-01 17:58:42 +00:00
|
|
|
|
|
|
|
EOFLOGObjectFnStop();
|
|
|
|
|
|
|
|
return returnedQualifier;
|
2002-11-15 22:57:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
@end
|
|
|
|
|
|
|
|
@implementation EOOrQualifier (EOQualifierSQLGeneration)
|
|
|
|
|
|
|
|
- (NSString *)sqlStringForSQLExpression: (EOSQLExpression *)sqlExpression
|
|
|
|
{
|
2003-11-28 22:56:06 +00:00
|
|
|
//OK?
|
|
|
|
//Ayers: Review (This looks correct, time to cleanup.)
|
|
|
|
return [sqlExpression sqlStringForDisjoinedQualifiers: _qualifiers];
|
|
|
|
|
|
|
|
/*
|
2002-11-15 22:57:05 +00:00
|
|
|
NSEnumerator *qualifiersEnum;
|
|
|
|
EOQualifier *qualifier;
|
|
|
|
NSMutableString *sqlString = nil;
|
|
|
|
|
|
|
|
qualifiersEnum = [_qualifiers objectEnumerator];
|
|
|
|
while ((qualifier = [qualifiersEnum nextObject]))
|
|
|
|
{
|
|
|
|
if (!sqlString)
|
|
|
|
{
|
|
|
|
sqlString = [NSMutableString stringWithString:
|
2002-12-30 22:10:43 +00:00
|
|
|
[(id <EOQualifierSQLGeneration>)qualifier sqlStringForSQLExpression: sqlExpression]];
|
2002-11-15 22:57:05 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
[sqlString appendFormat: @" %@ %@",
|
|
|
|
@"OR",
|
2002-12-30 22:10:43 +00:00
|
|
|
[(id <EOQualifierSQLGeneration>)qualifier sqlStringForSQLExpression: sqlExpression]];
|
2002-11-15 22:57:05 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return sqlString;
|
2003-11-28 22:56:06 +00:00
|
|
|
*/
|
2002-11-15 22:57:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
- (EOQualifier *)schemaBasedQualifierWithRootEntity: (EOEntity *)entity
|
|
|
|
{
|
2002-12-01 17:58:42 +00:00
|
|
|
EOQualifier *returnedQualifier = self;
|
|
|
|
int qualifierCount = 0;
|
|
|
|
BOOL atLeastOneDifferentQualifier = NO; // YES if we find a changed qualifier
|
|
|
|
EOFLOGObjectFnStart();
|
|
|
|
|
|
|
|
qualifierCount = [_qualifiers count];
|
|
|
|
|
|
|
|
if (qualifierCount > 0)
|
|
|
|
{
|
|
|
|
NSMutableArray *qualifiers = [NSMutableArray array];
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < qualifierCount; i++)
|
|
|
|
{
|
|
|
|
EOQualifier *qualifier = [_qualifiers objectAtIndex: i];
|
|
|
|
EOQualifier *schemaBasedQualifierTmp =
|
2002-12-30 22:10:43 +00:00
|
|
|
[(id <EOQualifierSQLGeneration>)qualifier
|
|
|
|
schemaBasedQualifierWithRootEntity:
|
|
|
|
entity];
|
|
|
|
|
2002-12-01 17:58:42 +00:00
|
|
|
if (schemaBasedQualifierTmp != qualifier)
|
|
|
|
atLeastOneDifferentQualifier = YES;
|
2002-12-30 22:10:43 +00:00
|
|
|
|
2002-12-01 17:58:42 +00:00
|
|
|
[qualifiers addObject: schemaBasedQualifierTmp];
|
|
|
|
}
|
|
|
|
|
|
|
|
// If we've found at least a different qualifier, return a new EOOrQualifier
|
|
|
|
if (atLeastOneDifferentQualifier)
|
|
|
|
returnedQualifier = [[self class] qualifierWithQualifierArray:qualifiers];
|
|
|
|
}
|
|
|
|
|
|
|
|
EOFLOGObjectFnStop();
|
|
|
|
|
|
|
|
return returnedQualifier;
|
2002-11-15 22:57:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
@end
|
|
|
|
|
|
|
|
@implementation EOKeyComparisonQualifier (EOQualifierSQLGeneration)
|
|
|
|
|
|
|
|
- (NSString *)sqlStringForSQLExpression: (EOSQLExpression *)sqlExpression
|
|
|
|
{
|
|
|
|
return [sqlExpression sqlStringForKeyComparisonQualifier: self];
|
|
|
|
}
|
|
|
|
|
|
|
|
- (EOQualifier *)schemaBasedQualifierWithRootEntity: (EOEntity *)entity
|
|
|
|
{
|
COmmit Part 2
* EOAccess/EOAdaptor.m:
o optimization in 'for' loops
* EOAccess/EODatabase.m:
o include <EOCOntrol/EOPriv.h>
o replaced isNilOrEONull() by _isNilOrEONull()
* EOAccess/EODatabaseContext.h:
o added _snapshotForGlobalIDIMP
* EOAccess/EODatabaseContext.m:
o commented NSEmitTODO in
-objectsForSourceGlobalID:relationshipName:editingContext:
o added beter exception format in
qualifierForLockingAttributes:primaryKeyAttributes:entity:snapshot:
o fix compiler warning in -relayPrimaryKey:object:entity:
o logs
o optimizations in -objectsWithFetchSpecification:editingContext:
o replaced isNilOrEONull() by _isNilOrEONull()
o replace [EOFault isFault:] by _isFault()
o use _snapshotForGlobalIDIMP
o IMP usage optimization
* EOAccess/EOAttribute.[hm]:
o added EOAdaptorUnknownType
o added _adaptorValueType and avoid recomputing it each time
o added _valueTypeChar to avoid string comparaisons
o use EOPriv classes declarations
o Temporary reverted David changes in
-adaptorValueByConvertingAttributeValue
* EOAccess/EOAttributePriv.h:
o added _valueTypeChar to avoid string comparaisons
* EOAccess/EOEntityPriv.h:
o moved -attributeForPath: and -relationshipForPath: to
EOEntityGDL2Additions category
* EOAccess/EOEntity.h:
o moved private -attributeForPath: and -relationshipForPath: to
EOEntityGDL2Additions category
* EOAccess/EOEntity.m:
o better exception in classProperties
o fix compiler warning in -setClassProperties:,
-setPrimaryKeyAttributes:,
-setAttributesUsedForLocking:
o moved -attributeForPath: and -relationshipForPath: to
EOEntityGDL2Additions category
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOAccess/EOSQLExpression.m:
o optimization in -tableListWithRootEntity:
o optimization in -formatSQLString:format:
o optimization in +sqlPatternFromShellPattern:
o optimization in +sqlPatternFromShellPattern:withEscapeCharacter:
o fix in -sqlStringForKeyValueQualifier:
o added log in -sqlStringForKeyValueQualifier: for not handled
readFormat
o added log -addInsertListAttribute:value: for not handled
writeFormat
o added log -addUpdateListAttribute:value: for not handled
writeFormat
o changed EOFLOGObjectFnStart to EOFLOGObjectFnStartCond
o changed EOFLOGObjectFnStop to EOFLOGObjectFnStopCond
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOAccess/EOSQLQualifier.m:
o implemented EOKeyComparisonQualifier
-schemaBasedQualifierWithRootEntity
* EOAccess/EOUtilities.m:
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOControl/EOPriv.[hm]:
o added. Contains various classes/selectors/IMPs
* EOControl/EOClassDescription.m:
o handle EONull case in -propagateDeleteForObject:editingContext:,
-addObject:toPropertyWithKey:, -snapshot,
-removeObject:fromPropertyWithKey:,
_setObject:forBothSidesOfRelationshipWithKey:,
addObject:toBothSidesOfRelationshipWithKey:,
-removeObject:fromBothSidesOfRelationshipWithKey:
o fix compiler warning in
-dictionaryForInstanceProperties, -shallowCopy,
-updateFromSnapshot:, -snapshot
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
o replaced isNilOrEONull() by _isNilOrEONull()
o fix in -validateForSave
o rewritten -validateValue:forKey: selector build
* EOControl/EOEditingContext.h:
o added -hasUnprocessedChanges
* EOControl/EOEditingContext.m:
o added -hasUnprocessedChanges
o added NS_DURING,... to catch exceptions
o replace [EOFault isFault:] by _isFault()
o IMP usage optimization
* EOControl/EOKeyGlobalID.m:
o replaced isNilOrEONull() by _isNilOrEONull()
o include <EOCOntrol/EOPriv.h>
* EOControl/EOGenericRecord.m:
o partially rewritten -description
o include <EOCOntrol/EOPriv.h>
o replaced isNilOrEONull() by _isNilOrEONull()
o replace [EOFault isFault:] by _isFault()
o changed variable name type of
_infoForInstanceVariableNamed:retType:retSize:retOffset:
o rewritten valueForKey:,... to use cString NSKeyValueCoding
* EOControl/EOKeyValueCoding.m:
o changed NSAssert in NSArray -valueForKey:
o optimization in NSDictionary -takeValue:forKeyPath:isSmart:
o optimization in NSDictionary -takeStoredValue:forKeyPath:
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
o include <EOCOntrol/EOPriv.h>
* EOControl/EOKeyValueQualifier.m:
o fixes for EONull/nil in -evaluateWithObject:
o replaced [EONull null] by GDL2EONull
o include <EOCOntrol/EOPriv.h>
* EOControl/EOSortOrdering.m:
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOAdaptors/Postgres95SQLExpression.m:
o float formatting in +formatValue:forAttribute:
o added -externalNameQuoteCharacter
o added +sqlPatternFromShellPattern:
o added +sqlPatternFromShellPattern:withEscapeCharacter:
o replaced isNilOrEONull() by _isNilOrEONull()
* EOAdaptors/Postgres95Channel.m:
o logs
* EOAdaptors/Postgres95Values.m:
o logs
o fix in +setPostgres95Format:
o fix calendard format to handle timezone (%z)
o optimizations
* EOControl/EOMutableKnownKeyDictionary.m
o removed EOMKKDArrayMapping
+dictionaryFromDictionary:subsetMapping:
o include <EOCOntrol/EOPriv.h>
o replaced isNilOrEONull() by _isNilOrEONull()
* EOControl/EONSAddOns.[hm]:
o added NSString(ShellPattern)
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@20688 72102866-910b-0410-8b05-ffd578937521
2005-02-11 17:37:23 +00:00
|
|
|
return self; // MG: Not sure
|
2002-11-15 22:57:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
@end
|
|
|
|
|
|
|
|
@implementation EOKeyValueQualifier (EOQualifierSQLGeneration)
|
|
|
|
|
COmmit Part 2
* EOAccess/EOAdaptor.m:
o optimization in 'for' loops
* EOAccess/EODatabase.m:
o include <EOCOntrol/EOPriv.h>
o replaced isNilOrEONull() by _isNilOrEONull()
* EOAccess/EODatabaseContext.h:
o added _snapshotForGlobalIDIMP
* EOAccess/EODatabaseContext.m:
o commented NSEmitTODO in
-objectsForSourceGlobalID:relationshipName:editingContext:
o added beter exception format in
qualifierForLockingAttributes:primaryKeyAttributes:entity:snapshot:
o fix compiler warning in -relayPrimaryKey:object:entity:
o logs
o optimizations in -objectsWithFetchSpecification:editingContext:
o replaced isNilOrEONull() by _isNilOrEONull()
o replace [EOFault isFault:] by _isFault()
o use _snapshotForGlobalIDIMP
o IMP usage optimization
* EOAccess/EOAttribute.[hm]:
o added EOAdaptorUnknownType
o added _adaptorValueType and avoid recomputing it each time
o added _valueTypeChar to avoid string comparaisons
o use EOPriv classes declarations
o Temporary reverted David changes in
-adaptorValueByConvertingAttributeValue
* EOAccess/EOAttributePriv.h:
o added _valueTypeChar to avoid string comparaisons
* EOAccess/EOEntityPriv.h:
o moved -attributeForPath: and -relationshipForPath: to
EOEntityGDL2Additions category
* EOAccess/EOEntity.h:
o moved private -attributeForPath: and -relationshipForPath: to
EOEntityGDL2Additions category
* EOAccess/EOEntity.m:
o better exception in classProperties
o fix compiler warning in -setClassProperties:,
-setPrimaryKeyAttributes:,
-setAttributesUsedForLocking:
o moved -attributeForPath: and -relationshipForPath: to
EOEntityGDL2Additions category
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOAccess/EOSQLExpression.m:
o optimization in -tableListWithRootEntity:
o optimization in -formatSQLString:format:
o optimization in +sqlPatternFromShellPattern:
o optimization in +sqlPatternFromShellPattern:withEscapeCharacter:
o fix in -sqlStringForKeyValueQualifier:
o added log in -sqlStringForKeyValueQualifier: for not handled
readFormat
o added log -addInsertListAttribute:value: for not handled
writeFormat
o added log -addUpdateListAttribute:value: for not handled
writeFormat
o changed EOFLOGObjectFnStart to EOFLOGObjectFnStartCond
o changed EOFLOGObjectFnStop to EOFLOGObjectFnStopCond
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOAccess/EOSQLQualifier.m:
o implemented EOKeyComparisonQualifier
-schemaBasedQualifierWithRootEntity
* EOAccess/EOUtilities.m:
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOControl/EOPriv.[hm]:
o added. Contains various classes/selectors/IMPs
* EOControl/EOClassDescription.m:
o handle EONull case in -propagateDeleteForObject:editingContext:,
-addObject:toPropertyWithKey:, -snapshot,
-removeObject:fromPropertyWithKey:,
_setObject:forBothSidesOfRelationshipWithKey:,
addObject:toBothSidesOfRelationshipWithKey:,
-removeObject:fromBothSidesOfRelationshipWithKey:
o fix compiler warning in
-dictionaryForInstanceProperties, -shallowCopy,
-updateFromSnapshot:, -snapshot
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
o replaced isNilOrEONull() by _isNilOrEONull()
o fix in -validateForSave
o rewritten -validateValue:forKey: selector build
* EOControl/EOEditingContext.h:
o added -hasUnprocessedChanges
* EOControl/EOEditingContext.m:
o added -hasUnprocessedChanges
o added NS_DURING,... to catch exceptions
o replace [EOFault isFault:] by _isFault()
o IMP usage optimization
* EOControl/EOKeyGlobalID.m:
o replaced isNilOrEONull() by _isNilOrEONull()
o include <EOCOntrol/EOPriv.h>
* EOControl/EOGenericRecord.m:
o partially rewritten -description
o include <EOCOntrol/EOPriv.h>
o replaced isNilOrEONull() by _isNilOrEONull()
o replace [EOFault isFault:] by _isFault()
o changed variable name type of
_infoForInstanceVariableNamed:retType:retSize:retOffset:
o rewritten valueForKey:,... to use cString NSKeyValueCoding
* EOControl/EOKeyValueCoding.m:
o changed NSAssert in NSArray -valueForKey:
o optimization in NSDictionary -takeValue:forKeyPath:isSmart:
o optimization in NSDictionary -takeStoredValue:forKeyPath:
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
o include <EOCOntrol/EOPriv.h>
* EOControl/EOKeyValueQualifier.m:
o fixes for EONull/nil in -evaluateWithObject:
o replaced [EONull null] by GDL2EONull
o include <EOCOntrol/EOPriv.h>
* EOControl/EOSortOrdering.m:
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOAdaptors/Postgres95SQLExpression.m:
o float formatting in +formatValue:forAttribute:
o added -externalNameQuoteCharacter
o added +sqlPatternFromShellPattern:
o added +sqlPatternFromShellPattern:withEscapeCharacter:
o replaced isNilOrEONull() by _isNilOrEONull()
* EOAdaptors/Postgres95Channel.m:
o logs
* EOAdaptors/Postgres95Values.m:
o logs
o fix in +setPostgres95Format:
o fix calendard format to handle timezone (%z)
o optimizations
* EOControl/EOMutableKnownKeyDictionary.m
o removed EOMKKDArrayMapping
+dictionaryFromDictionary:subsetMapping:
o include <EOCOntrol/EOPriv.h>
o replaced isNilOrEONull() by _isNilOrEONull()
* EOControl/EONSAddOns.[hm]:
o added NSString(ShellPattern)
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@20688 72102866-910b-0410-8b05-ffd578937521
2005-02-11 17:37:23 +00:00
|
|
|
+ (void)initialize
|
|
|
|
{
|
|
|
|
static BOOL initialized=NO;
|
|
|
|
if (!initialized)
|
|
|
|
{
|
|
|
|
initialized=YES;
|
|
|
|
|
|
|
|
GDL2PrivInit();
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
2002-11-15 22:57:05 +00:00
|
|
|
- (NSString *)sqlStringForSQLExpression: (EOSQLExpression *)sqlExpression
|
|
|
|
{
|
|
|
|
return [sqlExpression sqlStringForKeyValueQualifier: self];
|
|
|
|
}
|
|
|
|
|
|
|
|
- (EOQualifier *)schemaBasedQualifierWithRootEntity: (EOEntity *)entity
|
|
|
|
{
|
|
|
|
EOQualifier *qualifier = nil;
|
|
|
|
NSMutableArray *qualifiers = nil;
|
|
|
|
id key;
|
|
|
|
EORelationship *relationship;
|
|
|
|
|
|
|
|
EOFLOGObjectFnStart();
|
|
|
|
|
|
|
|
key = [self key];
|
|
|
|
EOFLOGObjectLevelArgs(@"EOQualifier", @"key=%@", key);
|
|
|
|
|
|
|
|
relationship = [entity relationshipForPath: key];
|
|
|
|
EOFLOGObjectLevelArgs(@"EOQualifier", @"relationship=%@", relationship);
|
|
|
|
|
|
|
|
if (relationship)
|
|
|
|
{
|
|
|
|
EORelationship *destinationRelationship;
|
|
|
|
NSDictionary *keyValues = nil;
|
|
|
|
id value = nil;
|
|
|
|
EOEditingContext* editingContext = nil;
|
|
|
|
EOObjectStore *rootObjectStore = nil;
|
|
|
|
NSMutableArray *destinationAttributeNames = [NSMutableArray array];
|
|
|
|
NSArray *joins;
|
|
|
|
int i, count;
|
|
|
|
SEL sel = NULL;
|
|
|
|
|
|
|
|
if ([relationship isFlattened])
|
|
|
|
destinationRelationship = [relationship lastRelationship];
|
|
|
|
else
|
|
|
|
destinationRelationship = relationship;
|
|
|
|
|
|
|
|
joins = [destinationRelationship joins];
|
|
|
|
count = [joins count];
|
|
|
|
|
|
|
|
for (i = 0; i < count; i++)
|
|
|
|
{
|
|
|
|
EOJoin *join = [joins objectAtIndex: i];
|
|
|
|
EOAttribute *destinationAttribute = [join destinationAttribute];
|
|
|
|
NSString *destinationAttributeName = [destinationAttribute name];
|
|
|
|
|
|
|
|
[destinationAttributeNames addObject: destinationAttributeName];
|
|
|
|
}
|
|
|
|
|
|
|
|
value = [self value];
|
|
|
|
EOFLOGObjectLevelArgs(@"EOQualifier", @"value=%@", value);
|
|
|
|
|
|
|
|
editingContext = [value editingContext];
|
|
|
|
rootObjectStore = [editingContext rootObjectStore];
|
|
|
|
|
|
|
|
EOFLOGObjectLevelArgs(@"EOQualifier", @"rootObjectStore=%@",
|
|
|
|
rootObjectStore);
|
|
|
|
EOFLOGObjectLevelArgs(@"EOQualifier", @"destinationAttributeNames=%@",
|
|
|
|
destinationAttributeNames);
|
2002-12-01 17:58:42 +00:00
|
|
|
|
2002-11-15 22:57:05 +00:00
|
|
|
keyValues = [(EOObjectStoreCoordinator*)rootObjectStore
|
2002-12-01 17:58:42 +00:00
|
|
|
valuesForKeys:
|
|
|
|
destinationAttributeNames
|
|
|
|
object: value];
|
2002-11-15 22:57:05 +00:00
|
|
|
EOFLOGObjectLevelArgs(@"EOQualifier", @"keyValues=%@", keyValues);
|
|
|
|
|
|
|
|
sel = [self selector];
|
|
|
|
/*
|
|
|
|
when flattened: ???
|
|
|
|
entity relationshipForPath:key
|
|
|
|
and get joins on it ?
|
|
|
|
*/
|
|
|
|
|
|
|
|
for (i = 0; i < count; i++)
|
|
|
|
{
|
|
|
|
EOQualifier *tmpQualifier = nil;
|
|
|
|
NSString *attributeName = nil;
|
|
|
|
NSString *destinationAttributeName;
|
|
|
|
EOJoin *join = [joins objectAtIndex: i];
|
2002-12-01 17:58:42 +00:00
|
|
|
id attributeValue = nil;
|
2002-11-15 22:57:05 +00:00
|
|
|
|
|
|
|
EOFLOGObjectLevelArgs(@"EOQualifier",@"join=%@",join);
|
|
|
|
|
|
|
|
destinationAttributeName = [destinationAttributeNames
|
|
|
|
objectAtIndex: i];
|
|
|
|
|
|
|
|
if (destinationRelationship != relationship)
|
|
|
|
{
|
|
|
|
// flattened: take destattr
|
|
|
|
attributeName = [NSString stringWithFormat: @"%@.%@",
|
|
|
|
key, destinationAttributeName];
|
|
|
|
//==> rel.attr
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
EOAttribute *sourceAttribute = [join sourceAttribute];
|
|
|
|
|
|
|
|
attributeName = [sourceAttribute name];
|
|
|
|
}
|
|
|
|
|
2002-12-01 17:58:42 +00:00
|
|
|
attributeValue = [keyValues objectForKey:destinationAttributeName];
|
2002-11-15 22:57:05 +00:00
|
|
|
tmpQualifier = [EOKeyValueQualifier
|
|
|
|
qualifierWithKey: attributeName
|
|
|
|
operatorSelector: sel
|
COmmit Part 2
* EOAccess/EOAdaptor.m:
o optimization in 'for' loops
* EOAccess/EODatabase.m:
o include <EOCOntrol/EOPriv.h>
o replaced isNilOrEONull() by _isNilOrEONull()
* EOAccess/EODatabaseContext.h:
o added _snapshotForGlobalIDIMP
* EOAccess/EODatabaseContext.m:
o commented NSEmitTODO in
-objectsForSourceGlobalID:relationshipName:editingContext:
o added beter exception format in
qualifierForLockingAttributes:primaryKeyAttributes:entity:snapshot:
o fix compiler warning in -relayPrimaryKey:object:entity:
o logs
o optimizations in -objectsWithFetchSpecification:editingContext:
o replaced isNilOrEONull() by _isNilOrEONull()
o replace [EOFault isFault:] by _isFault()
o use _snapshotForGlobalIDIMP
o IMP usage optimization
* EOAccess/EOAttribute.[hm]:
o added EOAdaptorUnknownType
o added _adaptorValueType and avoid recomputing it each time
o added _valueTypeChar to avoid string comparaisons
o use EOPriv classes declarations
o Temporary reverted David changes in
-adaptorValueByConvertingAttributeValue
* EOAccess/EOAttributePriv.h:
o added _valueTypeChar to avoid string comparaisons
* EOAccess/EOEntityPriv.h:
o moved -attributeForPath: and -relationshipForPath: to
EOEntityGDL2Additions category
* EOAccess/EOEntity.h:
o moved private -attributeForPath: and -relationshipForPath: to
EOEntityGDL2Additions category
* EOAccess/EOEntity.m:
o better exception in classProperties
o fix compiler warning in -setClassProperties:,
-setPrimaryKeyAttributes:,
-setAttributesUsedForLocking:
o moved -attributeForPath: and -relationshipForPath: to
EOEntityGDL2Additions category
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOAccess/EOSQLExpression.m:
o optimization in -tableListWithRootEntity:
o optimization in -formatSQLString:format:
o optimization in +sqlPatternFromShellPattern:
o optimization in +sqlPatternFromShellPattern:withEscapeCharacter:
o fix in -sqlStringForKeyValueQualifier:
o added log in -sqlStringForKeyValueQualifier: for not handled
readFormat
o added log -addInsertListAttribute:value: for not handled
writeFormat
o added log -addUpdateListAttribute:value: for not handled
writeFormat
o changed EOFLOGObjectFnStart to EOFLOGObjectFnStartCond
o changed EOFLOGObjectFnStop to EOFLOGObjectFnStopCond
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOAccess/EOSQLQualifier.m:
o implemented EOKeyComparisonQualifier
-schemaBasedQualifierWithRootEntity
* EOAccess/EOUtilities.m:
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOControl/EOPriv.[hm]:
o added. Contains various classes/selectors/IMPs
* EOControl/EOClassDescription.m:
o handle EONull case in -propagateDeleteForObject:editingContext:,
-addObject:toPropertyWithKey:, -snapshot,
-removeObject:fromPropertyWithKey:,
_setObject:forBothSidesOfRelationshipWithKey:,
addObject:toBothSidesOfRelationshipWithKey:,
-removeObject:fromBothSidesOfRelationshipWithKey:
o fix compiler warning in
-dictionaryForInstanceProperties, -shallowCopy,
-updateFromSnapshot:, -snapshot
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
o replaced isNilOrEONull() by _isNilOrEONull()
o fix in -validateForSave
o rewritten -validateValue:forKey: selector build
* EOControl/EOEditingContext.h:
o added -hasUnprocessedChanges
* EOControl/EOEditingContext.m:
o added -hasUnprocessedChanges
o added NS_DURING,... to catch exceptions
o replace [EOFault isFault:] by _isFault()
o IMP usage optimization
* EOControl/EOKeyGlobalID.m:
o replaced isNilOrEONull() by _isNilOrEONull()
o include <EOCOntrol/EOPriv.h>
* EOControl/EOGenericRecord.m:
o partially rewritten -description
o include <EOCOntrol/EOPriv.h>
o replaced isNilOrEONull() by _isNilOrEONull()
o replace [EOFault isFault:] by _isFault()
o changed variable name type of
_infoForInstanceVariableNamed:retType:retSize:retOffset:
o rewritten valueForKey:,... to use cString NSKeyValueCoding
* EOControl/EOKeyValueCoding.m:
o changed NSAssert in NSArray -valueForKey:
o optimization in NSDictionary -takeValue:forKeyPath:isSmart:
o optimization in NSDictionary -takeStoredValue:forKeyPath:
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
o include <EOCOntrol/EOPriv.h>
* EOControl/EOKeyValueQualifier.m:
o fixes for EONull/nil in -evaluateWithObject:
o replaced [EONull null] by GDL2EONull
o include <EOCOntrol/EOPriv.h>
* EOControl/EOSortOrdering.m:
o include <EOCOntrol/EOPriv.h>
o replaced [EONull null] by GDL2EONull
* EOAdaptors/Postgres95SQLExpression.m:
o float formatting in +formatValue:forAttribute:
o added -externalNameQuoteCharacter
o added +sqlPatternFromShellPattern:
o added +sqlPatternFromShellPattern:withEscapeCharacter:
o replaced isNilOrEONull() by _isNilOrEONull()
* EOAdaptors/Postgres95Channel.m:
o logs
* EOAdaptors/Postgres95Values.m:
o logs
o fix in +setPostgres95Format:
o fix calendard format to handle timezone (%z)
o optimizations
* EOControl/EOMutableKnownKeyDictionary.m
o removed EOMKKDArrayMapping
+dictionaryFromDictionary:subsetMapping:
o include <EOCOntrol/EOPriv.h>
o replaced isNilOrEONull() by _isNilOrEONull()
* EOControl/EONSAddOns.[hm]:
o added NSString(ShellPattern)
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@20688 72102866-910b-0410-8b05-ffd578937521
2005-02-11 17:37:23 +00:00
|
|
|
value: (attributeValue ? attributeValue : GDL2EONull)];
|
2002-11-15 22:57:05 +00:00
|
|
|
|
|
|
|
if (qualifier)//Already a qualifier
|
|
|
|
{
|
|
|
|
//Create an array of qualifiers
|
|
|
|
qualifiers = [NSMutableArray arrayWithObjects: qualifier,
|
|
|
|
tmpQualifier, nil];
|
|
|
|
qualifier = nil;
|
|
|
|
}
|
|
|
|
else if (qualifiers) //Already qualifiers
|
|
|
|
//Add this one
|
|
|
|
[qualifiers addObject: tmpQualifier];
|
|
|
|
else
|
|
|
|
//No previous qualifier
|
|
|
|
qualifier = tmpQualifier;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (qualifiers)
|
|
|
|
{
|
|
|
|
qualifier = [EOAndQualifier qualifierWithQualifierArray: qualifiers];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
qualifier = self;
|
|
|
|
|
|
|
|
EOFLOGObjectFnStop();
|
|
|
|
|
|
|
|
return qualifier;
|
|
|
|
}
|
|
|
|
|
|
|
|
@end
|
|
|
|
|
|
|
|
@implementation EONotQualifier (EOQualifierSQLGeneration)
|
|
|
|
|
|
|
|
- (NSString *)sqlStringForSQLExpression: (EOSQLExpression *)sqlExpression
|
|
|
|
{
|
|
|
|
return [sqlExpression sqlStringForNegatedQualifier: self];
|
|
|
|
}
|
|
|
|
|
|
|
|
- (EOQualifier *)schemaBasedQualifierWithRootEntity: (EOEntity *)entity
|
|
|
|
{
|
|
|
|
//TODO
|
|
|
|
[self notImplemented: _cmd];
|
|
|
|
return nil;
|
|
|
|
}
|
|
|
|
|
|
|
|
@end
|
|
|
|
|
|
|
|
|
|
|
|
@implementation NSString (NSStringSQLExpression)
|
|
|
|
|
|
|
|
- (NSString *) valueForSQLExpression: (EOSQLExpression *)sqlExpression
|
|
|
|
{
|
|
|
|
return self;
|
|
|
|
}
|
|
|
|
|
|
|
|
@end
|