Monotone-Parent: 46747edd0dcb4ecc9b939b9c8be25185efe65144

Monotone-Revision: 772069a4679fa8b05adc4dc49b2087230a05669c

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-12-17T15:29:06
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-12-17 15:29:06 +00:00
parent 76c907fc65
commit 0f74a8d504
12 changed files with 67 additions and 24 deletions
+4
View File
@@ -96,6 +96,7 @@
else {
[self errorWithFormat:@"%s: unsupported operation for null: %@",
__PRETTY_FUNCTION__, NSStringFromSelector(op)];
qOperator = @"=";
}
if ([val isKindOfClass:[NSNumber class]])
@@ -109,6 +110,7 @@
}
}
else {
isCI = NO;
if (sel_eq(op, EOQualifierOperatorEqual)) {
qOperator = @"IS";
qValue = @"NULL";
@@ -118,6 +120,8 @@
qValue = @"NULL";
}
else {
qOperator = @"IS";
qValue = @"NULL";
[self errorWithFormat:@"%s: invalid operation for null: %@",
__PRETTY_FUNCTION__, NSStringFromSelector(op)];
}
+17 -15
View File
@@ -757,7 +757,9 @@ static GCSStringFormatter *stringFormatter = nil;
[self errorWithFormat:@"could not open storage channel!"];
return nil;
}
if (!self->ofFlags.sameTableForQuick) {
if (!self->ofFlags.sameTableForQuick)
quickChannel = nil;
else {
if ((quickChannel = [self acquireQuickChannel]) == nil) {
[self errorWithFormat:@"could not open quick channel!"];
[self releaseChannel:storeChannel];
@@ -1103,25 +1105,25 @@ static GCSStringFormatter *stringFormatter = nil;
[sql appendString:[self aclTableName]];
[sql appendString:@" WHERE "];
[sql appendString:[self generateSQLForQualifier:qualifier]];
}
/* open channel */
/* open channel */
if ((channel = [self acquireAclChannel]) == nil) {
[self errorWithFormat:@"could not open acl channel!"];
return;
}
if ((channel = [self acquireAclChannel]) == nil) {
[self errorWithFormat:@"could not open acl channel!"];
return;
}
/* run SQL */
if ((error = [channel evaluateExpressionX:sql]) != nil) {
[self errorWithFormat:@"%s: cannot execute acl-fetch SQL '%@': %@",
/* run SQL */
if ((error = [channel evaluateExpressionX:sql]) != nil) {
[self errorWithFormat:@"%s: cannot execute acl-fetch SQL '%@': %@",
__PRETTY_FUNCTION__, sql, error];
[self releaseChannel:channel];
return;
}
[self releaseChannel:channel];
return;
}
[self releaseChannel:channel];
[self releaseChannel:channel];
}
}
/* description */