@@ -19,19 +19,23 @@
#pragma mark -
#pragma mark up/down methods
-- (void)up {
+- (void)up
+{
NSLog([NSString stringWithFormat:@"%s: -up method not implemented", [self className]]);
}
-- (void)down {
+- (void)down
+{
NSLog([NSString stringWithFormat:@"%s: -down method not implemented", [self className]]);
}
-- (void)upWithDatabase:(FMDatabase *)db {
+- (void)upWithDatabase:(FMDatabase *)db
+{
self.db = db;
[self up];
}
-- (void)downWithDatabase:(FMDatabase *)db {
+- (void)downWithDatabase:(FMDatabase *)db
+{
self.db = db;
[self down];
}
@@ -39,25 +43,28 @@
#pragma mark -
#pragma mark Helper methods for manipulating database schema
-- (void)createTable:(NSString *)tableName withColumns:(NSArray *)columns {
+- (void)createTable:(NSString *)tableName withColumns:(NSArray *)columns
+{
[self createTable:tableName];
- for (FmdbMigrationColumn *migrationColumn in columns)
- {
+ for (FmdbMigrationColumn *migrationColumn in columns) {
[self addColumn:migrationColumn forTableName:tableName];
}
}
-- (void)createTable:(NSString *)tableName {
+- (void)createTable:(NSString *)tableName
+{
NSString *sql = [NSString stringWithFormat:@"CREATE TABLE IF NOT EXISTS %@ (id integer primary key autoincrement)", tableName];
[db_ executeUpdate:sql];
}
-- (void)dropTable:(NSString *)tableName {
+- (void)dropTable:(NSString *)tableName
+{
NSString *sql = [NSString stringWithFormat:@"DROP TABLE IF EXISTS %@", tableName];
[db_ executeUpdate:sql];
}
-- (void)addColumn:(FmdbMigrationColumn *)column forTableName:(NSString *)tableName {
+- (void)addColumn:(FmdbMigrationColumn *)column forTableName:(NSString *)tableName
+{
NSString *sql = [NSString stringWithFormat:@"ALTER TABLE %@ ADD COLUMN %@", tableName, [column sqlDefinition]];
[db_ executeUpdate:sql];
}
@@ -66,7 +73,8 @@
#pragma mark -
#pragma mark Unit testing helpers
-- (id)initWithDatabase:(FMDatabase *)db {
+- (id)initWithDatabase:(FMDatabase *)db
+{
if ([super init]) {
self.db = db;
return self;
Classes/FmdbMigration.m
@@ -39,20 +39,23 @@
// * The column may not have a PRIMARY KEY or UNIQUE constraint.
// * 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 *)sqlDefinition
+{
NSString *sql = [NSString stringWithFormat:@"%@ %@", self.columnName, self.columnTypeDefinition];
return sql;
}
-- (NSString *)columnTypeDefinition {
+- (NSString *)columnTypeDefinition
+{
return self.columnType;
}
-- (void)dealloc {
+- (void)dealloc
+{
[columnName_ release];
[columnType_ release];
[defaultValue_ release];
-
+
[super dealloc];
}
@end
Classes/FmdbMigrationColumn.m
@@ -59,8 +59,7 @@
- (void)performMigrations
{
NSInteger i;
- for(i = self.currentVersion; i < [self.migrations count]; ++i)
- {
+ for(i = self.currentVersion; i < [self.migrations count]; ++i) {
FmdbMigration *migration = [self.migrations objectAtIndex:i];
[migration upWithDatabase:self.db];
[self recordVersionStateAfterMigrating:i + 1];
@@ -75,16 +74,14 @@
aVersion = (aVersion>self.migrations.count)?self.migrations.count:aVersion;
if (aVersion < self.currentVersion) {
- for(i = self.currentVersion; i > aVersion; --i)
- {
+ for(i = self.currentVersion; i > aVersion; --i) {
FmdbMigration *migration = [self.migrations objectAtIndex:i - 1];
[migration downWithDatabase:self.db];
[self recordVersionStateAfterMigrating:i - 1];
currentVersion_ = i - 1;
}
} else {
- for(i = self.currentVersion; i < aVersion; ++i)
- {
+ for(i = self.currentVersion; i < aVersion; ++i) {
FmdbMigration *migration = [self.migrations objectAtIndex:i];
[migration upWithDatabase:self.db];
[self recordVersionStateAfterMigrating:i + 1];
@@ -121,7 +118,7 @@
[self initializeSchemaMigrationsTable];
currentVersion_ = [db_ intForQuery:[NSString stringWithFormat:@"SELECT version FROM %@", self.schemaMigrationsTableName]];
- if(currentVersion_ == 0) {
+ if(currentVersion_ == 0) {
NSInteger anyRows = [db_ intForQuery:[NSString stringWithFormat:@"SELECT count(version) FROM %@", self.schemaMigrationsTableName]];
if (anyRows == 0) {
[db_ executeUpdate:[NSString stringWithFormat:@"INSERT INTO %@ (version) VALUES (0)", self.schemaMigrationsTableName]];
Classes/FmdbMigrationManager.m
96b5e7e214c0a414d422264198b9ddb9d2b7dcab
Dr Nic Williams
drnicwilliams@gmail.com
http://github.com/drnic/fmdb-migration-manager/commit/ab3be3659f1cb3100648d97eb6114c22bf5ac0c6
ab3be3659f1cb3100648d97eb6114c22bf5ac0c6
2008-09-09T04:22:31-07:00
2008-09-09T04:22:31-07:00
refactor methods + for/if blocks to consistent {..} patterns
508bb78a26c50e4f85083865ac14f361ea3b4dd9
Dr Nic Williams
drnicwilliams@gmail.com