Merge pull request #117 from rohan-panchal/64bit-fix

Altered attribute type checking for different Integer and float types
supermarin · Jun 17, 2015 · 7e09446 · 7e09446
2 parents 53ecad9 + 5b16639
commit 7e09446
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/Classes/NSManagedObject+ActiveRecord.m b/Classes/NSManagedObject+ActiveRecord.m
@@ -367,12 +367,12 @@ - (void)setSafeValue:(id)value forKey:(NSString *)key {
     else if ([value isKindOfClass:[NSString class]]) {
 
         if ([self isIntegerAttributeType:attributeType])
-            value = [NSNumber numberWithInteger:[value integerValue]];
+            value = [NSNumber numberWithLongLong:[value longLongValue]];
 
         else if (attributeType == NSBooleanAttributeType)
             value = [NSNumber numberWithBool:[value boolValue]];
 
-        else if (attributeType == NSFloatAttributeType)
+        else if ([self isFloatAttributeType:attributeType])
             value = [NSNumber numberWithDouble:[value doubleValue]];
 
         else if (attributeType == NSDateAttributeType)
@@ -388,6 +388,11 @@ - (BOOL)isIntegerAttributeType:(NSAttributeType)attributeType {
            (attributeType == NSInteger64AttributeType);
 }
 
+- (BOOL)isFloatAttributeType:(NSAttributeType)attributeType {
+    return (attributeType == NSFloatAttributeType) ||
+           (attributeType == NSDoubleAttributeType);
+}
+
 #pragma mark - Date Formatting
 
 - (NSDateFormatter *)defaultFormatter {