From 769979d8d5fded20d18f4573090c7fc5904fb9ff Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Tue, 20 Apr 2010 20:22:15 +0000 Subject: [PATCH] Monotone-Parent: 72e31717fbab90d678f049356e5b620eaaf91253 Monotone-Revision: 7b6ad79fde0791f201e8b98eb957ded1410de5c1 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-04-20T20:22:15 Monotone-Branch: ca.inverse.sogo --- SOPE/GDLContentStore/ChangeLog | 5 +++++ SOPE/GDLContentStore/EOAdaptorChannel+GCS.m | 21 ++++++++++----------- 2 files changed, 15 insertions(+), 11 deletions(-) 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