gnustep/libs-gdl2
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gdl2.git synced 2025-02-19 17:50:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* EOAccess/EOSQLQualifier.m: change in EOAndQualifier and

Browse source 
EOOrQualifier -schemaBasedQualifierWithRootEntity to allow
nil schemaBasedQualifier.
fix in EOKeyValueQualifier -schemaBasedQualifierWithRootEntity:
to handle key like rel1.rel2.rel3 (see Testsuite
EOKeyValueQualifier01.m)
* EOAccess/EOSQLExpression.m: added NSAssert in
-sqlStringForKeyValueQualifier:
* EOAccess/EORelationship.m: added NSAssert in setDefinition:


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@21682 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Manuel Guesdon 2005-08-25 18:32:44 +00:00
parent b9ab8664ff
commit 1ae3f10933
4 changed files with 114 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
2005-08-25 Manuel Guesdon <mguesdon@orange-concept.com>
* EOAccess/EOSQLQualifier.m: change in EOAndQualifier and
EOOrQualifier -schemaBasedQualifierWithRootEntity to allow
nil schemaBasedQualifier.
fix in EOKeyValueQualifier -schemaBasedQualifierWithRootEntity:
to handle key like rel1.rel2.rel3 (see Testsuite
EOKeyValueQualifier01.m)
* EOAccess/EOSQLExpression.m: added NSAssert in
-sqlStringForKeyValueQualifier:
* EOAccess/EORelationship.m: added NSAssert in setDefinition:
2005-08-24 Manuel Guesdon <mguesdon@orange-concept.com>
* EOControl/EOEditingContext.m: fix _processRecentChanges

3
EOAccess/EORelationship.m
View file

@ -1327,6 +1327,9 @@ relationships. Nil if none" **/
{
_flags.isToMany = NO;
NSAssert1(_entity,@"No entity for relationship %@",
self);
ASSIGN(_definitionArray, [_entity _parseRelationshipPath: definition]);
EOFLOGObjectLevelArgs(@"EORelationship", @"_definitionArray=%@", _definitionArray);

11
EOAccess/EOSQLExpression.m
View file

@ -1454,13 +1454,15 @@ NSString *EOBindVariableColumnKey = @"EOBindVariableColumnKey";
[qualifier class],
qualifier);
key = [qualifier key];//OK
key = [qualifier key];
EOFLOGObjectLevelArgs(@"EOSQLExpression", @"key=%@", key);
NSAssert1([key length]>0,
@"No key in EOKeyValueQualifier: %@",qualifier);
value = [qualifier value];//OK
value = [qualifier value];
EOFLOGObjectLevelArgs(@"EOSQLExpression", @"value=%@", value);
attributeSQLString = [self sqlStringForAttributeNamed: key];//OK
attributeSQLString = [self sqlStringForAttributeNamed: key];
NSAssert1(attributeSQLString, @"No sqlStringForAttributeNamed:%@", key);
EOFLOGObjectLevelArgs(@"EOSQLExpression",@"attributeSQLString=%@",
@ -1468,6 +1470,9 @@ NSString *EOBindVariableColumnKey = @"EOBindVariableColumnKey";
attribute = [_entity attributeForPath: key];
EOFLOGObjectLevelArgs(@"EOSQLExpression", @"attribute=%@", attribute);
NSAssert3(attribute,
@"No attribute forKeyPath: '%@' in entity named '%@' in EOKeyValueQualifier: %@",
key,_entity,qualifier);
readFormat = [attribute readFormat];

107
EOAccess/EOSQLQualifier.m
View file

@ -161,12 +161,22 @@ RCS_ID("$Id$")
if (schemaBasedQualifierTmp != qualifier)
atLeastOneDifferentQualifier = YES;
[qualifiers addObject: schemaBasedQualifierTmp];
// Allows nil schemaBasedQualifier
if (schemaBasedQualifierTmp)
[qualifiers addObject: schemaBasedQualifierTmp];
}
// If we've found at least a different qualifier, return a new EOAndQualifier
if (atLeastOneDifferentQualifier)
returnedQualifier = [[self class] qualifierWithQualifierArray:qualifiers];
{
if ([qualifiers count]>0)
{
returnedQualifier = [[self class]
qualifierWithQualifierArray:qualifiers];
}
else
returnedQualifier = nil;
};
}
EOFLOGObjectFnStop();
@ -234,12 +244,22 @@ RCS_ID("$Id$")
if (schemaBasedQualifierTmp != qualifier)
atLeastOneDifferentQualifier = YES;
[qualifiers addObject: schemaBasedQualifierTmp];
// Allows nil schemaBasedQualifier
if (schemaBasedQualifierTmp)
[qualifiers addObject: schemaBasedQualifierTmp];
}
// If we've found at least a different qualifier, return a new EOOrQualifier
if (atLeastOneDifferentQualifier)
returnedQualifier = [[self class] qualifierWithQualifierArray:qualifiers];
{
if ([qualifiers count]>0)
{
returnedQualifier = [[self class]
qualifierWithQualifierArray:qualifiers];
}
else
returnedQualifier = nil;
};
}
EOFLOGObjectFnStop();
@ -290,12 +310,20 @@ RCS_ID("$Id$")
EOFLOGObjectFnStart();
EOFLOGObjectLevelArgs(@"EOQualifier", @"self=%@", self);
key = [self key];
EOFLOGObjectLevelArgs(@"EOQualifier", @"key=%@", key);
// 2 cases: key finish by an attrbue name (attrName or rel1.rel2.rel3.attrName)
// or by an relationship (rel1 or rel1.rel2.rel3)
// So find which one is it for key
relationship = [entity relationshipForPath: key];
EOFLOGObjectLevelArgs(@"EOQualifier", @"relationship=%@", relationship);
// It's a relationship (case 2), so we'll have to work
if (relationship)
{
EORelationship *destinationRelationship;
@ -308,11 +336,46 @@ RCS_ID("$Id$")
int i, count;
SEL sel = NULL;
// keyPrefix for new qualifier attribute names
NSString* keyPrefix=nil;
NSString* relName=[relationship name];
// Verify if key is a single relationship or a relationship key path
if (![key isEqualToString:relName])
{
// It is a relationship key path: we'll have to prefix join(s)
// attribute name
// keyPrefix is the keyPath without last relationship name
// ex: rel1.rel2. if key was rel1.rel2.rel3
keyPrefix=[key stringByDeletingSuffix:relName];
};
// if relationship is flattened, we'll have to add
// last relationship path prefix to keyPrefix !
if ([relationship isFlattened])
destinationRelationship = [relationship lastRelationship];
{
NSString* relDef=nil;
destinationRelationship = [relationship lastRelationship];
relDef=[relationship definition];
// something like rel1.rel2.relA.relB. or relA.relB.
if (keyPrefix)
keyPrefix=[keyPrefix stringByAppendingString:relDef];
else
keyPrefix=relDef;
keyPrefix=[keyPrefix stringByAppendingString:@"."];
}
else
destinationRelationship = relationship;
{
destinationRelationship = relationship;
};
EOFLOGObjectLevelArgs(@"EOQualifier", @"key=%@ keyPrefix=%@",
key, keyPrefix);
joins = [destinationRelationship joins];
count = [joins count];
@ -343,11 +406,6 @@ RCS_ID("$Id$")
EOFLOGObjectLevelArgs(@"EOQualifier", @"keyValues=%@", keyValues);
sel = [self selector];
/*
when flattened: ???
entity relationshipForPath:key
and get joins on it ?
*/
for (i = 0; i < count; i++)
{
@ -365,9 +423,7 @@ when flattened: ???
if (destinationRelationship != relationship)
{
// flattened: take destattr
attributeName = [NSString stringWithFormat: @"%@.%@",
key, destinationAttributeName];
//==> rel.attr
attributeName = destinationAttributeName;
}
else
{
@ -376,12 +432,28 @@ when flattened: ???
attributeName = [sourceAttribute name];
}
if (keyPrefix)
attributeName=[keyPrefix stringByAppendingString:attributeName];
EOFLOGObjectLevelArgs(@"EOQualifier",
@"key=%@ keyPrefix=%@ attributeName=%@",
key, keyPrefix,attributeName);
attributeValue = [keyValues objectForKey:destinationAttributeName];
EOFLOGObjectLevelArgs(@"EOQualifier",
@"destinationAttributeName=%@ attributeValue=%@",
destinationAttributeName, attributeValue);
tmpQualifier = [EOKeyValueQualifier
qualifierWithKey: attributeName
operatorSelector: sel
value: (attributeValue ? attributeValue : GDL2_EONull)];
EOFLOGObjectLevelArgs(@"EOQualifier",
@"tmpQualifier=%@",
tmpQualifier);
if (qualifier)//Already a qualifier
{
//Create an array of qualifiers
@ -402,9 +474,12 @@ when flattened: ???
qualifier = [EOAndQualifier qualifierWithQualifierArray: qualifiers];
}
}
else
else // It's not a relationship. Nothing to do.
qualifier = self;
EOFLOGObjectLevelArgs(@"EOQualifier", @"self=%@", self);
EOFLOGObjectLevelArgs(@"EOQualifier", @"result qualifier=%@", qualifier);
EOFLOGObjectFnStop();
return qualifier;