reformat objc via xcode

jsheets · Sep 8, 2008 · 40a0586 · 40a0586
1 parent c3dc527
commit 40a0586
Show file tree

Hide file tree

Showing 6 changed files with 70 additions and 70 deletions.
diff --git a/Classes/FmdbMigration.h b/Classes/FmdbMigration.h
@@ -11,7 +11,7 @@
 #import "FmdbMigrationColumn.h"
 
 @interface FmdbMigration : NSObject {
-  FMDatabase *db_;
+	FMDatabase *db_;
 }
 @property (retain) FMDatabase *db;
 

diff --git a/Classes/FmdbMigration.m b/Classes/FmdbMigration.m
@@ -13,71 +13,71 @@ @implementation FmdbMigration
 @synthesize db=db_;
 
 + (id)migration {
-  return [[[self alloc] init] autorelease];
+	return [[[self alloc] init] autorelease];
 }
 
 #pragma mark -
 #pragma mark up/down methods
 
 - (void)up {
-  NSLog([NSString stringWithFormat:@"%s: -up method not implemented", [self className]]);
+	NSLog([NSString stringWithFormat:@"%s: -up method not implemented", [self className]]);
 }
 
 - (void)down {
-  NSLog([NSString stringWithFormat:@"%s: -down method not implemented", [self className]]);
+	NSLog([NSString stringWithFormat:@"%s: -down method not implemented", [self className]]);
 }
 
 - (void)upWithDatabase:(FMDatabase *)db {
-  self.db = db;
-  [self up];
+	self.db = db;
+	[self up];
 }
 - (void)downWithDatabase:(FMDatabase *)db {
-  self.db = db;
-  [self down];
+	self.db = db;
+	[self down];
 }
 
 #pragma mark -
 #pragma mark Helper methods for manipulating database schema
 
 - (void)createTable:(NSString *)tableName withColumns:(NSArray *)columns {
-  [self createTable:tableName];
-  for (FmdbMigrationColumn *migrationColumn in columns)
-  {
-    [self addColumn:migrationColumn forTableName:tableName];
-  }
+	[self createTable:tableName];
+	for (FmdbMigrationColumn *migrationColumn in columns)
+	{
+		[self addColumn:migrationColumn forTableName:tableName];
+	}
 }
 
 - (void)createTable:(NSString *)tableName {
-  NSString *sql = [NSString stringWithFormat:@"CREATE TABLE IF NOT EXISTS %@ (id integer primary key autoincrement)", tableName];
-  [db_ executeUpdate:sql];
+	NSString *sql = [NSString stringWithFormat:@"CREATE TABLE IF NOT EXISTS %@ (id integer primary key autoincrement)", tableName];
+	[db_ executeUpdate:sql];
 }
 
 - (void)dropTable:(NSString *)tableName {
-  NSString *sql = [NSString stringWithFormat:@"DROP TABLE IF EXISTS %@", tableName];
-  [db_ executeUpdate:sql];
+	NSString *sql = [NSString stringWithFormat:@"DROP TABLE IF EXISTS %@", tableName];
+	[db_ executeUpdate:sql];
 }
 
 - (void)addColumn:(FmdbMigrationColumn *)column forTableName:(NSString *)tableName {
-  NSString *sql = [NSString stringWithFormat:@"ALTER TABLE %@ ADD COLUMN %@", tableName, [column sqlDefinition]];
-  [db_ executeUpdate:sql];
+	NSString *sql = [NSString stringWithFormat:@"ALTER TABLE %@ ADD COLUMN %@", tableName, [column sqlDefinition]];
+	[db_ executeUpdate:sql];
 }
 
 
 #pragma mark -
 #pragma mark Unit testing helpers
 
 - (id)initWithDatabase:(FMDatabase *)db {
-  if ([super init]) {
-    self.db = db;
-    return self;
-  }
-  return nil;
+	if ([super init]) {
+		self.db = db;
+		return self;
+	}
+	return nil;
 }
 
 - (void)dealloc
 {
 	[db_ release];
-
+	
 	[super dealloc];
 }
 

diff --git a/Classes/FmdbMigrationColumn.h b/Classes/FmdbMigrationColumn.h
@@ -10,9 +10,9 @@
 
 
 @interface FmdbMigrationColumn : NSObject {
-  NSString *columnName_;
-  NSString *columnType_;
-  id defaultValue_;
+	NSString *columnName_;
+	NSString *columnType_;
+	id defaultValue_;
 }
 @property (retain) NSString *columnName;
 @property (retain) NSString *columnType;
@@ -23,7 +23,7 @@
 + (FmdbMigrationColumn*)columnWithColumnName:(NSString*)columnName
                                   columnType:(NSString*)columnType
                                 defaultValue:(id)defaultValue;
-                                
+
 // Used for sql queries "ALTER TABLE table_name ADD COLUMN [column sqlDefinition]"
 - (NSString *)sqlDefinition;
 

diff --git a/Classes/FmdbMigrationColumn.m b/Classes/FmdbMigrationColumn.m
@@ -19,19 +19,19 @@ @implementation FmdbMigrationColumn
 + (FmdbMigrationColumn*)columnWithColumnName:(NSString*)columnName
                                   columnType:(NSString*)columnType
 {
-  FmdbMigrationColumn* column = [[[FmdbMigrationColumn alloc] init] autorelease];
-  column.columnName = columnName;
-  column.columnType = columnType;
-  return column;
+	FmdbMigrationColumn* column = [[[FmdbMigrationColumn alloc] init] autorelease];
+	column.columnName = columnName;
+	column.columnType = columnType;
+	return column;
 }
 
 + (FmdbMigrationColumn*)columnWithColumnName:(NSString*)columnName
                                   columnType:(NSString*)columnType
                                 defaultValue:(id)defaultValue
 {
-  FmdbMigrationColumn* column = [self columnWithColumnName:columnName columnType:columnType];
-  column.defaultValue = defaultValue;
-  return column;
+	FmdbMigrationColumn* column = [self columnWithColumnName:columnName columnType:columnType];
+	column.defaultValue = defaultValue;
+	return column;
 }
 
 // Notes from http://www.sqlite.org/lang_altertable.html:
@@ -40,12 +40,12 @@ + (FmdbMigrationColumn*)columnWithColumnName:(NSString*)columnName
 //  * The column may not have a default value of CURRENT_TIME, CURRENT_DATE or CURRENT_TIMESTAMP.
 //  * If a NOT NULL constraint is specified, then the column must have a default value other than NULL.
 - (NSString *)sqlDefinition {
-  NSString *sql = [NSString stringWithFormat:@"%@ %@", self.columnName, self.columnTypeDefinition];
-  return sql;
+	NSString *sql = [NSString stringWithFormat:@"%@ %@", self.columnName, self.columnTypeDefinition];
+	return sql;
 }
 
 - (NSString *)columnTypeDefinition {
-  return self.columnType;
+	return self.columnType;
 }
 
 - (void)dealloc {

diff --git a/Classes/FmdbMigrationManager.h b/Classes/FmdbMigrationManager.h
@@ -10,9 +10,9 @@
 #import "FMDatabase.h"
 
 @interface FmdbMigrationManager : NSObject {
-  FMDatabase *db_;
-  NSArray *migrations_;
-  int currentVersion_;
+	FMDatabase *db_;
+	NSArray *migrations_;
+	int currentVersion_;
 }
 @property (retain) FMDatabase *db;
 @property (retain) NSArray *migrations;

diff --git a/Classes/FmdbMigrationManager.m b/Classes/FmdbMigrationManager.m
@@ -16,49 +16,49 @@ @implementation FmdbMigrationManager
 @synthesize db=db_, currentVersion=currentVersion_, migrations=migrations_;
 
 + (id)executeForDatabase:(FMDatabase *)db withMigrations:(NSArray *)migrations {
-  FmdbMigrationManager *manager = [[[self alloc] initWithDatabase:db] autorelease];
-  manager.migrations = migrations;
-  [manager executeMigrations];
-  return manager;
+	FmdbMigrationManager *manager = [[[self alloc] initWithDatabase:db] autorelease];
+	manager.migrations = migrations;
+	[manager executeMigrations];
+	return manager;
 }
 
 - (void)executeMigrations {
-  [self initializeSchemaMigrationsTable];
-  [self performMigrations];
+	[self initializeSchemaMigrationsTable];
+	[self performMigrations];
 }
 
 #pragma mark -
 #pragma mark Internal methods
 
 - (void)initializeSchemaMigrationsTable {
-  // create schema_info table if doesn't already exist
-  NSString *tableName = [self schemaMigrationsTableName];
-  NSString *sql = [NSString stringWithFormat:@"CREATE TABLE IF NOT EXISTS %@ (version INTEGER unique default 0)", tableName];
-  [db_ executeUpdate:sql];
-  // TODO: add index on version column 'unique_schema_migrations'
-
-  FMResultSet *rs = [db_ executeQuery:[NSString stringWithFormat:@"SELECT * FROM %@", tableName]];
-  if([rs next]) {
-    currentVersion_ = [rs intForColumn:@"version"];
-    [rs close];
-  } else {
-    currentVersion_ = 0;
-    [rs close];
-    [self.db executeUpdate:[NSString stringWithFormat:@"INSERT INTO %@ DEFAULT VALUES", tableName]];
-  }
+	// create schema_info table if doesn't already exist
+	NSString *tableName = [self schemaMigrationsTableName];
+	NSString *sql = [NSString stringWithFormat:@"CREATE TABLE IF NOT EXISTS %@ (version INTEGER unique default 0)", tableName];
+	[db_ executeUpdate:sql];
+	// TODO: add index on version column 'unique_schema_migrations'
+	
+	FMResultSet *rs = [db_ executeQuery:[NSString stringWithFormat:@"SELECT * FROM %@", tableName]];
+	if([rs next]) {
+		currentVersion_ = [rs intForColumn:@"version"];
+		[rs close];
+	} else {
+		currentVersion_ = 0;
+		[rs close];
+		[self.db executeUpdate:[NSString stringWithFormat:@"INSERT INTO %@ DEFAULT VALUES", tableName]];
+	}
 }
 
 - (NSString *)schemaMigrationsTableName {
-  return @"schema_info";
+	return @"schema_info";
 }
 
 - (void)performMigrations {
-  int i;
-  for(i = self.currentVersion; i < [self.migrations count]; ++i)
-  {
-    FmdbMigration *migration = [self.migrations objectAtIndex:i];
-    [migration upWithDatabase:self.db];
-  }
+	int i;
+	for(i = self.currentVersion; i < [self.migrations count]; ++i)
+	{
+		FmdbMigration *migration = [self.migrations objectAtIndex:i];
+		[migration upWithDatabase:self.db];
+	}
 }
 
 - (id)initWithDatabase:(FMDatabase *)db {