@@ -6,7 +6,7 @@ // Copyright 2008 Mocra. All rights reserved. // -#import "FmdbMigrationColumn.h" +#import "FmdbMigration.h" @implementation FmdbMigration Classes/FmdbMigration.m @@ -17,6 +17,10 @@ 31C43B710E72AAD80006AF5D /* FmdbMigrationManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 31C43B6F0E72AAD80006AF5D /* FmdbMigrationManager.h */; }; 31C43B720E72AAD80006AF5D /* FmdbMigrationManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 31C43B700E72AAD80006AF5D /* FmdbMigrationManager.m */; }; 31C43B7D0E72AB2E0006AF5D /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 31C43B7C0E72AB2E0006AF5D /* libsqlite3.dylib */; }; + 31C43B860E72B92C0006AF5D /* FmdbMigrationColumn.h in Headers */ = {isa = PBXBuildFile; fileRef = 31C43B840E72B92C0006AF5D /* FmdbMigrationColumn.h */; }; + 31C43B870E72B92C0006AF5D /* FmdbMigrationColumn.m in Sources */ = {isa = PBXBuildFile; fileRef = 31C43B850E72B92C0006AF5D /* FmdbMigrationColumn.m */; }; + 31C43B8A0E72C6150006AF5D /* FmdbMigration.h in Headers */ = {isa = PBXBuildFile; fileRef = 31C43B880E72C6150006AF5D /* FmdbMigration.h */; }; + 31C43B8B0E72C6150006AF5D /* FmdbMigration.m in Sources */ = {isa = PBXBuildFile; fileRef = 31C43B890E72C6150006AF5D /* FmdbMigration.m */; }; D2AAC0CC05546C4400DB518D /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */; }; /* End PBXBuildFile section */ @@ -38,6 +42,10 @@ 31C43B6F0E72AAD80006AF5D /* FmdbMigrationManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FmdbMigrationManager.h; path = Classes/FmdbMigrationManager.h; sourceTree = "<group>"; }; 31C43B700E72AAD80006AF5D /* FmdbMigrationManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FmdbMigrationManager.m; path = Classes/FmdbMigrationManager.m; sourceTree = "<group>"; }; 31C43B7C0E72AB2E0006AF5D /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; }; + 31C43B840E72B92C0006AF5D /* FmdbMigrationColumn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FmdbMigrationColumn.h; path = Classes/FmdbMigrationColumn.h; sourceTree = "<group>"; }; + 31C43B850E72B92C0006AF5D /* FmdbMigrationColumn.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FmdbMigrationColumn.m; path = Classes/FmdbMigrationColumn.m; sourceTree = "<group>"; }; + 31C43B880E72C6150006AF5D /* FmdbMigration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FmdbMigration.h; path = Classes/FmdbMigration.h; sourceTree = "<group>"; }; + 31C43B890E72C6150006AF5D /* FmdbMigration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FmdbMigration.m; path = Classes/FmdbMigration.m; sourceTree = "<group>"; }; 32DBCF5E0370ADEE00C91783 /* fmdb-migration-manager_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "fmdb-migration-manager_Prefix.pch"; sourceTree = "<group>"; }; D2A6134D07B89F6200DD23D3 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; }; D2AAC0C705546C1D00DB518D /* fmdb-migration-manager.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = "fmdb-migration-manager.dylib"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -90,6 +98,10 @@ 08FB77AEFE84172EC02AAC07 /* Classes */ = { isa = PBXGroup; children = ( + 31C43B880E72C6150006AF5D /* FmdbMigration.h */, + 31C43B890E72C6150006AF5D /* FmdbMigration.m */, + 31C43B840E72B92C0006AF5D /* FmdbMigrationColumn.h */, + 31C43B850E72B92C0006AF5D /* FmdbMigrationColumn.m */, 31C43B6F0E72AAD80006AF5D /* FmdbMigrationManager.h */, 31C43B700E72AAD80006AF5D /* FmdbMigrationManager.m */, ); @@ -166,6 +178,8 @@ 315E9EF90E6FF9C5000A84C0 /* FMDatabaseAdditions.h in Headers */, 315E9EFC0E6FF9C5000A84C0 /* FMResultSet.h in Headers */, 31C43B710E72AAD80006AF5D /* FmdbMigrationManager.h in Headers */, + 31C43B860E72B92C0006AF5D /* FmdbMigrationColumn.h in Headers */, + 31C43B8A0E72C6150006AF5D /* FmdbMigration.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -217,6 +231,8 @@ 315E9EFB0E6FF9C5000A84C0 /* fmdb.m in Sources */, 315E9EFD0E6FF9C5000A84C0 /* FMResultSet.m in Sources */, 31C43B720E72AAD80006AF5D /* FmdbMigrationManager.m in Sources */, + 31C43B870E72B92C0006AF5D /* FmdbMigrationColumn.m in Sources */, + 31C43B8B0E72C6150006AF5D /* FmdbMigration.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; fmdb-migration-manager.xcodeproj/project.pbxproj @@ -4,14 +4,16 @@ require "FmdbMigrationManager.bundle" OSX::ns_import :FmdbMigrationManager class TestFmdbMigrationManager < Test::Unit::TestCase + include OSX + should "have FmdbMigrationManager class" do - assert OSX::FmdbMigrationManager + assert FmdbMigrationManager end context "with clean sqlite db" do setup do @db_path = "/tmp/fmdb-test.db" - @db = OSX::FMDatabase.databaseWithPath @db_path + @db = FMDatabase.databaseWithPath @db_path @db.open end @@ -25,7 +27,7 @@ class TestFmdbMigrationManager < Test::Unit::TestCase context "prepare for migrations" do setup do - @migration_manager = OSX::FmdbMigrationManager.alloc.initWithDatabase(@db) + @migration_manager = FmdbMigrationManager.alloc.initWithDatabase(@db) end should "have migration manager" do @@ -85,6 +87,52 @@ class TestFmdbMigrationManager < Test::Unit::TestCase end + context "then create table with columns and default values" do + setup do + # [mm createTable:@"students" withColumns:[NSArray arrayWithObjects: + # [FmdbMigrationColumn columnWithColumnName:@"first_name" columnType:@"string"], + # [FmdbMigrationColumn columnWithColumnName:@"age" columnType:@"integer" defaultValue:21], + # nil]; + @m1 = @migration_manager.createTable_withColumns("students", [ + FmdbMigrationColumn.columnWithColumnName_columnType("first_name", "string"), + FmdbMigrationColumn.columnWithColumnName_columnType_defaultValue("age", "string", 21) + ]) + @results = find_all "students" + end + + teardown { @results.close if @results } + + should_have_no_errors + + should "have table 'students'" do + assert_not_nil(@results) + assert_instance_of(OSX::FMResultSet, @results) + assert(!@results.next?, "Should be no results") + end + + should "have default column 'id'" do + assert_equal(0, @results.columnIndexForName("id")) + end + + should "have default column 'first_name'" do + assert_equal(1, @results.columnIndexForName("first_name")) + end + + should "have default column 'age'" do + assert_equal(2, @results.columnIndexForName("age")) + end + end + + context "and construct migration with up/down" do + setup do + + end + + should "description" do + + end + end + end end test/test_fmdb_migration_manager.rb d8d7cb7f16a119177b32f3ee64266dfeb162e25e Dr Nic Williams drnicwilliams@gmail.com http://github.com/drnic/fmdb-migration-manager/commit/352a788be0f8491c596751868af66354b761c40e 352a788be0f8491c596751868af66354b761c40e 2008-09-06T07:09:53-07:00 2008-09-06T07:09:53-07:00 add new files to project 34b1d1b5bd0abc25951562d80337a0936ff10fe4 Dr Nic Williams drnicwilliams@gmail.com