Преглед изворни кода

FMDatabase: specify return type of -executeQuery:

Also reorder prototypes to make more sense in the context of the
comments here.
Augie Fackler пре 15 година
родитељ
комит
480917094c
2 измењених фајлова са 7 додато и 7 уклоњено
  1. 4 4
      src/FMDatabase.h
  2. 3 3
      src/FMDatabase.m

+ 4 - 4
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;

+ 3 - 3
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];
 }