merge

Realm/RLMObjectSchema.mm

@@ -20,7 +20,7 @@
 #import "RLMProperty_Private.h"
 #import "RLMSchema_Private.h"
 #import "RLMObject_Private.h"
-#import "RLMUtil.h"
+#import "RLMUtil.hpp"
 
 #import <tightdb/table.hpp>
 

Realm/RLMObjectStore.h

@@ -50,5 +50,3 @@ RLMArray *RLMGetObjects(RLMRealm *realm, NSString *objectClassName, NSPredicate
 
 // Create accessors
 RLMObject *RLMCreateObjectAccessor(RLMRealm *realm, NSString *objectClassName, NSUInteger index);
-
-

Realm/RLMObjectStore.mm

@@ -36,7 +36,6 @@ void RLMInitializeObjectStore() {
     });
 }
 
-
 // get the table used to store object of objectClass
 inline tightdb::TableRef RLMTableForObjectClass(RLMRealm *realm,
                                                 NSString *className) {
@@ -114,15 +113,15 @@ void RLMVerifyAndCreateTables(RLMRealm *realm) {
     // first pass create missing tables and verify existing
     for (RLMObjectSchema *objectSchema in realm.schema.objectSchema) {
         tightdb::TableRef table = RLMTableForObjectClass(realm, objectSchema.className);
-        if (!table->is_empty()) {
+        if (table->get_column_count()) {
             RLMVerifyTable(table.get(), objectSchema);
         }
     }
 
     // second pass add columns to empty tables
     for (RLMObjectSchema *objectSchema in realm.schema.objectSchema) {
         tightdb::TableRef table = RLMTableForObjectClass(realm, objectSchema.className);
-        if (table->is_empty()) {
+        if (table->get_column_count() == 0) {
             for (RLMProperty *prop in objectSchema.properties) {
                 RLMCreateColumn(realm, table.get(), prop);
             }

Realm/RLMRealm.mm

@@ -323,8 +323,8 @@ + (instancetype)realmWithPath:(NSString *)path
     }
     else {
         // set the schema for this realm
-        realm->_schema = [RLMSchema sharedSchema];
-        
+        realm.schema = [RLMSchema sharedSchema];
+
         // initialize object store for this realm
         RLMVerifyAndCreateTables(realm);
 

Realm/RLMSchema.mm

@@ -135,7 +135,7 @@ +(instancetype)dynamicSchemaFromRealm:(RLMRealm *)realm {
 
 inline tightdb::TableRef RLMVersionTable(RLMRealm *realm) {
     tightdb::TableRef table = realm.group->get_table(c_metadataTableName);
-    if (table->is_empty()) {
+    if (table->get_column_count() == 0) {
         // create columns
         table->add_column(tightdb::type_Int, c_versionColumnName);
 
@@ -147,7 +147,7 @@ +(instancetype)dynamicSchemaFromRealm:(RLMRealm *)realm {
 }
 
 NSUInteger RLMRealmSchemaVersion(RLMRealm *realm) {
-    return (*RLMVersionTable(realm))[0].get_int(c_versionColumnIndex);
+    return (NSUInteger)(*RLMVersionTable(realm))[0].get_int(c_versionColumnIndex);
 
 }
 

Realm/Tests/ObjectTests.m

@@ -18,22 +18,7 @@
 
 #import "RLMTestCase.h"
 
-//
-// Private Realm methods
-//
-@interface RLMRealm ()
--(RLMSchema *)schema;
-@end
-
-
-//
-// Test Objects
-//
-@interface SimpleObject : RLMObject
-@property NSString *name;
-@property int age;
-@property BOOL hired;
-@end
+#pragma mark - Test Objects
 
 #pragma mark DefaultObject
 
@@ -97,6 +82,12 @@ + (RLMPropertyAttributes)attributesForProperty:(NSString *)propertyName
 }
 @end
 
+#pragma mark - Private
+
+@interface RLMRealm ()
+@property (nonatomic) RLMSchema *schema;
+@end
+
 #pragma mark - Tests
 
 @interface ObjectTests : RLMTestCase
@@ -507,7 +498,7 @@ - (void)testIndex
     RLMProperty *nameProperty = [[RLMRealm defaultRealm] schema][IndexedObject.className][@"name"];
     XCTAssertTrue(nameProperty.attributes & RLMPropertyAttributeIndexed, @"indexed property should have an index");
 
-    RLMProperty *ageProperty = [RLMRealm defaultRealm].schema[IndexedObject.className][@"age"];
+    RLMProperty *ageProperty = [[RLMRealm defaultRealm] schema][IndexedObject.className][@"age"];
     XCTAssertFalse(ageProperty.attributes & RLMPropertyAttributeIndexed, @"non-indexed property shouldn't have an index");
 }