Monotone-Parent: 72e31717fbab90d678f049356e5b620eaaf91253

Monotone-Revision: 7b6ad79fde0791f201e8b98eb957ded1410de5c1

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-04-20T20:22:15
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2010-04-20 20:22:15 +00:00
parent 0a527f0f8d
commit 769979d8d5
2 changed files with 15 additions and 11 deletions

View File

@ -1,3 +1,8 @@
2010-04-20 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* EOAdaptorChannel+GCS.m (-tableExistsWithName:): cleaned method
up.
2009-11-30 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* GCSChannelManager.m (-databaseKeyForURL): removed obsolete

View File

@ -26,28 +26,27 @@
@implementation EOAdaptorChannel(GCS)
- (BOOL) tableExistsWithName: (NSString *) _tableName
- (BOOL) tableExistsWithName: (NSString *) tableName
{
NSException *ex;
NSString *sql;
BOOL didOpen;
NSString *sql;
BOOL didOpen;
didOpen = NO;
if (![self isOpen]) {
if (![self openChannel])
return NO;
didOpen = YES;
}
sql = @"SELECT COUNT(*) FROM ";
sql = [sql stringByAppendingString:_tableName];
sql = [sql stringByAppendingString:@" WHERE 1 = 2"];
ex = [[[self evaluateExpressionX:sql] retain] autorelease];
sql = [NSString stringWithFormat: @"SELECT COUNT(*) FROM %@ WHERE 1 = 2",
tableName];
ex = [self evaluateExpressionX: sql];
[self cancelFetch];
if (didOpen) [self closeChannel];
return ex != nil ? NO : YES;
return (ex == nil);
}
- (void) dropTables: (NSArray *) tableNames