Browse Source

How the hell did all these tabs get in here…

August Mueller 14 years ago
parent
commit
423fbc7fd2
6 changed files with 24 additions and 24 deletions
  1. 6 6
      CHANGES_AND_TODO_LIST.txt
  2. 2 2
      src/FMDatabase.h
  3. 4 4
      src/FMDatabasePool.m
  4. 4 4
      src/FMDatabaseQueue.m
  5. 1 1
      src/FMResultSet.m
  6. 7 7
      src/fmdb.m

+ 6 - 6
CHANGES_AND_TODO_LIST.txt

@@ -20,18 +20,18 @@ If you would like to contribute some code- awesome!  I just ask that you make it
     Added + (BOOL)isThreadSafe to FMDatabase.  It'll let you know if the version of SQLite you are running is compiled with it's thread safe options.  THIS DOES NOT MEAN FMDATABASE IS THREAD SAFE.  I haven't done a review of it for this case, so I'm just saying.
 
 2011.04.09
-	Added a method to validate a SQL statement.
-	Added a method to retrieve the number of columns in a result set.
-	Added two methods to execute queries and updates with NSString-style format specifiers.
+    Added a method to validate a SQL statement.
+    Added a method to retrieve the number of columns in a result set.
+    Added two methods to execute queries and updates with NSString-style format specifiers.
     Thanks to Dave DeLong for the patches!
 
 2011.03.12
-	Added compatibility with garbage collection.
-	When an FMDatabase is closed, all open FMResultSets pertaining to that database are also closed.
+    Added compatibility with garbage collection.
+    When an FMDatabase is closed, all open FMResultSets pertaining to that database are also closed.
     Added:
     - (id) objectForColumnIndex:(int)columnIdx;
     - (id) objectForColumnName:(NSString*)columnName;
-	Changes by Dave DeLong.
+    Changes by Dave DeLong.
 
 2011.02.05
     The -(int)changes; method on FMDatabase is a bit more robust now, and there's a new static library target.  And if a database path is nil, we now open up a :memory: database. Patch from Pascal Pfiffner!

+ 2 - 2
src/FMDatabase.h

@@ -45,8 +45,8 @@
     int                 _busyRetryTimeout;
     
     NSMutableDictionary *_cachedStatements;
-	NSMutableSet        *_openResultSets;
-	NSMutableSet        *_openFunctions;
+    NSMutableSet        *_openResultSets;
+    NSMutableSet        *_openFunctions;
 
 #ifdef FMDB_USE_WEAK_POOL
     __weak FMDatabasePool *_poolAccessViaMethodOnly;

+ 4 - 4
src/FMDatabasePool.m

@@ -20,17 +20,17 @@ + (id)databasePoolWithPath:(NSString*)aPath {
 }
 
 - (id)initWithPath:(NSString*)aPath {
-	
+    
     self = [super init];
     
-	if (self != nil) {
+    if (self != nil) {
         _path               = [aPath copy];
         _lockQueue          = dispatch_queue_create([[NSString stringWithFormat:@"fmdb.%@", self] UTF8String], NULL);
         _databaseInPool     = FMDBReturnRetained([NSMutableArray array]);
         _databaseOutPool    = FMDBReturnRetained([NSMutableArray array]);
-	}
+    }
     
-	return self;
+    return self;
 }
 
 - (void)dealloc {

+ 4 - 4
src/FMDatabaseQueue.m

@@ -23,10 +23,10 @@ + (id)databaseQueueWithPath:(NSString*)aPath {
 }
 
 - (id)initWithPath:(NSString*)aPath {
-	
+    
     self = [super init];
     
-	if (self != nil) {
+    if (self != nil) {
         
         _db = [FMDatabase databaseWithPath:aPath];
         FMDBRetain(_db);
@@ -40,9 +40,9 @@ - (id)initWithPath:(NSString*)aPath {
         _path = FMDBReturnRetained(aPath);
         
         _queue = dispatch_queue_create([[NSString stringWithFormat:@"fmdb.%@", self] UTF8String], NULL);
-	}
+    }
     
-	return self;
+    return self;
 }
 
 - (void)dealloc {

+ 1 - 1
src/FMResultSet.m

@@ -58,7 +58,7 @@ - (void)close {
 }
 
 - (int)columnCount {
-	return sqlite3_column_count([_statement statement]);
+    return sqlite3_column_count([_statement statement]);
 }
 
 - (void)setupColumnNames {

+ 7 - 7
src/fmdb.m

@@ -22,11 +22,11 @@ int main (int argc, const char * argv[]) {
     NSLog(@"Is SQLite compiled with it's thread safe options turned on? %@!", [FMDatabase isSQLiteThreadSafe] ? @"Yes" : @"No");
     
     {
-		// -------------------------------------------------------------------------------
-		// Un-opened database check.		
-		FMDBQuickCheck([db executeQuery:@"select * from table"] == nil);
-		NSLog(@"%d: %@", [db lastErrorCode], [db lastErrorMessage]);
-	}
+        // -------------------------------------------------------------------------------
+        // Un-opened database check.
+        FMDBQuickCheck([db executeQuery:@"select * from table"] == nil);
+        NSLog(@"%d: %@", [db lastErrorCode], [db lastErrorMessage]);
+    }
     
     
     if (![db open]) {
@@ -609,7 +609,7 @@ int main (int argc, const char * argv[]) {
         FMStatement *statement;
         
         while ((statement = [e nextObject])) {
-        	NSLog(@"%@", statement);
+            NSLog(@"%@", statement);
         }
     }
     
@@ -775,7 +775,7 @@ int main (int argc, const char * argv[]) {
         
     }
     
-	[db executeUpdate:@"insert into easy values (?)", [NSNumber numberWithInt:3]];
+    [db executeUpdate:@"insert into easy values (?)", [NSNumber numberWithInt:3]];
     
     FMDBQuickCheck([dbPool countOfOpenDatabases] == 1);