call setSchema in createTables, copy custom schema

shaozg · Jan 29, 2015 · cfcafaf · cfcafaf
1 parent b32d56f
commit cfcafaf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/Realm/RLMObjectStore.mm b/Realm/RLMObjectStore.mm
@@ -176,11 +176,9 @@ static bool RLMRealmCreateTables(RLMRealm *realm, RLMSchema *targetSchema, bool
     // create metadata tables if neded
     bool changed = RLMRealmCreateMetadataTables(realm);
 
-    realm.schema = targetSchema;
-
     // first pass to create missing tables
     NSMutableArray *objectSchemaToUpdate = [NSMutableArray array];
-    for (RLMObjectSchema *objectSchema in realm.schema.objectSchema) {
+    for (RLMObjectSchema *objectSchema in targetSchema.objectSchema) {
         bool created = false;
         objectSchema.table = RLMTableForObjectClass(realm, objectSchema.className, created).get();
 
@@ -230,11 +228,8 @@ static bool RLMRealmCreateTables(RLMRealm *realm, RLMSchema *targetSchema, bool
 
     // FIXME - remove deleted tables
 
-    for (RLMObjectSchema *objectSchema in realm.schema.objectSchema) {
-        objectSchema.realm = realm;
-        RLMObjectSchema *tableSchema = [RLMObjectSchema schemaFromTableForClassName:objectSchema.className realm:realm];
-        RLMVerifyAndAlignColumns(tableSchema, objectSchema);
-    }
+    // set and validate final schema
+    RLMRealmSetSchema(realm, targetSchema, true);
 
     return changed;
 }

diff --git a/Realm/RLMRealm.mm b/Realm/RLMRealm.mm
@@ -508,8 +508,9 @@ + (instancetype)realmWithPath:(NSString *)path
             }
             else {
                 // if we are the first realm at this path, set/align schema or perform migration if needed
-                RLMSchema *targetSchema = customSchema ?: [RLMSchema.sharedSchema copy];
-                NSError *error = RLMUpdateRealmToSchemaVersion(realm, schemaVersionForPath(path), targetSchema, [realm migrationBlock:key]);
+                RLMSchema *targetSchema = customSchema ?: RLMSchema.sharedSchema;
+                NSError *error = RLMUpdateRealmToSchemaVersion(realm, schemaVersionForPath(path),
+                                                               [targetSchema copy], [realm migrationBlock:key]);
                 if (error) {
                     setOrThrowError(error, outError);
                     return nil;