Update

Author: changsanjiang

SJDBMap/Category/SJDatabaseMap+Server.m

@@ -216,7 +216,7 @@ - (void)sjAutoCreateOrAlterRelevanceTabWithClass:(Class)cls {
         [incompleteData addObject:obj.mutableCopy];
     }];
 
-    return [self _sjConversionMolding:cls rawStorageData:incompleteData];
+    return [self _sjConversionMolding:cls rawStorageData:incompleteData memeryCache:[SJDBMapQueryCache new]];
 }
 
 /*!
@@ -235,7 +235,7 @@ - (void)sjAutoCreateOrAlterRelevanceTabWithClass:(Class)cls {
     [[self sjQueryWithSQLStr:fieldsSqlM] enumerateObjectsUsingBlock:^(NSDictionary * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
         [incompleteData addObject:obj.mutableCopy];
     }];
-    return [self _sjConversionMolding:cls rawStorageData:incompleteData];
+    return [self _sjConversionMolding:cls rawStorageData:incompleteData memeryCache:[SJDBMapQueryCache new]];
 }
 
 /*!
@@ -294,17 +294,17 @@ - (void)sjAutoCreateOrAlterRelevanceTabWithClass:(Class)cls {
         [incompleteData addObject:obj.mutableCopy];
     }];
 
-    return [self _sjConversionMolding:cls rawStorageData:incompleteData];
+    return [self _sjConversionMolding:cls rawStorageData:incompleteData memeryCache:[SJDBMapQueryCache new]];
 }
 
 
-- (NSArray<id> *)_sjConversionMolding:(Class)cls rawStorageData:(NSArray<NSDictionary *> *)rawStorageData {
+- (NSArray<id> *)_sjConversionMolding:(Class)cls rawStorageData:(NSArray<NSDictionary *> *)rawStorageData memeryCache:(SJDBMapQueryCache *)cache {
     NSMutableArray<id> *allDataModel = [NSMutableArray new];
     NSArray<SJDBMapCorrespondingKeyModel *>*cKr = [self sjGetCorrespondingKeys:cls];
     NSArray<SJDBMapArrayCorrespondingKeysModel *> *aKr = [self sjGetArrayCorrespondingKeys:cls];
     [rawStorageData enumerateObjectsUsingBlock:^(NSDictionary * _Nonnull dict, NSUInteger idx, BOOL * _Nonnull stop) {
         id model = [cls new];
-        [self _sjConversionModelWithOwnerModel:model dict:dict cKr:cKr aKr:aKr memeryCache:[SJDBMapQueryCache new]];
+        [self _sjConversionModelWithOwnerModel:model dict:dict cKr:cKr aKr:aKr memeryCache:cache];
         [allDataModel addObject:model];
     }];
     if ( 0 == allDataModel.count ) return nil;

SJDBMapProject/ViewController.m

@@ -138,6 +138,9 @@ - (void)update {
 
     [[SJDatabaseMap sharedServer] queryDataWithClass:[Person class] primaryValue:2 completeCallBlock:^(id<SJDBMapUseProtocol>  _Nullable model) {
         if ( nil == model ) return ;
+        
+        NSLog(@"query single person");
+        
         Person *person = model;
 
         NSMutableArray *tagsM = [NSMutableArray new];
@@ -157,12 +160,13 @@ - (void)update {
         // mixed
         [tagsM addObject:person.tags.firstObject];
         [[SJDatabaseMap sharedServer] update:person insertedOrUpdatedValues:@{@"tags":tagsM, @"goods":person.goods.firstObject} callBlock:^(BOOL r) {
-            
+            NSLog(@"update end");
 
             // query sample
             [self queryWithDict:@{@"personID":@"33"}];
 
         }];
+        
     }];
 
 }
@@ -201,16 +205,31 @@ - (void)query {
             NSLog(@"%@", obj);
         }];
     }];
+    
+    
 }
 
 - (void)queryWithDict:(NSDictionary *)dict {
-    [[SJDatabaseMap sharedServer] queryDataWithClass:[Person class] queryDict:dict completeCallBlock:^(NSArray<id<SJDBMapUseProtocol>> * _Nullable data) {
+    [[SJDatabaseMap sharedServer] queryDataWithClass:[Person class] queryDict:@{@"name":@"sj", @"age":@(20)} completeCallBlock:^(NSArray<id<SJDBMapUseProtocol>> * _Nullable data) {
 
         NSLog(@"%zd", data.count);
 
         // range query
         [[SJDatabaseMap sharedServer] queryDataWithClass:[Person class] range:NSMakeRange(2, 10) completeCallBlock:^(NSArray<id<SJDBMapUseProtocol>> * _Nullable data) {
             NSLog(@"%zd", data.count);
+            
+            
+            // fuzzy query
+            [[SJDatabaseMap sharedServer] fuzzyQueryDataWithClass:[Person class] queryDict:@{@"name":@"s"} completeCallBlock:^(NSArray<id<SJDBMapUseProtocol>> * _Nullable data) {
+                NSLog(@"%zd", data.count);
+                
+                // 匹配以 's' 开头的name.
+                [[SJDatabaseMap sharedServer] fuzzyQueryDataWithClass:[Person class] queryDict:@{@"name":@"s"} match:SJDatabaseMapFuzzyMatchFront completeCallBlock:^(NSArray<id<SJDBMapUseProtocol>> * _Nullable data) {
+                    NSLog(@"%zd", data.count);
+                }];
+                
+            }];
+    
         }];
 
     }];