nano-store 0.5.2 → 0.6.0

data/vendor/Pods/Headers/NanoStore/NSFNanoStore_Private.h

@@ -25,10 +25,12 @@
  */
 
 #import "NSFNanoStore.h"
+#import "NSFOrderedDictionary.h"
 
 /** \cond */
 
 @interface NSFNanoStore (Private)
+- (NSFOrderedDictionary *)dictionaryDescription;
 + (NSFNanoStore *)_createAndOpenDebugDatabase;
 - (NSFNanoResult *)_executeSQL:(NSString *)theSQLStatement;
 - (NSString*)_nestedDescriptionWithPrefixedSpace:(NSString *)prefixedSpace;
@@ -37,7 +39,7 @@
 - (void)_setIsOurTransaction:(BOOL)value;
 - (BOOL)_isOurTransaction;
 - (BOOL)_setupCachingSchema;
-- (BOOL)_storeDictionary:(NSDictionary *)someInfo forKey:(NSString *)aKey forClassNamed:(NSString *)classType usingSQLite3Statement:(sqlite3_stmt *)storeValuesStatement error:(out NSError **)outError;
+- (BOOL)_storeDictionary:(NSDictionary *)someInfo forKey:(NSString *)aKey forClassNamed:(NSString *)classType error:(out NSError **)outError;
 - (BOOL)__storeDictionaries:(NSArray *)someObjects forKeys:(NSArray *)someKeys error:(out NSError **)outError;
 - (BOOL)_bindValue:(id)aValue forAttribute:(NSString *)anAttribute parameterNumber:(NSInteger)aParamNumber usingSQLite3Statement:(sqlite3_stmt *)aStatement;
 - (BOOL)_checkNanoStoreIsReadyAndReturnError:(out NSError **)outError;

data/vendor/Pods/Headers/NanoStore/NSFOrderedDictionary.h

@@ -0,0 +1,33 @@
+//
+//  NSFOrderedDictionary.h
+//  OrderedDictionary
+//
+//  Created by Matt Gallagher on 19/12/08.
+//  Copyright 2008 Matt Gallagher. All rights reserved.
+//
+//  v2 - ARC-compliant (Tito Ciuro)
+//  v1 - Initial release (Matt Gallagher)
+//
+//  This software is provided 'as-is', without any express or implied
+//  warranty. In no event will the authors be held liable for any damages
+//  arising from the use of this software. Permission is granted to anyone to
+//  use this software for any purpose, including commercial applications, and to
+//  alter it and redistribute it freely, subject to the following restrictions:
+//
+//  1. The origin of this software must not be misrepresented; you must not
+//     claim that you wrote the original software. If you use this software
+//     in a product, an acknowledgment in the product documentation would be
+//     appreciated but is not required.
+//  2. Altered source versions must be plainly marked as such, and must not be
+//     misrepresented as being the original software.
+//  3. This notice may not be removed or altered from any source
+//     distribution.
+//
+
+@interface NSFOrderedDictionary : NSMutableDictionary
+
+- (void)insertObject:(id)anObject forKey:(id)aKey atIndex:(NSUInteger)anIndex;
+- (id)keyAtIndex:(NSUInteger)anIndex;
+- (NSEnumerator *)reverseKeyEnumerator;
+
+@end

data/vendor/Pods/Headers/NanoStore/NanoStore.h

@@ -64,6 +64,13 @@
  - iOS library runs on the device and simulator
  - ARC compliant
  
+ @section latest_changes Latest changes
+ v2.5 - January 1, 2013
+ 
+ Starting with v2.5, the plist mechanism has been replaced with NSKeyedArchiver. There are several reasons for it: it's more compact, faster and uses less memory. Perhaps the most important reason is that it opens the possibility to store other data types.
+ 
+ NSNull is now supported. Big thanks to Wanny (https://github.com/mrwanny) for taking the time to improve this section of NanoStore.
+ 
  @section installation_sec Installation
  
  Building NanoStore is very easy. Just follow these steps:
@@ -423,6 +430,35 @@
  [sortByLastName release];
  @endcode
 
+ @section paging_limit_sec Paging using Limit and Offset
+ SQLite provides a really cool feature called OFFSET that is usually used with a LIMIT clause.
+ 
+ The LIMIT clause is used to limit the number of results returned in a SQL statement. So if you have 1000 rows in table, but only want to return the first 10, you would do something like this:
+ @code
+ SELECT column FROM table LIMIT 10
+ @endcode
+ Now suppose you wanted to show results 11-20. With the OFFSET keyword it's just as easy. The following query will do:
+ @code
+ SELECT column FROM table LIMIT 10 OFFSET 10
+ @endcode
+ Using pagination is also quite easy with NanoStore. This example based on one of the unit tests provided with the NanoStore distro:
+ @code
+ NSFNanoStore *nanoStore = [NSFNanoStore createAndOpenStoreWithType:NSFMemoryStoreType path:nil error:nil];
+ 
+ // Assume we have added objects to the store
+ 
+ NSFNanoSearch *search = [NSFNanoSearch searchWithStore:nanoStore];
+ search.value = @"Barcelona";
+ search.match = NSFEqualTo;
+ search.limit = 5;
+ search.offset = 3;
+ 
+ NSDictionary *searchResults = [search searchObjectsWithReturnType:NSFReturnObjects error:nil];
+ 
+ // Assuming the query matches some results, NanoStore should have retrieved
+ // the first 5 records right after the 3rd one from the result set.
+ @endcode
+ 
  @section performancetips_sec Performance Tips
  
  NanoStore by defaults saves every object to disk one by one. To speed up inserts and edited objects, increase NSFNanoStore's \link NSFNanoStore::saveInterval saveInterval \endlink property.

data/vendor/Pods/NanoStore/Classes/Advanced/NSFNanoEngine.h

@@ -537,6 +537,11 @@
 
 - (NSString *)description;
 
+/** Returns a JSON representation of the engine.
+ */
+
+- (NSString *)JSONDescription;
+
 //@}
 
 @end

data/vendor/Pods/NanoStore/Classes/Advanced/NSFNanoEngine.m

@@ -26,6 +26,7 @@
  
 #import "NanoStore.h"
 #import "NanoStore_Private.h"
+#import "NSFOrderedDictionary.h"
 
 #import <stdio.h>
 #import <stdlib.h>
@@ -44,23 +45,19 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 
 #pragma mark -
 
-@implementation NSFNanoEngine
-{
-@protected
-    sqlite3                 *sqlite;
-    NSString                *path;
-    NSFCacheMethod           cacheMethod;
-    
-    /** \cond */
-    NSMutableDictionary     *schema;
-    BOOL                    willCommitChangeSchema;
-    unsigned int            busyTimeout;
-    /** \endcond */
-}
+@interface NSFNanoEngine ()
 
-@synthesize sqlite;
-@synthesize path;
-@synthesize cacheMethod;
+/** \cond */
+@property (nonatomic, weak) sqlite3 *sqlite;
+@property (nonatomic, copy, readwrite) NSString *path;
+@property (nonatomic) NSMutableDictionary *schema;
+@property (nonatomic) BOOL willCommitChangeSchema;
+@property (nonatomic) unsigned int busyTimeout;
+/** \endcond */
+
+@end
+
+@implementation NSFNanoEngine
 
 #pragma mark -
 
@@ -72,7 +69,7 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 {
  if (nil == thePath)
      [[NSException exceptionWithName:NSFUnexpectedParameterException
-                              reason:[NSString stringWithFormat:@"*** -[%@ %s]: thePath is nil.", [self class], _cmd]
+                              reason:[NSString stringWithFormat:@"*** -[%@ %@]: thePath is nil.", [self class], NSStringFromSelector(_cmd)]
                             userInfo:nil]raise];
     
     return [[self alloc]initWithPath:thePath];
@@ -82,11 +79,11 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 {
     if (nil == thePath)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: thePath is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: thePath is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     if ((self = [self init])) {
-        path = [thePath copy];
+        _path = thePath;
     }
     
     return self;
@@ -102,8 +99,8 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 - (id)init
 {
     if ((self = [super init])) {
-        path = nil;
-        schema = nil;
+        _path = nil;
+        _schema = nil;
     }
     return self;
 }
@@ -111,15 +108,34 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 - (void)dealloc
 {
     [self close];
-    
-    
 }
 
 /** \endcond */
 
-- (NSString*)description
+- (NSString *)description
 {
-    return [self NSFP_nestedDescriptionWithPrefixedSpace:@""];
+    return [self JSONDescription];
+}
+
+- (NSFOrderedDictionary *)dictionaryDescription
+{
+    NSFOrderedDictionary *values = [NSFOrderedDictionary new];
+    
+    values[@"SQLite address"] = [NSString stringWithFormat:@"%p", self.sqlite];
+    values[@"Database path"] = _path;
+    values[@"Cache method"] = [self NSFP_cacheMethodToString];
+    
+    return values;
+}
+
+- (NSString *)JSONDescription
+{
+    NSFOrderedDictionary *values = [self dictionaryDescription];
+    
+    NSError *outError = nil;
+    NSString *description = [NSFNanoObject _NSObjectToJSONString:values error:&outError];
+    
+    return description;
 }
 
 #pragma mark// ==================================
@@ -128,7 +144,7 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 
 - (BOOL)openWithCacheMethod:(NSFCacheMethod)theCacheMethod useFastMode:(BOOL)useFastMode
 {
-    int status = sqlite3_open_v2( [path UTF8String], &sqlite,
+    int status = sqlite3_open_v2( [_path UTF8String], &_sqlite,
                                  SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_AUTOPROXY | SQLITE_OPEN_FULLMUTEX, NULL);
     
     // Set NanoStoreEngine's page size to match the system current page size
@@ -146,7 +162,7 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
     if ((SQLITE_OK != status) || (sqlite3_extended_result_codes(self.sqlite, 1) != SQLITE_OK))
         return NO;
         
-    if ([[path lowercaseString]isEqualToString:NSFMemoryDatabase] == YES) {
+    if ([[_path lowercaseString]isEqualToString:NSFMemoryDatabase] == YES) {
         
         sqlite3_exec(self.sqlite, "PRAGMA fullfsync = OFF;", NULL, NULL, NULL);
         sqlite3_exec(self.sqlite, "PRAGMA temp_store = MEMORY", NULL, NULL, NULL);
@@ -172,7 +188,7 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
     }
 
     // Save whether we want data to be fetched lazily
-    cacheMethod = theCacheMethod;
+    _cacheMethod = theCacheMethod;
     
     [self setBusyTimeout:250];
     
@@ -209,7 +225,7 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
     }
     
     int status = sqlite3_close(self.sqlite);
-    sqlite = NULL;
+    _sqlite = NULL;
     
     // Since we're operating with extended result code support, extract the bits
     // and obtain the regular result code
@@ -232,7 +248,7 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
     if (YES == [self isTransactionActive])
         return NO;
     
-    willCommitChangeSchema = NO;
+    _willCommitChangeSchema = NO;
     
     return [self beginDeferredTransaction];
 }
@@ -242,7 +258,7 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
     if (YES == [self isTransactionActive])
         return NO;
     
-    willCommitChangeSchema = NO;
+    _willCommitChangeSchema = NO;
     
     return [self NSFP_beginTransactionMode:@"BEGIN DEFERRED TRANSACTION;"];
 }
@@ -250,19 +266,19 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 - (BOOL)commitTransaction
 {
     if (NO == [self isTransactionActive]) {
-        willCommitChangeSchema = NO;
+        _willCommitChangeSchema = NO;
         return NO;
     }
     
-    if (NO == willCommitChangeSchema)
+    if (NO == _willCommitChangeSchema)
         [self NSFP_uninstallCommitCallback];
     
     BOOL success = (nil == [[self executeSQL:@"COMMIT TRANSACTION;"]error]);
     
-    if (NO == willCommitChangeSchema)
+    if (NO == _willCommitChangeSchema)
         [self NSFP_installCommitCallback];
     
-    willCommitChangeSchema = NO;
+    _willCommitChangeSchema = NO;
     
     return success;
 }
@@ -270,13 +286,13 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 - (BOOL)rollbackTransaction
 {
     if ([self isTransactionActive] == NO) {
-        willCommitChangeSchema = NO;
+        _willCommitChangeSchema = NO;
         return NO;
     }
     
     BOOL success = (nil == [[self executeSQL:@"ROLLBACK TRANSACTION;"]error]);
     
-    willCommitChangeSchema = NO;
+    _willCommitChangeSchema = NO;
     
     return success;
 }
@@ -359,17 +375,17 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 {
     if (nil == table)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: table is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: table is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     if (nil == columns)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: columns is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: columns is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     if (nil == datatypes)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: datatypes is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: datatypes is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     return [self NSFP_createTable:table withColumns:columns datatypes:datatypes isTemporary:NO];
@@ -379,7 +395,7 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 {
     if (nil == table)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: table is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: table is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     BOOL transactionSetHere = NO;
@@ -411,11 +427,11 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 {
     if (nil == column)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: column is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: column is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     if (nil == table)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: table is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: table is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     NSString  *theSQLStatement = nil;
@@ -434,7 +450,7 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 {
     if (nil == indexName)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: indexName is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: indexName is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     NSString  *theSQLStatement = [[NSString alloc]initWithFormat:@"DROP INDEX %@;", indexName];
@@ -483,7 +499,7 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 {
     if (nil == table)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: table is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: table is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
 
     NSString *theSQLStatement = nil;
@@ -506,7 +522,7 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 {
     if (nil == table)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: table is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: table is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     NSString *theSQLStatement = nil;
@@ -536,7 +552,7 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 {
     if (nil == table)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: table is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: table is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     NSFNanoResult* result = [self executeSQL:[NSString stringWithFormat:@"SELECT sqlite_master.name FROM sqlite_master WHERE type = 'index' AND sqlite_master.tbl_name = '%@';", table]];
@@ -558,12 +574,12 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 {
     if (nil == theSQLStatement)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: theSQLStatement is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: theSQLStatement is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     if ([theSQLStatement length] == 0)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: theSQLStatement is empty.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: theSQLStatement is empty.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     // Check whether we will need to return a dictionary with results
@@ -602,21 +618,36 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
                     NSString *column = [[NSString alloc]initWithUTF8String:columnUTF8];
 
                     // Sanity check: some queries return NULL, which would cause a crash below.
-                    char *valueUTF8 = (char *)sqlite3_column_text (theSQLiteStatement, columnIndex);
-                    NSString *value = nil;
-                    if (NULL != valueUTF8) {
-                        value = [[NSString alloc]initWithUTF8String:valueUTF8];
-                    } else {
-                        value = [[NSNull null]description];
+                    if ([column isEqualToString:@"NSFKeys.NSFKeyedArchive"]) {
+                        //KeyedArchive is a blob
+                        NSData *dictBinData = [[NSData alloc] initWithBytes:sqlite3_column_blob(theSQLiteStatement, columnIndex) length: sqlite3_column_bytes(theSQLiteStatement, 1)];
+                        
+                        // Obtain the array to collect the values. If the array doesn't exist, create it.
+                        NSMutableArray *values = [info objectForKey:column];
+                        if (nil == values) {
+                            values = [NSMutableArray new];
+                        }
+                        [values addObject:dictBinData];
+                        [info setObject:values forKey:column];
+                    }else
+                    {
+                        char *valueUTF8 = (char *)sqlite3_column_text (theSQLiteStatement, columnIndex);
+                        NSString *value = nil;
+                        if (NULL != valueUTF8) {
+                            value = [[NSString alloc]initWithUTF8String:valueUTF8];
+                        } else {
+                            value = [[NSNull null]description];
+                        }
+                        
+                        // Obtain the array to collect the values. If the array doesn't exist, create it.
+                        NSMutableArray *values = [info objectForKey:column];
+                        if (nil == values) {
+                            values = [NSMutableArray new];
+                        }
+                        [values addObject:value];
+                        [info setObject:values forKey:column];
                     }
-                    
-                    // Obtain the array to collect the values. If the array doesn't exist, create it.
-                    NSMutableArray *values = [info objectForKey:column];
-                    if (nil == values) {
-                        values = [NSMutableArray new];
-                    }
-                    [values addObject:value];
-                    [info setObject:values forKey:column];
+
                     
                     // Let's cleanup. This will keep the memory footprint low...
                 }
@@ -638,10 +669,10 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
     NSFNanoResult *result = nil;
     
     if (SQLITE_OK != status) {
-        NSString *msg = (NULL != errorMessage) ? [NSString stringWithUTF8String:errorMessage] : [NSString stringWithFormat:@"SQLite error ID: %ld", status];
+        NSString *msg = (NULL != errorMessage) ? [NSString stringWithUTF8String:errorMessage] : [NSString stringWithFormat:@"SQLite error ID: %d", status];
         result = [NSFNanoResult _resultWithError:[NSError errorWithDomain:NSFDomainKey
                                                                     code:NSFNanoStoreErrorKey
-                                                                userInfo:[NSDictionary dictionaryWithObject:[NSString stringWithFormat:@"*** -[%@ %s]: %@", [self class], _cmd, msg]
+                                                                userInfo:[NSDictionary dictionaryWithObject:[NSString stringWithFormat:@"*** -[%@ %@]: %@", [self class], NSStringFromSelector(_cmd), msg]
                                                                                                      forKey:NSLocalizedFailureReasonErrorKey]]];
     } else {
         result = [NSFNanoResult _resultWithDictionary:info];
@@ -659,7 +690,7 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 {
     if (nil == table) {
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: theSQLStatement is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: theSQLStatement is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     }
     
@@ -682,14 +713,9 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
         theTimeout = 250;
     }
     
-    busyTimeout = theTimeout;
+    _busyTimeout = theTimeout;
     
-    sqlite3_busy_timeout(self.sqlite, busyTimeout);
-}
-
-- (unsigned int)busyTimeout
-{
-    return busyTimeout;
+    sqlite3_busy_timeout(self.sqlite, _busyTimeout);
 }
 
 + (NSInteger)systemPageSize
@@ -908,7 +934,7 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 {
     if (nil == data)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: data is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: data is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     NSInteger decodedDataSize = [data length];
@@ -983,7 +1009,7 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 {
     if (nil == encodedData)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: encodedData is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: encodedData is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     const char* source = [encodedData UTF8String];
@@ -1043,7 +1069,7 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 
 - (NSString *)NSFP_cacheMethodToString
 {
-    switch (cacheMethod) {
+    switch (_cacheMethod) {
         case CacheAllData:
             return @"Cache all data";
             break;
@@ -1063,26 +1089,11 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
     return (extendedResult & 0x00FF);
 }
 
-- (NSString*)NSFP_nestedDescriptionWithPrefixedSpace:(NSString *)prefixedSpace
-{
-    if (nil == prefixedSpace) {
-        prefixedSpace = @"";
-    }
-    
-    NSMutableString *description = [NSMutableString string];
-    [description appendString:@"\n"];
-    [description appendString:[NSString stringWithFormat:@"%@SQLite address  : 0x%x\n", prefixedSpace, self.sqlite]];
-    [description appendString:[NSString stringWithFormat:@"%@Database path   : %@\n", prefixedSpace, path]];
-    [description appendString:[NSString stringWithFormat:@"%@Cache method    : %@\n", prefixedSpace, [self NSFP_cacheMethodToString]]];
-    
-    return description;
-}
-
 + (NSDictionary *)_plistToDictionary:(NSString *)aPlist
 {
     if (nil == aPlist)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: aPlist is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: aPlist is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     if ([aPlist length] == 0)
@@ -1110,12 +1121,12 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 {
     if (nil == dest)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: dest is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: dest is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     if (nil == src)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: src is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: src is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     NSUInteger x = 0;
@@ -1146,7 +1157,7 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 {
     if (nil == tableAndColumn)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: tableAndColumn is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: tableAndColumn is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     NSString  *table = [self NSFP_prefixWithDotDelimiter:tableAndColumn];
@@ -1159,19 +1170,19 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 {
     if (nil == table)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: table is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: table is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     if (nil == column)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: column is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: column is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     NSString  *datatype = nil;
     
     // Check to see if the schema has been cached; take advantage of it if possible...
-    if (nil != schema) {
-        datatype = [[schema objectForKey:table]objectForKey:column];
+    if (nil != _schema) {
+        datatype = [[_schema objectForKey:table]objectForKey:column];
         if (nil == datatype) datatype = NSFStringFromNanoDataType(NSFNanoTypeUnknown);
     } else {
         NSString  *theSQLStatement = [NSString stringWithFormat:@"SELECT %@ from %@ WHERE %@ = '%@' AND %@ = '%@';", NSFP_DatatypeIdentifier, NSFP_SchemaTable, NSFP_TableIdentifier, table, NSFP_ColumnIdentifier, column];
@@ -1182,14 +1193,14 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
                     
         if (nil == datatype) datatype = NSFStringFromNanoDataType(NSFNanoTypeUnknown);
 
-        NSMutableDictionary *tempSchema = [schema objectForKey:table];
+        NSMutableDictionary *tempSchema = [_schema objectForKey:table];
         if (nil != tempSchema)
             tempSchema = [[NSMutableDictionary alloc]init];
         else
             ;
         
         [tempSchema setObject:datatype forKey:column];
-        [schema setObject:tempSchema forKey:table];
+        [_schema setObject:tempSchema forKey:table];
         
         tempSchema = nil;
     }
@@ -1234,7 +1245,7 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 {
     if (nil == aSQLQuery)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: aSQLQuery is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: aSQLQuery is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     // Prepare SQLite's VM. It's placed here so we can speed up stores...
@@ -1261,7 +1272,7 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 {
     if (nil == theSQLStatement)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: theSQLStatement is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: theSQLStatement is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     if ([self isTransactionActive] == NO) {
@@ -1316,22 +1327,22 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 {
     if (nil == table)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: table is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: table is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     if (nil == tableColumns)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: tableColumns is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: tableColumns is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     if (nil == tableDatatypes)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: tableDatatypes is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: tableDatatypes is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     if ([tableColumns count] != [tableDatatypes count])
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: number of columns and datatypes mismatch.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: number of columns and datatypes mismatch.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     NSSet *allowedDatatypes = [NSFNanoEngine sharedNanoStoreEngineDatatypes];
@@ -1410,12 +1421,12 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
     
     if (nil == column)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: column is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: column is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     if (nil == table)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: table is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: table is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     NSArray *tableInfoColumns = [self columnsForTable:table];
@@ -1493,8 +1504,8 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 - (void)NSFP_rebuildDatatypeCache
 {
     // Cleanup
-    schema = nil;
-    schema = [[NSMutableDictionary alloc]init];
+    _schema = nil;
+    _schema = [[NSMutableDictionary alloc]init];
     
     NSArray *tables = [self NSFP_flattenAllTables];
     if ([tables count] == 0)
@@ -1515,7 +1526,7 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
             [tableDictionary setObject:[datatypes objectAtIndex:j] forKey:[columns objectAtIndex:j]];
         }
         
-        [schema setObject:tableDictionary forKey:table];
+        [_schema setObject:tableDictionary forKey:table];
     }
 }
 
@@ -1523,17 +1534,17 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 {
     if (nil == values)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: values is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: values is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     if (nil == columns)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: columns is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: columns is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     if (nil == table)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: table is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: table is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     // Make sure we have specified ROWID in the group of columns
@@ -1569,12 +1580,12 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 {
     if (nil == theSQLStatement)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: theSQLStatement is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: theSQLStatement is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     if (nil == tags)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: tags is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: tags is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     NSInteger i, count = [tags count];
@@ -1598,12 +1609,12 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 {
     if (nil == theSQLStatement)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: theSQLStatement is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: theSQLStatement is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     if (nil == tags)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: tags is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: tags is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     [self NSFP_sqlString:theSQLStatement appendingTags:tags quoteTags:NO];
@@ -1613,22 +1624,22 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 {
     if (nil == theSQLStatement)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: theSQLStatement is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: theSQLStatement is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     if (nil == table)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: table is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: table is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     if (nil == columns)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: columns is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: columns is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     if (nil == datatypes)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: datatypes is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: datatypes is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     BOOL constructionSucceeded = YES;
@@ -1664,12 +1675,12 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 {
     if (nil == tableColumns)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: tableColumns is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: tableColumns is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     if (nil == datatypes)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: datatypes is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: datatypes is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     // First check if we have a datatype of type NSFNanoTypeRowUID
@@ -1708,18 +1719,18 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 {
     if (nil == column)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: column is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: column is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     if (nil == table)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: table is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: table is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     NSString *rowUIDDatatype = NSFStringFromNanoDataType(NSFNanoTypeRowUID);
     
-    if (nil != schema)
-        return [[[schema objectForKey:table]objectForKey:column]isEqualToString:rowUIDDatatype];
+    if (nil != _schema)
+        return [[[_schema objectForKey:table]objectForKey:column]isEqualToString:rowUIDDatatype];
     
     NSString  *theSQLStatement = [NSString stringWithFormat:@"SELECT %@ FROM %@ WHERE %@ = '%@' AND %@ = '%@';", NSFP_DatatypeIdentifier, NSFP_SchemaTable, NSFP_TableIdentifier, table, NSFP_ColumnIdentifier, column];
     NSFNanoResult* result = [self executeSQL:theSQLStatement];
@@ -1734,7 +1745,7 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 {
     if (nil == tableAndColumn)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: tableAndColumn is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: tableAndColumn is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     NSRange range = [tableAndColumn rangeOfString:@"." options:NSBackwardsSearch];
@@ -1748,7 +1759,7 @@ static NSSet    *__NSFPSharedNanoStoreEngineDatatypes = nil;
 {
     if (nil == tableAndColumn)
         [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %s]: tableAndColumn is nil.", [self class], _cmd]
+                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: tableAndColumn is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
     NSRange range = [tableAndColumn rangeOfString:@"." options:NSBackwardsSearch];