diff --git a/SOPE/GDLContentStore/ChangeLog b/SOPE/GDLContentStore/ChangeLog index 346161784..7d7d44dbb 100644 --- a/SOPE/GDLContentStore/ChangeLog +++ b/SOPE/GDLContentStore/ChangeLog @@ -1,3 +1,8 @@ +2010-04-20 Wolfgang Sourdeau + + * EOAdaptorChannel+GCS.m (-tableExistsWithName:): cleaned method + up. + 2009-11-30 Wolfgang Sourdeau * GCSChannelManager.m (-databaseKeyForURL): removed obsolete diff --git a/SOPE/GDLContentStore/EOAdaptorChannel+GCS.m b/SOPE/GDLContentStore/EOAdaptorChannel+GCS.m index 0eb36facd..649d19383 100644 --- a/SOPE/GDLContentStore/EOAdaptorChannel+GCS.m +++ b/SOPE/GDLContentStore/EOAdaptorChannel+GCS.m @@ -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