nano-store 0.6.2 → 0.6.3

data/vendor/Pods/NanoStore/Classes/Public/NSFNanoExpression.m

@@ -31,13 +31,11 @@
 @implementation NSFNanoExpression
 {
     /** \cond */
-    NSMutableArray      *predicates;
-    NSMutableArray      *operators;
+    NSMutableArray *_predicates;
+    NSMutableArray *_operators;
     /** \endcond */
 }
 
-@synthesize predicates, operators;
-
 + (NSFNanoExpression*)expressionWithPredicate:(NSFNanoPredicate *)aPredicate
 {
     return [[self alloc]initWithPredicate:aPredicate];
@@ -52,10 +50,10 @@
     }
     
     if ((self = [super init])) {
-        predicates = [NSMutableArray new];
-        [predicates addObject:aPredicate];
-        operators = [NSMutableArray new];
-        [operators addObject:[NSNumber numberWithInt:NSFAnd]];
+        _predicates = [NSMutableArray new];
+        [_predicates addObject:aPredicate];
+        _operators = [NSMutableArray new];
+        [_operators addObject:[NSNumber numberWithInt:NSFAnd]];
     }
     
     return self;
@@ -75,8 +73,8 @@
                                  reason:[NSString stringWithFormat:@"*** -[%@ %@]: the predicate is nil.", [self class], NSStringFromSelector(_cmd)]
                                userInfo:nil]raise];
     
-    [predicates addObject:aPredicate];
-    [operators addObject:[NSNumber numberWithInt:someOperator]];
+    [_predicates addObject:aPredicate];
+    [_operators addObject:[NSNumber numberWithInt:someOperator]];
 }
 
 - (NSString *)description
@@ -88,14 +86,14 @@
 
 - (NSArray *)arrayDescription
 {
-    NSUInteger i, count = [predicates count];
+    NSUInteger i, count = [_predicates count];
     NSMutableArray *values = [NSMutableArray new];
     
     // We always have one predicate, so make sure add it
-    [values addObject:[[predicates objectAtIndex:0]description]];
+    [values addObject:[[_predicates objectAtIndex:0]description]];
     
     for (i = 1; i < count; i++) {
-        NSString *compound = [[NSString alloc]initWithFormat:@" %@ %@", ([[operators objectAtIndex:i]intValue] == NSFAnd) ? @"AND" : @"OR", [[predicates objectAtIndex:i]description]];
+        NSString *compound = [[NSString alloc]initWithFormat:@" %@ %@", ([[_operators objectAtIndex:i]intValue] == NSFAnd) ? @"AND" : @"OR", [[_predicates objectAtIndex:i]description]];
         [values addObject:compound];
     }
     

data/vendor/Pods/NanoStore/Classes/Public/NSFNanoGlobals.h

@@ -144,7 +144,9 @@ typedef enum {
     /** * Greater Ththanan */
     NSFGreaterThan,
     /** * Less than */
-    NSFLessThan
+    NSFLessThan,
+    /** * Not Equal to from */
+    NSFNotEqualTo
 } NSFMatchType;
 
 /** * Column types for the Attributes table.

data/vendor/Pods/NanoStore/Classes/Public/NSFNanoGlobals.m

@@ -85,6 +85,7 @@ NSString * NSFStringFromMatchType (NSFMatchType aMatchType)
         case NSFInsensitiveEndsWith: value = @"Ends with (case insensitive)"; break;
         case NSFGreaterThan: value = @"Greater than"; break;
         case NSFLessThan: value = @"Less than"; break;
+        case NSFNotEqualTo: value = @"Not equal to"; break;
     }
     
     return value;

data/vendor/Pods/NanoStore/Classes/Public/NSFNanoObject.m

@@ -30,13 +30,18 @@
 #import "NSFNanoGlobals_Private.h"
 #import "NSFOrderedDictionary.h"
 
+@interface NSFNanoObject ()
+/** \cond */
+@property (nonatomic, weak, readwrite) NSFNanoStore *store;
+@property (nonatomic, copy, readwrite) NSString *key;
+/** \endcond */
+@end
+
 @implementation NSFNanoObject
 {
-    NSMutableDictionary *info;
+    NSMutableDictionary *_info;
 }
 
-@synthesize info, key, originalClassString;
-
 + (NSFNanoObject *)nanoObject
 {
     return [[self alloc]initNanoObjectFromDictionaryRepresentation:nil forKey:nil store:nil];
@@ -69,13 +74,13 @@
     if ((self = [self init])) {
         // If we have supplied a key, honor it and overwrite the original one
         if (nil != aKey) {
-            key = [aKey copy];
+            _key = aKey;
         }
         
         // Keep the dictionary if needed
         if (nil != aDictionary) {
-            info = [NSMutableDictionary new];
-            [info addEntriesFromDictionary:aDictionary];
+            _info = [NSMutableDictionary new];
+            [_info addEntriesFromDictionary:aDictionary];
         }
         
         _store = aStore;
@@ -99,10 +104,10 @@
     NSFOrderedDictionary *values = [NSFOrderedDictionary new];
     
     values[@"NanoObject address"] = [NSString stringWithFormat:@"%p", self];
-    values[@"Original class"] = (nil != originalClassString) ? originalClassString : NSStringFromClass ([self class]);
-    values[@"Key"] = key;
-    values[@"Property count"] = @([info count]);
-    values[@"Contents"] = info;
+    values[@"Original class"] = (nil != _originalClassString) ? _originalClassString : NSStringFromClass ([self class]);
+    values[@"Key"] = _key;
+    values[@"Property count"] = @([_info count]);
+    values[@"Contents"] = _info;
     
     return values;
 }
@@ -120,41 +125,41 @@
 - (void)addEntriesFromDictionary:(NSDictionary *)otherDictionary
 {
     // Allocate the dictionary if needed
-    if (nil == info) {
-        info = [NSMutableDictionary new];
+    if (nil == _info) {
+        _info = [NSMutableDictionary new];
     }
     
-    [info addEntriesFromDictionary:otherDictionary];
+    [_info addEntriesFromDictionary:otherDictionary];
 }
 
 - (void)setObject:(id)anObject forKey:(NSString *)aKey
 {
     // Allocate the dictionary if needed
-    if (nil == info) {
-        info = [NSMutableDictionary new];
+    if (nil == _info) {
+        _info = [NSMutableDictionary new];
     }
     
-    [info setObject:anObject forKey:aKey];
+    [_info setObject:anObject forKey:aKey];
 }
 
 - (id)objectForKey:(NSString *)aKey
 {
-    return [info objectForKey:aKey];
+    return [_info objectForKey:aKey];
 }
 
 - (void)removeObjectForKey:(NSString *)aKey
 {
-    [info removeObjectForKey:aKey];
+    [_info removeObjectForKey:aKey];
 }
 
 - (void)removeAllObjects
 {
-    [info removeAllObjects];
+    [_info removeAllObjects];
 }
 
 - (void)removeObjectsForKeys:(NSArray *)keyArray
 {
-    [info removeObjectsForKeys:keyArray];
+    [_info removeObjectsForKeys:keyArray];
 }
 
 - (BOOL)isEqualToNanoObject:(NSFNanoObject *)otherNanoObject
@@ -165,14 +170,14 @@
     
     BOOL success = YES;
     
-    if (originalClassString != otherNanoObject.originalClassString) {
-        if (NO == [originalClassString isEqualToString:otherNanoObject.originalClassString]) {
+    if (_originalClassString != otherNanoObject.originalClassString) {
+        if (NO == [_originalClassString isEqualToString:otherNanoObject.originalClassString]) {
             success = NO;
         }
     }
     
     if (YES == success) {
-        success = [info isEqualToDictionary:otherNanoObject.info];
+        success = [_info isEqualToDictionary:otherNanoObject.info];
     }
     
     return success;
@@ -195,9 +200,9 @@
 - (id)init
 {
     if ((self = [super init])) {
-        key = [[NSFNanoEngine stringWithUUID]copy];
-        info = nil;
-        originalClassString = nil;
+        _key = [NSFNanoEngine stringWithUUID];
+        _info = nil;
+        _originalClassString = nil;
         _store = nil;
     }
     
@@ -225,7 +230,7 @@
 
 - (id)rootObject
 {
-    return info;
+    return _info;
 }
 
 #pragma mark -
@@ -234,8 +239,8 @@
 
 - (void)_setOriginalClassString:(NSString *)theClassString
 {
-    if (originalClassString != theClassString) {
-        originalClassString = theClassString;
+    if (_originalClassString != theClassString) {
+        _originalClassString = theClassString;
     }
 }
 

data/vendor/Pods/NanoStore/Classes/Public/NSFNanoPredicate.h

@@ -77,7 +77,7 @@
 /** * The comparison operator to be used. */
 @property (nonatomic, assign, readonly) NSFMatchType match;
 /** * The value to be used for comparison.  */
-@property (nonatomic, copy, readonly) NSString *value;
+@property (nonatomic, readonly) id value;
 
 /** @name Creating and Initializing a Predicate
  */
@@ -87,22 +87,22 @@
 /** * Creates and returns a predicate.
  * @param theType is the column type. Can be \link Globals::NSFKeyColumn NSFKeyColumn \endlink, \link Globals::NSFAttributeColumn NSFAttributeColumn \endlink or \link Globals::NSFValueColumn NSFValueColumn \endlink.
  * @param theMatch is the match operator.
- * @param theValue is the value.
+ * @param theValue can be an NSString or [NSNull null]
  * @return A predicate which can be used in an NSFNanoExpression.
  * @see \link initWithColumn:matching:value: - (id)initWithColumn:(NSFTableColumnType)theType matching:(NSFMatchType)theMatch value:(NSString *)theValue \endlink
  */
 
-+ (NSFNanoPredicate*)predicateWithColumn:(NSFTableColumnType)theType matching:(NSFMatchType)theMatch value:(NSString *)theValue;
++ (NSFNanoPredicate*)predicateWithColumn:(NSFTableColumnType)theType matching:(NSFMatchType)theMatch value:(id)theValue;
 
 /** * Initializes a newly allocated predicate.
  * @param theType is the column type. Can be \link Globals::NSFKeyColumn NSFKeyColumn \endlink, \link Globals::NSFAttributeColumn NSFAttributeColumn \endlink or \link Globals::NSFValueColumn NSFValueColumn \endlink.
  * @param theMatch is the match operator.
- * @param theValue is the value.
+ * @param theValue can be an NSString or [NSNull null]
  * @return A predicate which can be used in an NSFNanoExpression.
  * @see \link predicateWithColumn:matching:value: + (NSFNanoPredicate*)predicateWithColumn:(NSFTableColumnType)theType matching:(NSFMatchType)theMatch value:(NSString *)theValue \endlink
  */
 
-- (id)initWithColumn:(NSFTableColumnType)theType matching:(NSFMatchType)theMatch value:(NSString *)theValue;
+- (id)initWithColumn:(NSFTableColumnType)theType matching:(NSFMatchType)theMatch value:(id)theValue;
 
 //@}
 

data/vendor/Pods/NanoStore/Classes/Public/NSFNanoPredicate.m

@@ -28,35 +28,36 @@
 #import "NanoStore_Private.h"
 #import "NSFOrderedDictionary.h"
 
-@implementation NSFNanoPredicate
+@interface NSFNanoPredicate ()
+
+    /** \cond */
+    @property (nonatomic, assign, readwrite) NSFTableColumnType column;
+    @property (nonatomic, assign, readwrite) NSFMatchType match;
+    @property (nonatomic, readwrite) id value;
+    /** \endcond */
 
-@synthesize column, match, value;
+@end
+
+@implementation NSFNanoPredicate
 
 // ----------------------------------------------
 // Initialization / Cleanup
 // ----------------------------------------------
 
-+ (NSFNanoPredicate*)predicateWithColumn:(NSFTableColumnType)type matching:(NSFMatchType)matching value:(NSString *)aValue
++ (NSFNanoPredicate*)predicateWithColumn:(NSFTableColumnType)type matching:(NSFMatchType)matching value:(id)aValue
 {
-    if (nil == aValue)
-        [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: value is nil.", [self class], NSStringFromSelector(_cmd)]
-                               userInfo:nil]raise];
-    
     return [[self alloc]initWithColumn:type matching:matching value:aValue];
 }
 
-- (id)initWithColumn:(NSFTableColumnType)type matching:(NSFMatchType)matching value:(NSString *)aValue
+- (id)initWithColumn:(NSFTableColumnType)type matching:(NSFMatchType)matching value:(id)aValue
 {
-    if (nil == aValue)
-        [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: value is nil.", [self class], NSStringFromSelector(_cmd)]
-                               userInfo:nil]raise];
-    
+    NSAssert(nil != aValue, @"*** -[%@ %@]: value is nil.", [self class], NSStringFromSelector(_cmd));
+    NSAssert([aValue isKindOfClass:[NSString class]] || [aValue isKindOfClass:[NSNull class]], @"*** -[%@ %@]: value must be of type NSString or NSNull.", [self class], NSStringFromSelector(_cmd));
+
     if ((self = [super init])) {
-        column = type;
-        match = matching;
-        value = aValue;
+        _column = type;
+        _match = matching;
+        _value = aValue;
     }
     
     return self;
@@ -75,7 +76,7 @@
     NSMutableString *mutatedString = nil;
     NSInteger mutatedStringLength = 0;
     
-    switch (column) {
+    switch (_column) {
         case NSFKeyColumn:
             columnValue = NSFKey;
             break;
@@ -88,44 +89,52 @@
     }
     
     // Make sure we escape quotes if present and the value is a string
-    value = [value stringByReplacingOccurrencesOfString:@"'" withString:@"''"];
+    if (YES == [_value isKindOfClass:[NSString class]]) {
+        _value = [_value stringByReplacingOccurrencesOfString:@"'" withString:@"''"];
+    } else {
+        _value = NSFStringFromNanoDataType(NSFNanoTypeNULL);
+        columnValue = NSFDatatype;
+    }
     
-    switch (match) {
+    switch (_match) {
         case NSFEqualTo:
-            [values addObject:[NSString stringWithFormat:@"%@ = '%@'", columnValue, value]];
+            [values addObject:[NSString stringWithFormat:@"%@ = '%@'", columnValue, _value]];
             break;
         case NSFBeginsWith:
-            mutatedString = [NSMutableString stringWithString:value];
-            mutatedStringLength = [value length];
+            mutatedString = [NSMutableString stringWithString:_value];
+            mutatedStringLength = [_value length];
             [mutatedString replaceCharactersInRange:NSMakeRange(mutatedStringLength - 1, 1) withString:[NSString stringWithFormat:@"%c", [mutatedString characterAtIndex:mutatedStringLength - 1]+1]];
-            [values addObject:[NSString stringWithFormat:@"(%@ >= '%@' AND %@ < '%@')", columnValue, value, columnValue, mutatedString]];
+            [values addObject:[NSString stringWithFormat:@"(%@ >= '%@' AND %@ < '%@')", columnValue, _value, columnValue, mutatedString]];
             break;
         case NSFContains:
-            [values addObject:[NSString stringWithFormat:@"%@ GLOB '*%@*'", columnValue, value]];
+            [values addObject:[NSString stringWithFormat:@"%@ GLOB '*%@*'", columnValue, _value]];
             break;
         case NSFEndsWith:
-            [values addObject:[NSString stringWithFormat:@"%@ GLOB '*%@'", columnValue, value]];
+            [values addObject:[NSString stringWithFormat:@"%@ GLOB '*%@'", columnValue, _value]];
             break;
         case NSFInsensitiveEqualTo:
-            [values addObject:[NSString stringWithFormat:@"upper(%@) = '%@'", columnValue, [value uppercaseString]]];
+            [values addObject:[NSString stringWithFormat:@"upper(%@) = '%@'", columnValue, [_value uppercaseString]]];
             break;
         case NSFInsensitiveBeginsWith:
-            mutatedString = [NSMutableString stringWithString:value];
-            mutatedStringLength = [value length];
+            mutatedString = [NSMutableString stringWithString:_value];
+            mutatedStringLength = [_value length];
             [mutatedString replaceCharactersInRange:NSMakeRange(mutatedStringLength - 1, 1) withString:[NSString stringWithFormat:@"%c", [mutatedString characterAtIndex:mutatedStringLength - 1]+1]];
-            [values addObject:[NSString stringWithFormat:@"(upper(%@) >= '%@' AND upper(%@) < '%@')", columnValue, [value uppercaseString], columnValue, [mutatedString uppercaseString]]];
+            [values addObject:[NSString stringWithFormat:@"(upper(%@) >= '%@' AND upper(%@) < '%@')", columnValue, [_value uppercaseString], columnValue, [mutatedString uppercaseString]]];
             break;
         case NSFInsensitiveContains:
-            [values addObject:[NSString stringWithFormat:@"%@ LIKE '%@%@%@'", columnValue, @"%", value, @"%"]];
+            [values addObject:[NSString stringWithFormat:@"%@ LIKE '%@%@%@'", columnValue, @"%", _value, @"%"]];
             break;
         case NSFInsensitiveEndsWith:
-            [values addObject:[NSString stringWithFormat:@"%@ LIKE '%@%@'", columnValue, @"%", value]];
+            [values addObject:[NSString stringWithFormat:@"%@ LIKE '%@%@'", columnValue, @"%", _value]];
             break;
         case NSFGreaterThan:
-            [values addObject:[NSString stringWithFormat:@"%@ > '%@'", columnValue, value]];
+            [values addObject:[NSString stringWithFormat:@"%@ > '%@'", columnValue, _value]];
             break;
         case NSFLessThan:
-            [values addObject:[NSString stringWithFormat:@"%@ < '%@'", columnValue, value]];
+            [values addObject:[NSString stringWithFormat:@"%@ < '%@'", columnValue, _value]];
+            break;
+        case NSFNotEqualTo:
+            [values addObject:[NSString stringWithFormat:@"%@ <> '%@'", columnValue, _value]];
             break;
     }
     

data/vendor/Pods/NanoStore/Classes/Public/NSFNanoSearch.h

@@ -175,11 +175,13 @@
 /** * The sort holds an array of one or more sort descriptors of type \link NSFNanoSortDescriptor NSFNanoSortDescriptor \endlink. */
 @property (nonatomic, strong, readwrite) NSArray *sort;
 /** * The filterClass allows to filter the results based on a specific object class. */
-@property (nonatomic, strong, readwrite) NSString *filterClass;
+@property (nonatomic, copy, readwrite) NSString *filterClass;
 /** * If an expression has an offset clause, then the first M rows are omitted from the result set returned by the search operation and the next N rows are returned, where M and N are the values that the offset and limit clauses evaluate to, respectively. Or, if the search would return less than M+N rows if it did not have a limit clause, then the first M rows are skipped and the remaining rows (if any) are returned. */
 @property (nonatomic, assign, readwrite) NSUInteger offset;
 /** * The limit clause is used to place an upper bound on the number of rows returned by a Search operation. */
 @property (nonatomic, assign, readwrite) NSUInteger limit;
+/** * limit a Search to a particular bag. */
+@property (nonatomic, assign, readwrite) NSFNanoBag *bag;
 
 /** @name Creating and Initializing a Search
  */
@@ -213,7 +215,7 @@
  * @param theReturnType the type of object to be returned. Can be \link Globals::NSFReturnObjects NSFReturnObjects \endlink or \link Globals::NSFReturnKeys NSFReturnKeys \endlink.
  * @param outError is used if an error occurs. May be NULL.
  * @return An array is returned if: 1) the sort has been specified or 2) the return type is \link Globals::NSFReturnKeys NSFReturnKeys \endlink. Otherwise, a dictionary is returned.
- * @note The sort descriptor will be ignored when returning requesting NSFReturnKeys.
+ * @note The sort descriptor will be ignored when the return type is NSFReturnKeys.
  * @see \link searchObjectsAdded:date:returnType:error: - (id)searchObjectsAdded:(NSFDateMatchType)theDateMatch date:(NSDate *)theDate returnType:(NSFReturnType)theReturnType error:(out NSError **)outError \endlink
  */
 
@@ -225,7 +227,7 @@
  * @param theReturnType the type of object to be returned. Can be \link Globals::NSFReturnObjects NSFReturnObjects \endlink or \link Globals::NSFReturnKeys NSFReturnKeys \endlink.
  * @param outError is used if an error occurs. May be NULL.
  * @return If theReturnType is \link Globals::NSFReturnObjects NSFReturnObjects \endlink, a dictionary is returned. Otherwise, an array is returned.
- * @note The sort descriptor will be ignored when returning requesting NSFReturnKeys.
+ * @note The sort descriptor will be ignored when the return type is NSFReturnKeys.
  * @see \link searchObjectsWithReturnType:error: - (id)searchObjectsWithReturnType:(NSFReturnType)theReturnType error:(out NSError **)outError \endlink
  */
 

data/vendor/Pods/NanoStore/Classes/Public/NSFNanoSearch.m

@@ -29,16 +29,15 @@
 #import "NSFNanoSearch_Private.h"
 #import "NSFNanoExpression_Private.h"
 
-@implementation NSFNanoSearch
-{
-    /** \cond */
-@protected
-    NSFReturnType returnedObjectType;
-    /** \endcond */
-}
+@interface NSFNanoSearch ()
 
+/** \cond */
+@property (nonatomic, copy, readwrite) NSString *sql;
+@property (nonatomic) NSFReturnType returnedObjectType;
+/** \endcond */
+@end
 
-@synthesize nanoStore, attributesToBeReturned, key, attribute, value, match, expressions, groupValues, sql, sort, filterClass, offset, limit;
+@implementation NSFNanoSearch
 
 // ----------------------------------------------
 // Initialization / Cleanup
@@ -58,7 +57,7 @@
     }
     
     if ((self = [self init])) {
-        nanoStore = store;
+        _nanoStore = store;
         [self reset];
     }
     
@@ -78,10 +77,10 @@
 
 - (NSString *)sql
 {
-    if (nil == sql)
+    if (nil == _sql)
         return [self _preparedSQL];
     
-    return sql;
+    return _sql;
 }
 
 #pragma mark -
@@ -105,8 +104,8 @@
     [self reset];
     self.sort = savedSort;
     
-    returnedObjectType = theReturnType;
-    sql = [theSQLStatement copy];
+    _returnedObjectType = theReturnType;
+    _sql = theSQLStatement;
     
     NSDictionary *results = [self _retrieveDataWithError:outError];
     
@@ -130,9 +129,9 @@
     // Make sure we don't have any lingering parameters that could mess with the results...
     [self reset];
     
-    sql = theSQLStatement;
+    _sql = theSQLStatement;
     
-    return [nanoStore _executeSQL:theSQLStatement];
+    return [_nanoStore _executeSQL:theSQLStatement];
 }
 
 - (NSFNanoResult *)explainSQL:(NSString *)theSQLStatement
@@ -149,32 +148,32 @@
                                userInfo:nil]raise];
     }
     
-    return [nanoStore _executeSQL:[NSString stringWithFormat:@"EXPLAIN %@", theSQLStatement]];
+    return [_nanoStore _executeSQL:[NSString stringWithFormat:@"EXPLAIN %@", theSQLStatement]];
 }
 
 - (void)reset
 {
-    attributesToBeReturned= nil;
-    key = nil;
-    attribute = nil;
-    value = nil;
-    match = NSFContains;
-    groupValues = NO;
-    sql = nil;
-    sort = nil;
-    offset = 0;
-    limit = 0;
-    returnedObjectType = NSFReturnObjects;
+    _attributesToBeReturned = nil;
+    _key = nil;
+    _attribute = nil;
+    _value = nil;
+    _match = NSFContains;
+    _groupValues = NO;
+    _sql = nil;
+    _sort = nil;
+    _offset = 0;
+    _limit = 0;
+    _returnedObjectType = NSFReturnObjects;
 }
 
 #pragma mark -
 
 - (id)searchObjectsWithReturnType:(NSFReturnType)theReturnType error:(out NSError **)outError
 {
-    returnedObjectType = theReturnType;
+    _returnedObjectType = theReturnType;
     
     // Make sure we don't have a SQL statement around...
-    sql = nil;
+    _sql = nil;
     
     id results = [self _retrieveDataWithError:outError];
     
@@ -183,10 +182,10 @@
 
 - (id)searchObjectsAdded:(NSFDateMatchType)theDateMatch date:(NSDate *)theDate returnType:(NSFReturnType)theReturnType error:(out NSError **)outError
 {
-    returnedObjectType = theReturnType;
+    _returnedObjectType = theReturnType;
     
     // Make sure we don't have a SQL statement around...
-    sql = nil;
+    _sql = nil;
     
     id results = [self _retrieveDataAdded:theDateMatch calendarDate:theDate error:outError];
     
@@ -199,11 +198,11 @@
 
 - (NSNumber *)aggregateOperation:(NSFAggregateFunctionType)theFunctionType onAttribute:(NSString *)theAttribute
 {    
-    NSFReturnType savedObjectTypeReturned = returnedObjectType;
-    returnedObjectType = NSFReturnKeys;
+    NSFReturnType savedObjectTypeReturned = _returnedObjectType;
+    _returnedObjectType = NSFReturnKeys;
     
-    NSString *savedSQL = sql;
-    sql = nil;
+    NSString *savedSQL = _sql;
+    _sql = nil;
     
     NSString *theSearchSQLStatement = [self sql];
     NSMutableString *theAggregatedSQLStatement = [NSMutableString new];
@@ -232,10 +231,10 @@
             break;
     }
     
-    NSFNanoResult *result = [nanoStore _executeSQL:theAggregatedSQLStatement];
+    NSFNanoResult *result = [_nanoStore _executeSQL:theAggregatedSQLStatement];
 
-    returnedObjectType = savedObjectTypeReturned;
-    sql = savedSQL;
+    _returnedObjectType = savedObjectTypeReturned;
+    _sql = savedSQL;
     
     return [NSNumber numberWithFloat:[[result firstValue]floatValue]];
 }
@@ -248,13 +247,13 @@
 
 - (NSDictionary *)_retrieveDataWithError:(out NSError **)outError
 {
-    if (YES == [nanoStore isClosed]) {
+    if (YES == [_nanoStore isClosed]) {
         return nil;
     }
     
     NSMutableDictionary *searchResults = [NSMutableDictionary dictionary];
     
-    NSString *aSQLQuery = sql;
+    NSString *aSQLQuery = _sql;
 
     if (nil != aSQLQuery) {
         // We are going to check whether the user has specified the proper columns based on the search type selected.
@@ -263,7 +262,7 @@
         // We basically honor the specified query but replace the columns with the expected ones per returned type.
         
         NSString *subStatement = [aSQLQuery substringFromIndex:[aSQLQuery rangeOfString:@"FROM" options:NSCaseInsensitiveSearch].location];
-        NSFReturnType returnType = returnedObjectType;
+        NSFReturnType returnType = _returnedObjectType;
         switch (returnType) {
             case NSFReturnKeys:
                 aSQLQuery = [NSString stringWithFormat:@"SELECT NSFKey %@", subStatement];
@@ -278,7 +277,7 @@
     
     _NSFLog(@"_dataWithKey SQL query: %@", aSQLQuery);
     
-    sqlite3 *sqliteStore = [[nanoStore nanoStoreEngine]sqlite];    
+    sqlite3 *sqliteStore = [[_nanoStore nanoStoreEngine]sqlite];    
     sqlite3_stmt *theSQLiteStatement = NULL;
     
     int status = sqlite3_prepare_v2 (sqliteStore, [aSQLQuery UTF8String], -1, &theSQLiteStatement, NULL );
@@ -286,7 +285,7 @@
     status = [NSFNanoEngine NSFP_stripBitsFromExtendedResultCode:status];
     
     if (SQLITE_OK == status) {        
-        switch (returnedObjectType) {
+        switch (_returnedObjectType) {
             case NSFReturnKeys:
                 while (SQLITE_ROW == sqlite3_step (theSQLiteStatement)) {
                     // Sanity check: some queries return NULL, which would cause a crash below.
@@ -322,7 +321,7 @@
                         continue;
                     }
                     
-                    if ([attributesToBeReturned count] == 0) {
+                    if ([_attributesToBeReturned count] == 0) {
                         // Will be released below...
                     } else {
                         // Since we want a subset of the attributes, we need to traverse
@@ -332,7 +331,7 @@
                         
                         NSMutableDictionary *subset = [NSMutableDictionary new];
                         
-                        for (NSString *attributeValue in attributesToBeReturned) {
+                        for (NSString *attributeValue in _attributesToBeReturned) {
                             id theValue = [info valueForKeyPath:attributeValue];
                             if (nil != theValue) {
                                 if (NSNotFound == [attributeValue rangeOfString:@"."].location) {
@@ -359,7 +358,7 @@
                         saveOriginalClassReference = YES;
                     }
                     
-                    id nanoObject = [[storedObjectClass alloc]initNanoObjectFromDictionaryRepresentation:info forKey:keyValue store:nanoStore];
+                    id nanoObject = [[storedObjectClass alloc]initNanoObjectFromDictionaryRepresentation:info forKey:keyValue store:_nanoStore];
                     
                     // If this process does not have knowledge of the original class as was saved in the store, keep a reference
                     // so that we can later on restore the object properly (otherwise it would be stored as a NanoObject.)
@@ -391,7 +390,7 @@
 
 - (NSDictionary *)_retrieveDataAdded:(NSFDateMatchType)aDateMatch calendarDate:(NSDate *)aDate error:(out NSError **)outError
 {
-    if ([nanoStore isClosed] == YES) {
+    if ([_nanoStore isClosed] == YES) {
         return nil;
     }
     
@@ -422,12 +421,12 @@
             break;
     }
     
-    NSFNanoResult *result = [nanoStore _executeSQL:theSQLStatement];
+    NSFNanoResult *result = [_nanoStore _executeSQL:theSQLStatement];
     
     NSMutableDictionary *searchResults = [NSMutableDictionary dictionaryWithCapacity:result.numberOfRows];
     
     if (result.numberOfRows > 0) {
-        if (NSFReturnKeys == returnedObjectType) {
+        if (NSFReturnKeys == _returnedObjectType) {
             NSArray *resultsKeys = [result valuesForColumn:[NSString stringWithFormat:@"%@.%@", NSFKeys, NSFKey]];
             for (NSString *resultKey in resultsKeys)
                 [searchResults setObject:[NSNull null] forKey:resultKey];
@@ -452,7 +451,7 @@
                             saveOriginalClassReference = YES;
                         }
                         
-                        id nanoObject = [[storedObjectClass alloc]initNanoObjectFromDictionaryRepresentation:info forKey:keyValue store:nanoStore];
+                        id nanoObject = [[storedObjectClass alloc]initNanoObjectFromDictionaryRepresentation:info forKey:keyValue store:_nanoStore];
                         
                         // If this process does not have knowledge of the original class as was saved in the store, keep a reference
                         // so that we can later on restore the object properly (otherwise it would be stored as a NanoObject.)
@@ -474,20 +473,20 @@
 {
     NSString *aSQLQuery = nil;
     
-    if (nil == expressions) {
-        aSQLQuery = [self _prepareSQLQueryStringWithKey:key attribute:attribute value:value matching:match];
+    if (nil == _expressions) {
+        aSQLQuery = [self _prepareSQLQueryStringWithKey:_key attribute:_attribute value:_value matching:_match];
     } else {
-        aSQLQuery = [self _prepareSQLQueryStringWithExpressions:expressions];
+        aSQLQuery = [self _prepareSQLQueryStringWithExpressions:_expressions];
     }
     
     // Add the limit clause if required
-    if (limit > 0) {
-        aSQLQuery = [NSString stringWithFormat:@"%@ LIMIT %li", aSQLQuery, limit];
+    if (_limit > 0) {
+        aSQLQuery = [NSString stringWithFormat:@"%@ LIMIT %li", aSQLQuery, _limit];
     }
     
     // Add the offset clause if required
-    if (offset > 0) {
-        aSQLQuery = [NSString stringWithFormat:@"%@ OFFSET %li", aSQLQuery, offset];
+    if (_offset > 0) {
+        aSQLQuery = [NSString stringWithFormat:@"%@ OFFSET %li", aSQLQuery, _offset];
     }
     
     return aSQLQuery;
@@ -503,9 +502,9 @@
         aValue = [aValue stringByReplacingOccurrencesOfString:@"'" withString:@"''"];
     }
     
-    if (nil != attributesToBeReturned) {
+    if (nil != _attributesToBeReturned) {
         // Prepare the list of attributes we need to gather. Include NSFKEY as well.
-        NSMutableSet *set = [[NSMutableSet alloc]initWithArray:attributesToBeReturned];
+        NSMutableSet *set = [[NSMutableSet alloc]initWithArray:_attributesToBeReturned];
         NSArray *objects = [set allObjects];
         NSMutableArray *quotedObjects = [NSMutableArray new];
         for (NSString *object in objects) {
@@ -515,7 +514,7 @@
         attributes = [quotedObjects componentsJoinedByString:@","];
     }
     
-    NSFReturnType returnType = returnedObjectType;
+    NSFReturnType returnType = _returnedObjectType;
     
     if ((nil == aKey) && (nil == anAttribute) && (nil == aValue)) {
         switch (returnType) {
@@ -529,7 +528,7 @@
     } else {
         switch (returnType) {
             case NSFReturnKeys:
-                if (NO == groupValues) {
+                if (NO == _groupValues) {
                     theSQLStatement = [NSMutableString stringWithString:@"SELECT DISTINCT (NSFKEY) FROM NSFValues WHERE "];
                 } else {
                     theSQLStatement = [NSMutableString stringWithString:@"SELECT NSFKEY FROM NSFValues WHERE "];
@@ -570,11 +569,15 @@
                 segment = [NSFNanoSearch _querySegmentForColumn:NSFAttribute value:anAttribute matching:NSFEqualTo];
                 [theSQLStatement appendString:segment];
                 [theSQLStatement appendString:@" AND "];
-                segment = [NSFNanoSearch _querySegmentForColumn:NSFValue value:aValue matching:NSFEqualTo];
+                segment = [NSFNanoSearch _querySegmentForColumn:NSFValue value:aValue matching:aMatch];
             }
         }
         
         [theSQLStatement appendString:segment];
+        if (self.bag != nil) {
+            NSString *selectInABag = [NSString stringWithFormat:@" AND NSFKey IN (SELECT NSFValue FROM NSFVALUES WHERE NSFKey == '%@' AND NSFAttribute == '%@')",self.bag.key,NSF_Private_NSFNanoBag_NSFObjectKeys];
+            [theSQLStatement appendString:selectInABag];
+        }
     } else {
         if (nil != aValue) {
             if (YES == querySegmentWasAdded)
@@ -584,11 +587,11 @@
         }
     }
     
-    if ((limit > 0) || (offset > 0)) {
+    if ((_limit > 0) || (_offset > 0)) {
         [theSQLStatement appendString:@" ORDER BY ROWID"];
     }
     
-    if (YES == groupValues) {
+    if (YES == _groupValues) {
         [theSQLStatement appendString:@" GROUP BY NSFValue"];
     }
     
@@ -612,7 +615,7 @@
     NSUInteger i, count = [someExpressions count];
     NSMutableArray *sqlComponents = [NSMutableArray new];
     NSMutableString *parentheses = [NSMutableString new];
-    NSFReturnType returnType = returnedObjectType;
+    NSFReturnType returnType = _returnedObjectType;
 
     if (count == 0) {
         if (NSFReturnObjects == returnType) {
@@ -733,6 +736,10 @@
                 value = [[NSMutableString alloc]initWithFormat:@"%@ < '%@'", aColumn, aValue];
                 [segment appendString:value];
                 break;
+            case NSFNotEqualTo:
+                value = [[NSMutableString alloc]initWithFormat:@"%@ <> '%@'", aColumn, aValue];
+                [segment appendString:value];
+                break;
         }
     } else if (YES == [aValue isKindOfClass:[NSArray class]]) {
         // Quote the parameters
@@ -750,6 +757,19 @@
         [segment appendString:value];
         
         // Free allocated resources
+    } else if (YES == [aValue isKindOfClass:[NSNull class]]){
+        switch (match) {
+            case NSFEqualTo:
+                value = [[NSMutableString alloc]initWithFormat:@"%@ IS NULL", aColumn];
+                [segment appendString:value];
+                break;
+            case NSFNotEqualTo:
+                value = [[NSMutableString alloc]initWithFormat:@"%@ IS NOT NULL", aColumn];
+                [segment appendString:value];
+                break;
+            default:
+                break;
+        }
     }
     
     return segment;
@@ -762,51 +782,56 @@
 
     if ((YES == [aValue isKindOfClass:[NSString class]]) || (nil == aValue)) {
         if (nil == aValue) {
-            value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@') OR (%@ GLOB '%@.*') OR (%@ GLOB '*.%@.*') OR (%@ GLOB '*.%@')", NSFAttribute, anAttributeValue, NSFAttribute, anAttributeValue, NSFAttribute, anAttributeValue, NSFAttribute, anAttributeValue];
+            value = [[NSMutableString alloc]initWithFormat:@"((%@ = '%@') OR (%@ GLOB '%@.*') OR (%@ GLOB '*.%@.*') OR (%@ GLOB '*.%@'))", NSFAttribute, anAttributeValue, NSFAttribute, anAttributeValue, NSFAttribute, anAttributeValue, NSFAttribute, anAttributeValue];
             [segment appendString:value];
         } else {
             switch (match) {
                 case NSFEqualTo:
-                    value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@' AND %@ = '%@') OR (%@ GLOB '%@.*' AND %@ = '%@') OR (%@ GLOB '*.%@.*' AND %@ = '%@') OR (%@ GLOB '*.%@' AND %@ = '%@')", NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue];
+                    value = [[NSMutableString alloc]initWithFormat:@"((%@ = '%@' AND %@ = '%@') OR (%@ GLOB '%@.*' AND %@ = '%@') OR (%@ GLOB '*.%@.*' AND %@ = '%@') OR (%@ GLOB '*.%@' AND %@ = '%@'))", NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue];
                     [segment appendString:value];
                     break;
                 case NSFBeginsWith:
-                    value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@' AND %@ GLOB '%@*') OR (%@ GLOB '%@.*' AND %@ GLOB '%@*') OR (%@ GLOB '*.%@.*' AND %@ GLOB '%@*') OR (%@ GLOB '*.%@' AND %@ GLOB '%@*')", NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue];
+                    value = [[NSMutableString alloc]initWithFormat:@"((%@ = '%@' AND %@ GLOB '%@*') OR (%@ GLOB '%@.*' AND %@ GLOB '%@*') OR (%@ GLOB '*.%@.*' AND %@ GLOB '%@*') OR (%@ GLOB '*.%@' AND %@ GLOB '%@*'))", NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue];
                     [segment appendString:value];
                     break;
                 case NSFContains:
-                    value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@' AND %@ GLOB '%@') OR (%@ GLOB '%@.*' AND %@ GLOB '%@') OR (%@ GLOB '*.%@.*' AND %@ GLOB '%@') OR (%@ GLOB '*.%@' AND %@ GLOB '%@')", NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue];
+                    value = [[NSMutableString alloc]initWithFormat:@"((%@ = '%@' AND %@ GLOB '%@') OR (%@ GLOB '%@.*' AND %@ GLOB '%@') OR (%@ GLOB '*.%@.*' AND %@ GLOB '%@') OR (%@ GLOB '*.%@' AND %@ GLOB '%@'))", NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue];
                     [segment appendString:value];
                     break;
                 case NSFEndsWith:
-                    value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@' AND %@ GLOB '*%@') OR (%@ GLOB '%@.*' AND %@ GLOB '*%@') OR (%@ GLOB '*.%@.*' AND %@ GLOB '*%@') OR (%@ GLOB '*.%@' AND %@ GLOB '*%@')", NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue];
+                    value = [[NSMutableString alloc]initWithFormat:@"((%@ = '%@' AND %@ GLOB '*%@') OR (%@ GLOB '%@.*' AND %@ GLOB '*%@') OR (%@ GLOB '*.%@.*' AND %@ GLOB '*%@') OR (%@ GLOB '*.%@' AND %@ GLOB '*%@'))", NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue];
                     [segment appendString:value];
                     break;
                 case NSFInsensitiveEqualTo:
                     aValue = [aValue uppercaseString];
-                    value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@' AND upper(%@) = '%@') OR (%@ GLOB '%@.*' AND upper(%@) = '%@') OR (%@ GLOB '*.%@.*' AND upper(%@) = '%@') OR (%@ GLOB '*.%@' AND upper(%@) = '%@')", NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue];
+                    value = [[NSMutableString alloc]initWithFormat:@"((%@ = '%@' AND upper(%@) = '%@') OR (%@ GLOB '%@.*' AND upper(%@) = '%@') OR (%@ GLOB '*.%@.*' AND upper(%@) = '%@') OR (%@ GLOB '*.%@' AND upper(%@) = '%@'))", NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue];
                     [segment appendString:value];
                     break;
                 case NSFInsensitiveBeginsWith:
                     aValue = [aValue uppercaseString];
-                    value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@' AND upper(%@) GLOB '%@*') OR (%@ GLOB '%@.*' AND upper(%@) GLOB '%@*') OR (%@ GLOB '*.%@.*' AND upper(%@) GLOB '%@*') OR (%@ GLOB '*.%@' AND upper(%@) GLOB '%@*')", NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue];
+                    value = [[NSMutableString alloc]initWithFormat:@"((%@ = '%@' AND upper(%@) GLOB '%@*') OR (%@ GLOB '%@.*' AND upper(%@) GLOB '%@*') OR (%@ GLOB '*.%@.*' AND upper(%@) GLOB '%@*') OR (%@ GLOB '*.%@' AND upper(%@) GLOB '%@*'))", NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue];
                     [segment appendString:value];
                     break;
                 case NSFInsensitiveContains:
-                    value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@' AND %@ LIKE '%@') OR (%@ GLOB '%@.*' AND %@ LIKE '%@') OR (%@ GLOB '*.%@.*' AND %@ LIKE '%@') OR (%@ GLOB '*.%@' AND %@ LIKE '%@')", NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue];
+                    value = [[NSMutableString alloc]initWithFormat:@"((%@ = '%@' AND %@ LIKE '%@') OR (%@ GLOB '%@.*' AND %@ LIKE '%@') OR (%@ GLOB '*.%@.*' AND %@ LIKE '%@') OR (%@ GLOB '*.%@' AND %@ LIKE '%@'))", NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue];
                     [segment appendString:value];
                     break;
                 case NSFInsensitiveEndsWith:
-                    value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@' AND %@ LIKE '%%%@') OR (%@ GLOB '%@.*' AND %@ LIKE '%%%@') OR (%@ GLOB '*.%@.*' AND %@ LIKE '%%%@') OR (%@ GLOB '*.%@' AND %@ LIKE '%%%@')", NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue];
+                    value = [[NSMutableString alloc]initWithFormat:@"((%@ = '%@' AND %@ LIKE '%%%@') OR (%@ GLOB '%@.*' AND %@ LIKE '%%%@') OR (%@ GLOB '*.%@.*' AND %@ LIKE '%%%@') OR (%@ GLOB '*.%@' AND %@ LIKE '%%%@'))", NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue];
                     [segment appendString:value];
                     break;
                 case NSFGreaterThan:
-                    value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@' AND %@ > '%@') OR (%@ GLOB '%@.*' AND %@ > '%@') OR (%@ GLOB '*.%@.*' AND %@ > '%@') OR (%@ GLOB '*.%@' AND %@ > '%@')", NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue];
+                    value = [[NSMutableString alloc]initWithFormat:@"((%@ = '%@' AND %@ > '%@') OR (%@ GLOB '%@.*' AND %@ > '%@') OR (%@ GLOB '*.%@.*' AND %@ > '%@') OR (%@ GLOB '*.%@' AND %@ > '%@'))", NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue];
                     [segment appendString:value];
                     break;
                 case NSFLessThan:
-                    value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@' AND %@ < '%@') OR (%@ GLOB '%@.*' AND %@ < '%@') OR (%@ GLOB '*.%@.*' AND %@ < '%@') OR (%@ GLOB '*.%@' AND %@ < '%@')", NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue];
+                    value = [[NSMutableString alloc]initWithFormat:@"((%@ = '%@' AND %@ < '%@') OR (%@ GLOB '%@.*' AND %@ < '%@') OR (%@ GLOB '*.%@.*' AND %@ < '%@') OR (%@ GLOB '*.%@' AND %@ < '%@'))", NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue];
+                    [segment appendString:value];
+                    break;
+                case NSFNotEqualTo:
+                    value = [[NSMutableString alloc]initWithFormat:@"((%@ <> '%@' AND %@ <> '%@') OR (%@ GLOB '%@.*' AND %@ <> '%@') OR (%@ GLOB '*.%@.*' AND %@ <> '%@') OR (%@ GLOB '*.%@' AND %@ <> '%@'))", NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue];
                     [segment appendString:value];
+
                     break;
             }
         }
@@ -826,6 +851,56 @@
         [segment appendString:value];
         
         // Free allocated resources
+    } else if (YES == [aValue isKindOfClass:[NSNull class]]) {
+        NSString *NULLStringValue = NSFStringFromNanoDataType (NSFNanoTypeNULL);
+        switch (match) {
+            case NSFEqualTo:
+                value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@' AND %@ = '%@') OR (%@ GLOB '%@.*' AND %@ = '%@') OR (%@ GLOB '*.%@.*' AND %@ = '%@') OR (%@ GLOB '*.%@' AND %@ = '%@')", NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue];
+                [segment appendString:value];
+                break;
+            case NSFNotEqualTo:
+                value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@' AND %@ <> '%@') OR (%@ GLOB '%@.*' AND %@ <> '%@') OR (%@ GLOB '*.%@.*' AND %@ <> '%@') OR (%@ GLOB '*.%@' AND %@ <> '%@')", NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue];
+                [segment appendString:value];
+                break;
+            case NSFBeginsWith:
+                value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@' AND %@ GLOB '%@*') OR (%@ GLOB '%@.*' AND %@ GLOB '%@*') OR (%@ GLOB '*.%@.*' AND %@ GLOB '%@*') OR (%@ GLOB '*.%@' AND %@ GLOB '%@*')", NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue];
+                [segment appendString:value];
+                break;
+            case NSFContains:
+                value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@' AND %@ GLOB '%@') OR (%@ GLOB '%@.*' AND %@ GLOB '%@') OR (%@ GLOB '*.%@.*' AND %@ GLOB '%@') OR (%@ GLOB '*.%@' AND %@ GLOB '%@')", NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue];
+                [segment appendString:value];
+                break;
+            case NSFEndsWith:
+                value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@' AND %@ GLOB '*%@') OR (%@ GLOB '%@.*' AND %@ GLOB '*%@') OR (%@ GLOB '*.%@.*' AND %@ GLOB '*%@') OR (%@ GLOB '*.%@' AND %@ GLOB '*%@')", NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue];
+                [segment appendString:value];
+                break;
+            case NSFInsensitiveEqualTo:
+                aValue = [aValue uppercaseString];
+                value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@' AND upper(%@) = '%@') OR (%@ GLOB '%@.*' AND upper(%@) = '%@') OR (%@ GLOB '*.%@.*' AND upper(%@) = '%@') OR (%@ GLOB '*.%@' AND upper(%@) = '%@')", NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue];
+                [segment appendString:value];
+                break;
+            case NSFInsensitiveBeginsWith:
+                aValue = [aValue uppercaseString];
+                value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@' AND upper(%@) GLOB '%@*') OR (%@ GLOB '%@.*' AND upper(%@) GLOB '%@*') OR (%@ GLOB '*.%@.*' AND upper(%@) GLOB '%@*') OR (%@ GLOB '*.%@' AND upper(%@) GLOB '%@*')", NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue];
+                [segment appendString:value];
+                break;
+            case NSFInsensitiveContains:
+                value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@' AND %@ LIKE '%@') OR (%@ GLOB '%@.*' AND %@ LIKE '%@') OR (%@ GLOB '*.%@.*' AND %@ LIKE '%@') OR (%@ GLOB '*.%@' AND %@ LIKE '%@')", NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue];
+                [segment appendString:value];
+                break;
+            case NSFInsensitiveEndsWith:
+                value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@' AND %@ LIKE '%%%@') OR (%@ GLOB '%@.*' AND %@ LIKE '%%%@') OR (%@ GLOB '*.%@.*' AND %@ LIKE '%%%@') OR (%@ GLOB '*.%@' AND %@ LIKE '%%%@')", NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue];
+                [segment appendString:value];
+                break;
+            case NSFGreaterThan:
+                value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@' AND %@ > '%@') OR (%@ GLOB '%@.*' AND %@ > '%@') OR (%@ GLOB '*.%@.*' AND %@ > '%@') OR (%@ GLOB '*.%@' AND %@ > '%@')", NSFAttribute, NSFDatatype, NULLStringValue, aValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue];
+                [segment appendString:value];
+                break;
+            case NSFLessThan:
+                value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@' AND %@ < '%@') OR (%@ GLOB '%@.*' AND %@ < '%@') OR (%@ GLOB '*.%@.*' AND %@ < '%@') OR (%@ GLOB '*.%@' AND %@ < '%@')", NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue];
+                [segment appendString:value];
+                break;
+        }
     }
     
     return segment;
@@ -872,16 +947,15 @@
 {
     id theResults = results;
     
-    if ([sort count] > 0) {
-        NSMutableArray *cocoaSortDescriptors = [NSMutableArray new];
-        
-        for (NSFNanoSortDescriptor *descriptor in sort) {
-            NSString *targetKeyPath = [[NSString alloc]initWithFormat:@"rootObject.%@", descriptor.attribute];
-            NSSortDescriptor *cocoaSort = [[NSSortDescriptor alloc]initWithKey:targetKeyPath ascending:descriptor.isAscending];
-            [cocoaSortDescriptors addObject:cocoaSort];
-        }
-        
+    if ([_sort count] > 0) {
         if (NSFReturnObjects == theReturnType) {
+            NSMutableArray *cocoaSortDescriptors = [NSMutableArray new];
+            
+            for (NSFNanoSortDescriptor *descriptor in _sort) {
+                NSString *targetKeyPath = [[NSString alloc]initWithFormat:@"rootObject.%@", descriptor.attribute];
+                NSSortDescriptor *cocoaSort = [[NSSortDescriptor alloc]initWithKey:targetKeyPath ascending:descriptor.isAscending];
+                [cocoaSortDescriptors addObject:cocoaSort];
+            }
             theResults = [[results allValues]sortedArrayUsingDescriptors:cocoaSortDescriptors];
         } else {
             theResults = [results allKeys];
@@ -903,27 +977,27 @@
     NSFOrderedDictionary *values = [NSFOrderedDictionary new];
     
     values[@"NanoSearch address"] = [NSString stringWithFormat:@"%p", self];
-    values[@"Document store"] = [nanoStore dictionaryDescription];
-    values[@"Attributes to be returned"] = (attributesToBeReturned ? [attributesToBeReturned componentsJoinedByString:@","] : @"All");
-    values[@"Key"] = (key ? key : @"<nil>");
-    values[@"Attribute"] = (attribute ? attribute : @"<nil>");
-    values[@"Value"] = (value ? value : @"<nil>");
-    values[@"Match"] = NSFStringFromMatchType(match);
+    values[@"Document store"] = [_nanoStore dictionaryDescription];
+    values[@"Attributes to be returned"] = (_attributesToBeReturned ? [_attributesToBeReturned componentsJoinedByString:@","] : @"All");
+    values[@"Key"] = (_key ? _key : @"<nil>");
+    values[@"Attribute"] = (_attribute ? _attribute : @"<nil>");
+    values[@"Value"] = (_value ? _value : @"<nil>");
+    values[@"Match"] = NSFStringFromMatchType(_match);
     
     NSMutableArray *tempExpressions = [NSMutableArray new];
-    for (NSFNanoExpression *expression in expressions) {
+    for (NSFNanoExpression *expression in _expressions) {
         [tempExpressions addObject:[expression description]];
     }
     values[@"Expressions"] = ([tempExpressions count] > 0 ? tempExpressions : @"<nil>");
     
-    values[@"Group values?"] = (groupValues ? @"YES" : @"NO");
+    values[@"Group values?"] = (_groupValues ? @"YES" : @"NO");
     
     NSString *tempSQL = [self sql];
     values[@"SQL"] = (tempSQL ? tempSQL : @"<nil>");
-    values[@"Sort"] = (sort ? sort : @"<nil>");
-    values[@"Filter class"] = (filterClass ? filterClass : @"<nil>");
-    values[@"Offset"] = @(offset);
-    values[@"Limit"] = @(limit);
+    values[@"Sort"] = (_sort ? _sort : @"<nil>");
+    values[@"Filter class"] = (_filterClass ? _filterClass : @"<nil>");
+    values[@"Offset"] = @(_offset);
+    values[@"Limit"] = @(_limit);
     
     return values;
 }