Added support (including test cases) for NSBetweenPredicateOperatorType using the SQL BETWEEN expression

Author: rhodgkins

Incremental Store/EncryptedStore.m

@@ -2191,7 +2191,6 @@ - (NSDictionary *)recursiveWhereClauseWithFetchRequest:(NSFetchRequest *)request
 
     //    enum {
     //        NSCustomSelectorPredicateOperatorType,
-    //        NSBetweenPredicateOperatorType
     //    };
     //    typedef NSUInteger NSPredicateOperatorType;
 
@@ -2210,7 +2209,8 @@ - (NSDictionary *)recursiveWhereClauseWithFetchRequest:(NSFetchRequest *)request
                       @(NSLessThanPredicateOperatorType)             : @{ @"operator" : @"<",      @"format" : @"%@" },
                       @(NSLessThanOrEqualToPredicateOperatorType)    : @{ @"operator" : @"<=",     @"format" : @"%@" },
                       @(NSGreaterThanPredicateOperatorType)          : @{ @"operator" : @">",      @"format" : @"%@" },
-                      @(NSGreaterThanOrEqualToPredicateOperatorType) : @{ @"operator" : @">=",     @"format" : @"%@" }
+                      @(NSGreaterThanOrEqualToPredicateOperatorType) : @{ @"operator" : @">=",     @"format" : @"%@" },
+                      @(NSBetweenPredicateOperatorType)              : @{ @"operator" : @"BETWEEN",     @"format" : @"%@ AND %@" }
                       };
     });
 
@@ -2583,12 +2583,17 @@ - (void)parseExpression:(NSExpression *)expression
             *operand = @"?";
         }
         else if ([value isKindOfClass:[NSArray class]]) {
-            NSUInteger count = [value count];
-            NSArray *parameters = [NSArray cmdArrayWithObject:@"?" times:count];
-            *bindings = value;
-            *operand = [NSString stringWithFormat:
-                        [operator objectForKey:@"format"],
-                        [parameters componentsJoinedByString:@", "]];
+            if (predicate.predicateOperatorType == NSBetweenPredicateOperatorType) {
+                *bindings = value;
+                *operand = [NSString stringWithFormat:[operator objectForKey:@"format"], @"?", @"?"];
+            } else {
+                NSUInteger count = [value count];
+                NSArray *parameters = [NSArray cmdArrayWithObject:@"?" times:count];
+                *bindings = value;
+                *operand = [NSString stringWithFormat:
+                            [operator objectForKey:@"format"],
+                            [parameters componentsJoinedByString:@", "]];
+            }
         }
         else if ([value isKindOfClass:[NSString class]]) {
             if ([predicate options] & NSCaseInsensitivePredicateOption) {

exampleProjects/IncrementalStore/Model.xcdatamodeld/Model.xcdatamodel/contents

@@ -6,6 +6,7 @@
     <entity name="Post" syncable="YES">
         <attribute name="body" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="tags" optional="YES" attributeType="Transformable" syncable="YES"/>
+        <attribute name="timestamp" optional="YES" attributeType="Date" syncable="YES"/>
         <attribute name="title" optional="YES" attributeType="String" syncable="YES"/>
         <relationship name="comments" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="Comment" inverseName="parent" inverseEntity="Comment" syncable="YES"/>
         <relationship name="user" optional="YES" minCount="1" maxCount="1" deletionRule="Cascade" destinationEntity="User" inverseName="posts" inverseEntity="User" syncable="YES"/>
@@ -24,7 +25,7 @@
     </entity>
     <elements>
         <element name="Comment" positionX="97" positionY="-13" width="128" height="58"/>
-        <element name="Post" positionX="-144" positionY="-45" width="128" height="118"/>
+        <element name="Post" positionX="-144" positionY="-45" width="128" height="133"/>
         <element name="RootTag" positionX="-99" positionY="117" width="128" height="43"/>
         <element name="Tag" positionX="-99" positionY="197" width="128" height="73"/>
         <element name="User" positionX="-360" positionY="54" width="128" height="118"/>

exampleProjects/IncrementalStore/Tests/IncrementalStoreTests.m

@@ -140,6 +140,8 @@ - (void)createPosts:(NSUInteger)count forUser:(NSManagedObject *)user {
         [object setValue:@"adventures" forKey:@"title"];
         [object setValue:@"fundamental" forKey:@"body"];
         [object setValue:user forKey:@"user"];
+        NSDate *date = [NSDate dateWithTimeIntervalSinceNow:3600 * i];
+        [object setValue:date forKey:@"timestamp"];
     }
     error = nil;
     BOOL save = [context save:&error];
@@ -757,4 +759,34 @@ -(void)test_predicateEqualityComparison {
 
 }
 
+-(void)test_predicateEqualityComparisonUsingDates
+{
+    const NSUInteger count = 30;
+
+    __block NSError *error = nil;
+    NSManagedObject *user = [NSEntityDescription insertNewObjectForEntityForName:@"User" inManagedObjectContext:context];
+    [context save:&error];
+    XCTAssertNil(error, @"Error saving database.");
+
+    NSDate *now = [NSDate date];
+    
+    [self createPosts:count forUser:user];
+    
+    [@{ [NSPredicate predicateWithFormat:@"timestamp < %@", now] : @(0),
+        [NSPredicate predicateWithFormat:@"timestamp > %@", now] : @(count),
+        [NSPredicate predicateWithFormat:@"timestamp BETWEEN %@", @[[now dateByAddingTimeInterval:100], [now dateByAddingTimeInterval:4000]]] : @(1),
+        [NSPredicate predicateWithFormat:@"timestamp BETWEEN %@", @[now, [now dateByAddingTimeInterval:30 * 3601]]] : @(count),
+        [NSPredicate predicateWithFormat:@"timestamp BETWEEN %@", @[[now dateByAddingTimeInterval:100], [now dateByAddingTimeInterval:10 * 3602]]] : @(10)
+       } enumerateKeysAndObjectsUsingBlock:^(NSPredicate *predicate, NSNumber *expectedCount, BOOL *stop) {
+        
+           NSFetchRequest *req = [[NSFetchRequest alloc] initWithEntityName:@"Post"];
+           req.predicate = predicate;
+           
+           NSUInteger count = [context countForFetchRequest:req error:&error];
+        
+           XCTAssertFalse(count == NSNotFound, @"Error with fetch: %@", error);
+           XCTAssertEqual(count, [expectedCount unsignedIntegerValue], @"Incorrect fetch count");
+    }];
+}
+
 @end