* EOAccess/EOSQLExpression.m

(-[prepareSelectExpressionWithAttributes🔒fetchSpecification:)]:
Conjoin the fetch specification qualifier with the restricting
qualifier.



git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@26428 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
ratmice 2008-04-03 07:05:10 +00:00
parent 9142225ac9
commit 82f3ec7fcd
2 changed files with 18 additions and 1 deletions

View file

@ -1,3 +1,10 @@
2008-04-03 Matt Rice <ratmice@gmail.com>
* EOAccess/EOSQLExpression.m
(-[prepareSelectExpressionWithAttributes:lock:fetchSpecification:)]:
Conjoin the fetch specification qualifier with the restricting
qualifier.
2008-04-03 Georg Fleischmann <georg@vhf.de>
* EOAdaptors/PostgreSQLAdaptor/PostgreSQLExpression.m

View file

@ -704,7 +704,17 @@ NSString *EOBindVariableColumnKey = @"EOBindVariableColumnKey";
EOFLOGObjectLevelArgs(@"EOSQLExpression", @"fetchQualifier=%@",
fetchQualifier);
restrictingQualifier = [_entity restrictingQualifier]; //OK //nil //TODO use it !!
restrictingQualifier = [_entity restrictingQualifier];
if (fetchQualifier && restrictingQualifier)
{
fetchQualifier = [[EOAndQualifier alloc] initWithQualifiers:fetchQualifier, restrictingQualifier, nil];
AUTORELEASE(fetchQualifier);
}
else
{
fetchQualifier = fetchQualifier ? fetchQualifier : restrictingQualifier;
}
//Build Where Clause
whereClauseString = [(id<EOQualifierSQLGeneration>)fetchQualifier sqlStringForSQLExpression: self];