Merge pull request #28 from mgod/master

Fix NSDecimalNumber precision on saving to sqlite

Author: AlexDenisov

UnitTests/Specs/NSDecimalNumberSpec.mm

@@ -0,0 +1,29 @@
+#import "Cedar-iOS/SpecHelper.h"
+#import "DecimalRecord.h"
+#import "ARDatabaseManager.h"
+
+using namespace Cedar::Matchers;
+
+SPEC_BEGIN(NSDecimalNumberSpec)
+
+beforeEach(^{
+    [[ARDatabaseManager sharedInstance] clearDatabase];
+});
+afterEach(^{
+    [[ARDatabaseManager sharedInstance] clearDatabase];
+});
+
+describe(@"NSDecimalNumberSpec", ^{
+    it(@"should return the same NSDecimalNumber value after saving", ^{
+        DecimalRecord *record = [DecimalRecord newRecord];
+        NSDecimalNumber *testDecimal = [NSDecimalNumber decimalNumberWithMantissa:1123563 exponent:-3 isNegative:NO];
+        record.decimal = testDecimal;
+        [record save];
+        ARLazyFetcher *fetcher = [DecimalRecord lazyFetcher];
+        [fetcher where:@"id = %@", record.id, nil];
+        record = [[fetcher fetchRecords] objectAtIndex:0];
+        record.decimal should equal(testDecimal);
+    });
+});
+
+SPEC_END

UnitTests/TestSources/DecimalRecord.h

@@ -0,0 +1,15 @@
+//
+//  DecimalRecord.h
+//  iActiveRecord
+//
+//  Created by Marshall Weir on 4/11/13.
+//
+//
+
+#import <ActiveRecord/ActiveRecord.h>
+
+@interface DecimalRecord : ActiveRecord
+
+@property(nonatomic, retain) NSDecimalNumber *decimal;
+
+@end

UnitTests/TestSources/DecimalRecord.m

@@ -0,0 +1,15 @@
+//
+//  DecimalRecord.m
+//  iActiveRecord
+//
+//  Created by Marshall Weir on 4/11/13.
+//
+//
+
+#import "DecimalRecord.h"
+
+@implementation DecimalRecord
+
+@dynamic decimal;
+
+@end

iActiveRecord.xcodeproj/project.pbxproj

@@ -33,6 +33,8 @@
 		25922B6414EC2C2200CBB58A /* NSNumber+sqlRepresentation.m in Sources */ = {isa = PBXBuildFile; fileRef = 254F5EBF14C5E78100AC0D86 /* NSNumber+sqlRepresentation.m */; };
 		25922B6514EC2C2200CBB58A /* NSString+lowercaseFirst.m in Sources */ = {isa = PBXBuildFile; fileRef = 25998EE614BC1A1D00CA2490 /* NSString+lowercaseFirst.m */; };
 		25922B6614EC2C2200CBB58A /* NSString+sqlRepresentation.m in Sources */ = {isa = PBXBuildFile; fileRef = 254F5EBB14C5E71C00AC0D86 /* NSString+sqlRepresentation.m */; };
+		75F56DBA1717003C00A1DF7B /* DecimalRecord.m in Sources */ = {isa = PBXBuildFile; fileRef = 75F56DB91717003C00A1DF7B /* DecimalRecord.m */; };
+		75F56DBC171700D300A1DF7B /* NSDecimalNumberSpec.mm in Sources */ = {isa = PBXBuildFile; fileRef = 75F56DBB171700D300A1DF7B /* NSDecimalNumberSpec.mm */; };
 		CA0365C0151FCB5F004167F1 /* NSString+quotedString.h in Headers */ = {isa = PBXBuildFile; fileRef = CA0365BE151FCB5F004167F1 /* NSString+quotedString.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		CA0365C2151FCB5F004167F1 /* NSString+quotedString.m in Sources */ = {isa = PBXBuildFile; fileRef = CA0365BF151FCB5F004167F1 /* NSString+quotedString.m */; };
 		CA0365C3151FCB5F004167F1 /* NSString+quotedString.m in Sources */ = {isa = PBXBuildFile; fileRef = CA0365BF151FCB5F004167F1 /* NSString+quotedString.m */; };
@@ -212,6 +214,9 @@
 		25998EF914BC1DD400CA2490 /* libsqlite3.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.0.dylib; path = usr/lib/libsqlite3.0.dylib; sourceTree = SDKROOT; };
 		25A1131F14D9BAAE000720E7 /* ARValidationsHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ARValidationsHelper.h; sourceTree = "<group>"; };
 		25A1132614D9BCF7000720E7 /* ARErrorHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ARErrorHelper.h; sourceTree = "<group>"; };
+		75F56DB81717003C00A1DF7B /* DecimalRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DecimalRecord.h; sourceTree = "<group>"; };
+		75F56DB91717003C00A1DF7B /* DecimalRecord.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DecimalRecord.m; sourceTree = "<group>"; };
+		75F56DBB171700D300A1DF7B /* NSDecimalNumberSpec.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NSDecimalNumberSpec.mm; sourceTree = "<group>"; };
 		CA0365BE151FCB5F004167F1 /* NSString+quotedString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+quotedString.h"; sourceTree = "<group>"; };
 		CA0365BF151FCB5F004167F1 /* NSString+quotedString.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+quotedString.m"; sourceTree = "<group>"; };
 		CA04E8C1166A574100957F54 /* ARDynamicAccessor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ARDynamicAccessor.h; sourceTree = "<group>"; };
@@ -415,6 +420,7 @@
 				CA0BAECE15C9AA58008985E6 /* SchemaManagerSpec.mm */,
 				CA0BAED015C9AACC008985E6 /* IndicesSpec.mm */,
 				CA91ECCB1715AEC10085A27B /* GCDSpec.mm */,
+				75F56DBB171700D300A1DF7B /* NSDecimalNumberSpec.mm */,
 			);
 			path = Specs;
 			sourceTree = "<group>";
@@ -512,6 +518,8 @@
 				CAE92251171495290082A97C /* Animal.m */,
 				CAE92252171495290082A97C /* AnimalValidator.h */,
 				CAE92253171495290082A97C /* AnimalValidator.m */,
+				75F56DB81717003C00A1DF7B /* DecimalRecord.h */,
+				75F56DB91717003C00A1DF7B /* DecimalRecord.m */,
 				CAE92258171495290082A97C /* DynamicRecord.h */,
 				CAE92259171495290082A97C /* DynamicRecord.m */,
 				CAE9225A171495290082A97C /* Entity.h */,
@@ -1073,6 +1081,8 @@
 				CAE92278171495290082A97C /* UserProjectRelationship.m in Sources */,
 				CAE9227C171495880082A97C /* ARFactory.m in Sources */,
 				CA91ECCC1715AEC10085A27B /* GCDSpec.mm in Sources */,
+				75F56DBA1717003C00A1DF7B /* DecimalRecord.m in Sources */,
+				75F56DBC171700D300A1DF7B /* NSDecimalNumberSpec.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

iActiveRecord/Classes/NSDecimalNumber+sqlRepresentation.m

@@ -10,16 +10,25 @@
 
 @implementation NSDecimalNumber (sqlRepresentation)
 
++ (NSLocale *)posixLocale {
+    static NSLocale *posixLocale;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        posixLocale = [[NSLocale alloc] initWithLocaleIdentifier:@"en_US_POSIX"];
+    });
+    return posixLocale;
+}
+
 - (NSString *)toSql {
-    return [NSString stringWithFormat:@"%f", [self floatValue]];
+    return [self descriptionWithLocale:[NSDecimalNumber posixLocale]];
 }
 
 + (NSString *)sqlType {
     return @"real";
 }
 
 + (id)fromSql:(NSString *)sqlData {
-    return [NSDecimalNumber decimalNumberWithString:sqlData];
+    return [NSDecimalNumber decimalNumberWithString:sqlData locale:[NSDecimalNumber posixLocale]];
 }
 
 @end