examples fixes

shaozg · Jan 16, 2015 · 48808dd · 48808dd
1 parent 8b04aa5
commit 48808dd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/examples/ios/objc/Migration/AppDelegate.m b/examples/ios/objc/Migration/AppDelegate.m
@@ -48,7 +48,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     // define a migration block
     // you can define this inline, but we will reuse this to migrate realm files from multiple versions
     // to the most current version of our data model
-    [RLMRealm setSchemaVersion:3 withMigrationBlock:^(RLMMigration *migration, NSUInteger oldSchemaVersion) {
+    RLMMigrationBlock migrationBlock = ^(RLMMigration *migration, NSUInteger oldSchemaVersion) {
         if (oldSchemaVersion < 1) {
             [migration enumerateObjects:Person.className block:^(RLMObject *oldObject, RLMObject *newObject) {
                 if (oldSchemaVersion < 1) {
@@ -75,7 +75,10 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
             }];
         }
         NSLog(@"Migration complete.");
-    }];
+    };
+
+    // set the schema verion and migration block for the defualt realm
+    [RLMRealm setDefaultRealmSchemaVersion:3 withMigrationBlock:migrationBlock];
 
     // now that we have called `setSchemaVersion:withMigrationBlock` opening an outdated Realm will automatically
     // perform the migration and opening the Realm will succeed
@@ -96,6 +99,10 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     [[NSFileManager defaultManager] removeItemAtPath:realmv2Path error:nil];
     [[NSFileManager defaultManager] copyItemAtPath:v2Path toPath:realmv2Path error:nil];
 
+    // set schemave versions and migration blocks form Realms at each path
+    [RLMRealm setSchemaVersion:3 forRealmAtPath:realmv1Path withMigrationBlock:migrationBlock];
+    [RLMRealm setSchemaVersion:3 forRealmAtPath:realmv2Path withMigrationBlock:migrationBlock];
+
     // manully migration v1Path, v2Path is migrated implicitly on access
     [RLMRealm migrateRealmAtPath:realmv1Path];
 

diff --git a/examples/ios/swift/Migration/AppDelegate.swift b/examples/ios/swift/Migration/AppDelegate.swift
@@ -90,7 +90,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             }
             println("Migration complete.")
         }
-        RLMRealm.setSchemaVersion(3, withMigrationBlock: migrationBlock)
+        RLMRealm.setDefaultRealmSchemaVersion(3, withMigrationBlock: migrationBlock)
 
         // print out all migrated objects in the default realm
         // migration is performed implicitly on Realm access
@@ -109,6 +109,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         NSFileManager.defaultManager().removeItemAtPath(realmv2Path, error: nil)
         NSFileManager.defaultManager().copyItemAtPath(v2Path, toPath: realmv2Path, error: nil)
 
+        // set the schema version and migration blocks for our custom path realms
+        RLMRealm.setSchemaVersion(3, forRealmAtPath: realmv1Path, withMigrationBlock: migrationBlock)
+        RLMRealm.setSchemaVersion(3, forRealmAtPath: realmv2Path, withMigrationBlock: migrationBlock)
+
         // migrate realms at realmv1Path manually, realmv2Path is migrated automatically on access
         RLMRealm.migrateRealmAtPath(realmv1Path)