Primary key support for int and string columns

Realm/RLMAccessor.h

@@ -35,7 +35,7 @@ void RLMDynamicValidatedSet(RLMObject *obj, NSString *propName, id val);
 id RLMDynamicGet(RLMObject *obj, NSString *propName);
 
 // by property/column
-void RLMDynamicSet(RLMObject *obj, RLMProperty *prop, id val);
+void RLMDynamicSet(RLMObject *obj, RLMProperty *prop, id val, BOOL enforceUnique);
 
 //
 // Class modification

Realm/RLMAccessor.mm

@@ -20,7 +20,7 @@
 #import "RLMProperty_Private.h"
 #import "RLMArray_Private.hpp"
 #import "RLMUtil.hpp"
-#import "RLMObjectSchema.h"
+#import "RLMObjectSchema_Private.hpp"
 #import "RLMObjectStore.hpp"
 
 #import <objc/runtime.h>
@@ -52,17 +52,26 @@ static inline long long RLMGetLong(__unsafe_unretained RLMObject *obj, NSUIntege
     RLMVerifyAttached(obj);
     return obj->_row.get_int(colIndex);
 }
-static inline void RLMSetLong(__unsafe_unretained RLMObject *obj, NSUInteger colIndex, long long val) {
+static inline void RLMSetValue(__unsafe_unretained RLMObject *obj, NSUInteger colIndex, long long val) {
     RLMVerifyInWriteTransaction(obj);
     obj->_row.set_int(colIndex, val);
 }
+static inline void RLMSetValueUnique(__unsafe_unretained RLMObject *obj, NSUInteger colIndex, NSString *propName, long long val) {
+    RLMVerifyInWriteTransaction(obj);
+    if (obj->_row.get_table()->find_first_int(colIndex, val) != tightdb::not_found) {
+        NSString *reason = [NSString stringWithFormat:@"Setting primary key with existing value '%lld' for property '%@'",
+                            val, propName];
+        @throw [NSException exceptionWithName:@"RLMException" reason:reason userInfo:nil];
+    }
+    obj->_row.set_int(colIndex, val);
+}
 
 // float getter/setter
 static inline float RLMGetFloat(__unsafe_unretained RLMObject *obj, NSUInteger colIndex) {
     RLMVerifyAttached(obj);
     return obj->_row.get_float(colIndex);
 }
-static inline void RLMSetFloat(__unsafe_unretained RLMObject *obj, NSUInteger colIndex, float val) {
+static inline void RLMSetValue(__unsafe_unretained RLMObject *obj, NSUInteger colIndex, float val) {
     RLMVerifyInWriteTransaction(obj);
     obj->_row.set_float(colIndex, val);
 }
@@ -72,7 +81,7 @@ static inline double RLMGetDouble(__unsafe_unretained RLMObject *obj, NSUInteger
     RLMVerifyAttached(obj);
     return obj->_row.get_double(colIndex);
 }
-static inline void RLMSetDouble(__unsafe_unretained RLMObject *obj, NSUInteger colIndex, double val) {
+static inline void RLMSetValue(__unsafe_unretained RLMObject *obj, NSUInteger colIndex, double val) {
     RLMVerifyInWriteTransaction(obj);
     obj->_row.set_double(colIndex, val);
 }
@@ -82,7 +91,7 @@ static inline bool RLMGetBool(__unsafe_unretained RLMObject *obj, NSUInteger col
     RLMVerifyAttached(obj);
     return obj->_row.get_bool(colIndex);
 }
-static inline void RLMSetBool(__unsafe_unretained RLMObject *obj, NSUInteger colIndex, bool val) {
+static inline void RLMSetValue(__unsafe_unretained RLMObject *obj, NSUInteger colIndex, bool val) {
     RLMVerifyInWriteTransaction(obj);
     obj->_row.set_bool(colIndex, val);
 }
@@ -92,18 +101,29 @@ static inline void RLMSetBool(__unsafe_unretained RLMObject *obj, NSUInteger col
     RLMVerifyAttached(obj);
     return RLMStringDataToNSString(obj->_row.get_string(colIndex));
 }
-static inline void RLMSetString(__unsafe_unretained RLMObject *obj, NSUInteger colIndex, __unsafe_unretained NSString *val) {
+static inline void RLMSetValue(__unsafe_unretained RLMObject *obj, NSUInteger colIndex, __unsafe_unretained NSString *val) {
     RLMVerifyInWriteTransaction(obj);
     obj->_row.set_string(colIndex, RLMStringDataWithNSString(val));
 }
+static inline void RLMSetValueUnique(__unsafe_unretained RLMObject *obj, NSUInteger colIndex, NSString *propName,
+                                      __unsafe_unretained NSString *val) {
+    RLMVerifyInWriteTransaction(obj);
+    tightdb::StringData str = RLMStringDataWithNSString(val);
+    if (obj->_row.get_table()->find_first_string(colIndex, str) != tightdb::not_found) {
+        NSString *reason = [NSString stringWithFormat:@"Setting unique property '%@' with existing value '%@'",
+                            val, propName];
+        @throw [NSException exceptionWithName:@"RLMException" reason:reason userInfo:nil];
+    }
+    obj->_row.set_string(colIndex, str);
+}
 
 // date getter/setter
 static inline NSDate *RLMGetDate(__unsafe_unretained RLMObject *obj, NSUInteger colIndex) {
     RLMVerifyAttached(obj);
     tightdb::DateTime dt = obj->_row.get_datetime(colIndex);
     return [NSDate dateWithTimeIntervalSince1970:dt.get_datetime()];
 }
-static inline void RLMSetDate(__unsafe_unretained RLMObject *obj, NSUInteger colIndex, __unsafe_unretained NSDate *date) {
+static inline void RLMSetValue(__unsafe_unretained RLMObject *obj, NSUInteger colIndex, __unsafe_unretained NSDate *date) {
     RLMVerifyInWriteTransaction(obj);
     std::time_t time = date.timeIntervalSince1970;
     obj->_row.set_datetime(colIndex, tightdb::DateTime(time));
@@ -115,7 +135,7 @@ static inline void RLMSetDate(__unsafe_unretained RLMObject *obj, NSUInteger col
     tightdb::BinaryData data = obj->_row.get_binary(colIndex);
     return [NSData dataWithBytes:data.data() length:data.size()];
 }
-static inline void RLMSetData(__unsafe_unretained RLMObject *obj, NSUInteger colIndex, __unsafe_unretained NSData *data) {
+static inline void RLMSetValue(__unsafe_unretained RLMObject *obj, NSUInteger colIndex, __unsafe_unretained NSData *data) {
     RLMVerifyInWriteTransaction(obj);
     obj->_row.set_binary(colIndex, RLMBinaryDataForNSData(data));
 }
@@ -130,10 +150,10 @@ static inline void RLMSetData(__unsafe_unretained RLMObject *obj, NSUInteger col
     NSUInteger index = obj->_row.get_link(colIndex);
     return RLMCreateObjectAccessor(obj.realm, objectClassName, index);
 }
-static inline void RLMSetLink(__unsafe_unretained RLMObject *obj, NSUInteger colIndex, __unsafe_unretained id val) {
+static inline void RLMSetValue(__unsafe_unretained RLMObject *obj, NSUInteger colIndex, __unsafe_unretained RLMObject *val) {
     RLMVerifyInWriteTransaction(obj);
 
-    if (!val || val == NSNull.null) {
+    if (!val || (id)val == NSNull.null) {
         // if null
         obj->_row.nullify_link(colIndex);
     }
@@ -158,7 +178,7 @@ static inline void RLMSetLink(__unsafe_unretained RLMObject *obj, NSUInteger col
                                                                 realm:obj.realm];
     return ar;
 }
-static inline void RLMSetArray(__unsafe_unretained RLMObject *obj, NSUInteger colIndex, __unsafe_unretained id<NSFastEnumeration> val) {
+static inline void RLMSetValue(__unsafe_unretained RLMObject *obj, NSUInteger colIndex, __unsafe_unretained id<NSFastEnumeration> val) {
     RLMVerifyInWriteTransaction(obj);
 
     tightdb::LinkViewRef linkView = obj->_row.get_linklist(colIndex);
@@ -209,7 +229,7 @@ static inline id RLMGetAnyProperty(__unsafe_unretained RLMObject *obj, NSUIntege
         }
     }
 }
-static inline void RLMSetAnyProperty(__unsafe_unretained RLMObject *obj, NSUInteger col_ndx, __unsafe_unretained id val) {
+static inline void RLMSetValue(__unsafe_unretained RLMObject *obj, NSUInteger col_ndx, __unsafe_unretained id val) {
     RLMVerifyInWriteTransaction(obj);
 
     // FIXME - enable when Any supports links
@@ -306,58 +326,36 @@ static IMP RLMAccessorGetter(RLMProperty *prop, char accessorCode, NSString *obj
     }
 }
 
+template<typename ArgType, typename StorageType=ArgType>
+static IMP RLMMakeSetter(NSUInteger colIndex, bool isPrimary) {
+    if (isPrimary) {
+        return imp_implementationWithBlock(^(__unused RLMObject *obj, __unused ArgType val) {
+            @throw [NSException exceptionWithName:@"RLMException"
+                                           reason:@"Primary key can't be changed after an object is inserted."
+                                         userInfo:nil];
+        });
+    }
+    return imp_implementationWithBlock(^(RLMObject *obj, ArgType val) {
+        RLMSetValue(obj, colIndex, static_cast<StorageType>(val));
+    });
+}
+
 // dynamic setter with column closure
 static IMP RLMAccessorSetter(RLMProperty *prop, char accessorCode) {
     NSUInteger colIndex = prop.column;
     switch (accessorCode) {
-        case 'i':
-            return imp_implementationWithBlock(^(RLMObject *obj, int val) {
-                RLMSetLong(obj, colIndex, val);
-            });
-        case 'l':
-            return imp_implementationWithBlock(^(RLMObject *obj, long val) {
-                RLMSetLong(obj, colIndex, val);
-            });
-        case 'f':
-            return imp_implementationWithBlock(^(RLMObject *obj, float val) {
-                RLMSetFloat(obj, colIndex, val);
-            });
-        case 'd':
-            return imp_implementationWithBlock(^(RLMObject *obj, double val) {
-                RLMSetDouble(obj, colIndex, val);
-            });
-        case 'B':
-            return imp_implementationWithBlock(^(RLMObject *obj, bool val) {
-                RLMSetBool(obj, colIndex, val);
-            });
-        case 'c':
-            return imp_implementationWithBlock(^(RLMObject *obj, BOOL val) {
-                RLMSetBool(obj, colIndex, val);
-            });
-        case 's':
-            return imp_implementationWithBlock(^(RLMObject *obj, NSString *val) {
-                RLMSetString(obj, colIndex, val);
-            });
-        case 'a':
-            return imp_implementationWithBlock(^(RLMObject *obj, NSDate *date) {
-                RLMSetDate(obj, colIndex, date);
-            });
-        case 'e':
-            return imp_implementationWithBlock(^(RLMObject *obj, NSData *data) {
-                RLMSetData(obj, colIndex, data);
-            });
-        case 'k':
-            return imp_implementationWithBlock(^(RLMObject *obj, RLMObject *link) {
-                RLMSetLink(obj, colIndex, link);
-            });
-        case 't':
-            return imp_implementationWithBlock(^(RLMObject *obj, RLMArray *val) {
-                RLMSetArray(obj, colIndex, val);
-            });
-        case '@':
-            return imp_implementationWithBlock(^(RLMObject *obj, id val) {
-                RLMSetAnyProperty(obj, colIndex, val);
-            });
+        case 'i': return RLMMakeSetter<int, long long>(colIndex, prop.isPrimary);
+        case 'l': return RLMMakeSetter<long, long long>(colIndex, prop.isPrimary);
+        case 'f': return RLMMakeSetter<float>(colIndex, prop.isPrimary);
+        case 'd': return RLMMakeSetter<double>(colIndex, prop.isPrimary);
+        case 'B': return RLMMakeSetter<bool>(colIndex, prop.isPrimary);
+        case 'c': return RLMMakeSetter<BOOL, bool>(colIndex, prop.isPrimary);
+        case 's': return RLMMakeSetter<NSString *>(colIndex, prop.isPrimary);
+        case 'a': return RLMMakeSetter<NSDate *>(colIndex, prop.isPrimary);
+        case 'e': return RLMMakeSetter<NSData *>(colIndex, prop.isPrimary);
+        case 'k': return RLMMakeSetter<RLMObject *>(colIndex, prop.isPrimary);
+        case 't': return RLMMakeSetter<RLMArray *>(colIndex, prop.isPrimary);
+        case '@': return RLMMakeSetter<id>(colIndex, prop.isPrimary);
         default:
             @throw [NSException exceptionWithName:@"RLMException"
                                            reason:@"Invalid accessor code"
@@ -559,7 +557,8 @@ Class RLMStandaloneAccessorClassForObjectClass(Class objectClass, RLMObjectSchem
 }
 
 void RLMDynamicValidatedSet(RLMObject *obj, NSString *propName, id val) {
-    RLMProperty *prop = obj.objectSchema[propName];
+    RLMObjectSchema *schema = obj.objectSchema;
+    RLMProperty *prop = schema[propName];
     if (!prop) {
         @throw [NSException exceptionWithName:@"RLMException"
                                        reason:@"Invalid property name"
@@ -572,43 +571,53 @@ void RLMDynamicValidatedSet(RLMObject *obj, NSString *propName, id val) {
                                      userInfo:@{@"Property name:" : propName ?: @"nil",
                                                 @"Value": val ? [val description] : @"nil"}];
     }
-    RLMDynamicSet(obj, (RLMProperty *)prop, val);
+    RLMDynamicSet(obj, (RLMProperty *)prop, val, prop.isPrimary);
 }
 
-void RLMDynamicSet(__unsafe_unretained RLMObject *obj, __unsafe_unretained RLMProperty *prop, __unsafe_unretained id val) {
+void RLMDynamicSet(__unsafe_unretained RLMObject *obj, __unsafe_unretained RLMProperty *prop, __unsafe_unretained id val, BOOL enforceUnique) {
     NSUInteger col = prop.column;
     switch (accessorCodeForType(prop.objcType, prop.type)) {
         case 'i':
         case 'l':
-            RLMSetLong(obj, col, [val longLongValue]);
+            if (enforceUnique) {
+                RLMSetValueUnique(obj, col, prop.name, [val longLongValue]);
+            }
+            else {
+                RLMSetValue(obj, col, [val longLongValue]);
+            }
             break;
         case 'f':
-            RLMSetFloat(obj, col, [val floatValue]);
+            RLMSetValue(obj, col, [val floatValue]);
             break;
         case 'd':
-            RLMSetDouble(obj, col, [val doubleValue]);
+            RLMSetValue(obj, col, [val doubleValue]);
             break;
         case 'B':
         case 'c':
-            RLMSetBool(obj, col, (bool)[val boolValue]);
+            RLMSetValue(obj, col, (bool)[val boolValue]);
             break;
         case 's':
-            RLMSetString(obj, col, val);
+            if (enforceUnique) {
+                RLMSetValueUnique(obj, col, prop.name, (NSString *)val);
+            }
+            else {
+                RLMSetValue(obj, col, (NSString *)val);
+            }
             break;
         case 'a':
-            RLMSetDate(obj, col, val);
+            RLMSetValue(obj, col, (NSDate *)val);
             break;
         case 'e':
-            RLMSetData(obj, col, val);
+            RLMSetValue(obj, col, (NSData *)val);
             break;
         case 'k':
-            RLMSetLink(obj, col, val);
+            RLMSetValue(obj, col, (RLMObject *)val);
             break;
         case 't':
-            RLMSetArray(obj, col, val);
+            RLMSetValue(obj, col, (RLMArray *)val);
             break;
         case '@':
-            RLMSetAnyProperty(obj, col, val);
+            RLMSetValue(obj, col, val);
             break;
         default:
             @throw [NSException exceptionWithName:@"RLMException"

Realm/RLMArray.mm

@@ -146,7 +146,14 @@ - (void)replaceObjectAtIndex:(NSUInteger)index withObject:(id)anObject {
 
 - (NSUInteger)indexOfObject:(RLMObject *)object {
     RLMValidateMatchingObjectType(self, object);
-    return [_backingArray indexOfObject:object];
+    NSUInteger index = 0;
+    for (RLMObject *cmp in _backingArray) {
+        if ([object isEqualToObject:cmp]) {
+            return index;
+        }
+        index++;
+    }
+    return NSNotFound;
 }
 
 - (void)deleteObjectsFromRealm {

Realm/RLMConstants.h

@@ -24,7 +24,7 @@
  Attributes which can be returned when implementing attributesForProperty:
  */
 
-typedef NS_ENUM(NSUInteger, RLMPropertyAttributes) {
+typedef NS_OPTIONS(NSUInteger, RLMPropertyAttributes) {
 /**
  Create an index for this property for improved search performance.
  */