Decimal numbers

un1v3rse · Mar 25, 2013 · 0e67da1 · 0e67da1
1 parent f41fd71
commit 0e67da1
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 0 deletions.
diff --git a/src/FMDatabase.m b/src/FMDatabase.m
@@ -477,6 +477,9 @@ - (void)bindObject:(id)obj toColumn:(int)idx inStatement:(sqlite3_stmt*)pStmt {
         else
             sqlite3_bind_double(pStmt, idx, [obj timeIntervalSince1970]);
     }
+    else if ([obj isKindOfClass:[NSDecimalNumber class]]) {
+        sqlite3_bind_text(pStmt, idx, [[obj description] UTF8String], -1, SQLITE_STATIC);
+    }
     else if ([obj isKindOfClass:[NSNumber class]]) {
 
         if (strcmp([obj objCType], @encode(BOOL)) == 0) {

diff --git a/src/FMDatabaseAdditions.m b/src/FMDatabaseAdditions.m
@@ -143,6 +143,19 @@ - (NSNumber*)numberForQuery:(NSString*)query, ... {
     return result;
 }
 
+- (NSDecimalNumber*)decimalNumberForQuery:(NSString*)query, ... {
+    NSDecimalNumber *result = nil;
+    va_list args;
+    va_start(args, query);
+    FMResultSet *rs = [self executeQuery:query withArgumentsInArray:nil orDictionary:nil orVAList:args];
+    va_end(args);
+    if ([rs next]) {
+        result = [rs decimalNumberForColumnIndex:0];
+    }
+    [rs close];
+    return result;
+}
+
 
 - (BOOL)tableExists:(NSString*)tableName {
 

diff --git a/src/FMResultSet.h b/src/FMResultSet.h
@@ -75,6 +75,9 @@
 - (NSNumber*)numberForColumn:(NSString*)columnName;
 - (NSNumber*)numberForColumnIndex:(int)columnIdx;
 
+- (NSDecimalNumber*)decimalNumberForColumn:(NSString*)columnName;
+- (NSDecimalNumber*)decimalNumberForColumnIndex:(int)columnIdx;
+
 - (const unsigned char *)UTF8StringForColumnIndex:(int)columnIdx;
 - (const unsigned char *)UTF8StringForColumnName:(NSString*)columnName;
 

diff --git a/src/FMResultSet.m b/src/FMResultSet.m
@@ -372,6 +372,17 @@ - (NSNumber*)numberForColumnIndex:(int)columnIdx {
 }
 
 
+- (NSDecimalNumber *)decimalNumberForColumn:(NSString*)columnName {
+    return [self decimalNumberForColumnIndex:[self columnIndexForName:columnName]];
+}
+
+- (NSDecimalNumber *)decimalNumberForColumnIndex:(int)columnIdx {
+
+    NSString *s = [self stringForColumnIndex:columnIdx];
+    return s ? [NSDecimalNumber decimalNumberWithString:s] : nil;
+}
+
+
 - (NSData*)dataNoCopyForColumn:(NSString*)columnName {
     return [self dataNoCopyForColumnIndex:[self columnIndexForName:columnName]];
 }