Merge branch 'master' of [email protected]:ccgus/fmdb

tianshanxuester · Sep 19, 2010 · c01a501 · c01a501
2 parents b873e06 + 4809170
commit c01a501
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/FMDatabase.h b/src/FMDatabase.h
@@ -46,12 +46,12 @@
 
 - (BOOL)executeUpdate:(NSString*)sql, ...;
 - (BOOL)executeUpdate:(NSString*)sql withArgumentsInArray:(NSArray *)arguments;
-- (id)executeQuery:(NSString *)sql withArgumentsInArray:(NSArray*)arrayArgs orVAList:(va_list)args; // you shouldn't ever need to call this.  use the previous two instead.
-
-- (id)executeQuery:(NSString*)sql, ...;
-- (id)executeQuery:(NSString *)sql withArgumentsInArray:(NSArray *)arguments;
 - (BOOL)executeUpdate:(NSString*)sql withArgumentsInArray:(NSArray*)arrayArgs orVAList:(va_list)args; // you shouldn't ever need to call this.  use the previous two instead.
 
+- (FMResultSet *)executeQuery:(NSString*)sql, ...;
+- (FMResultSet *)executeQuery:(NSString *)sql withArgumentsInArray:(NSArray *)arguments;
+- (FMResultSet *)executeQuery:(NSString *)sql withArgumentsInArray:(NSArray*)arrayArgs orVAList:(va_list)args; // you shouldn't ever need to call this.  use the previous two instead.
+
 - (BOOL)rollback;
 - (BOOL)commit;
 - (BOOL)beginTransaction;

diff --git a/src/FMDatabase.m b/src/FMDatabase.m
@@ -250,7 +250,7 @@ - (void)bindObject:(id)obj toColumn:(int)idx inStatement:(sqlite3_stmt*)pStmt; {
     }
 }
 
-- (id)executeQuery:(NSString *)sql withArgumentsInArray:(NSArray*)arrayArgs orVAList:(va_list)args {
+- (FMResultSet *)executeQuery:(NSString *)sql withArgumentsInArray:(NSArray*)arrayArgs orVAList:(va_list)args {
 
     if (inUse) {
         [self compainAboutInUse];
@@ -370,7 +370,7 @@ - (id)executeQuery:(NSString *)sql withArgumentsInArray:(NSArray*)arrayArgs orVA
     return rs;
 }
 
-- (id)executeQuery:(NSString*)sql, ... {
+- (FMResultSet *)executeQuery:(NSString*)sql, ... {
     va_list args;
     va_start(args, sql);
 
@@ -380,7 +380,7 @@ - (id)executeQuery:(NSString*)sql, ... {
     return result;
 }
 
-- (id)executeQuery:(NSString *)sql withArgumentsInArray:(NSArray *)arguments {
+- (FMResultSet *)executeQuery:(NSString *)sql withArgumentsInArray:(NSArray *)arguments {
     return [self executeQuery:sql withArgumentsInArray:arguments orVAList:nil];
 }