Add query method

Author: changsanjiang

.DS_Store

@@ -1,7 +1,7 @@
 
 Pod::Spec.new do |s|
 s.name         = "SJDBMap"
-s.version      = "1.2.0.3"
+s.version      = "1.2.0.4"
 s.summary      = "Automatically create tables based on the model."
 s.description  = "https://github.com/changsanjiang/SJDBMap/blob/master/README.md"
 s.homepage     = "https://github.com/changsanjiang/SJDBMap"

SJDBMap.podspec

@@ -9,7 +9,7 @@
 #import "SJDatabaseFunctions.h"
 #import <objc/message.h>
 
-#define DEBUG_CONDITION (1)
+#define DEBUG_CONDITION (0)
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -362,9 +362,11 @@ bool sj_value_insert_or_update(sqlite3 *database, id<SJDBMapUseProtocol> model,
             _primaryKeyAdded = YES;
         }
         else {  // 处理 普通键
-            value = sj_value_filter(value); // 过滤一下
-            [sql_strM appendFormat:@"'%@',", field];
-            [sql_valuesM appendFormat:@"'%@',", value]; // 'value'
+            if ( value != nil ) {
+                value = sj_value_filter(value); // 过滤一下
+                [sql_strM appendFormat:@"'%@',", field];
+                [sql_valuesM appendFormat:@"'%@',", value]; // 'value'
+            }
         }
     }];
 

SJDBMap/DatabaseMapping/SJDatabaseFunctions.m

@@ -43,6 +43,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (NSArray<id<SJDBMapUseProtocol>> * __nullable)queryDataWithClass:(Class)cls queryDict:(NSDictionary *)dict;
 - (NSArray<id<SJDBMapUseProtocol>> * __nullable)queryDataWithClass:(Class)cls range:(NSRange)range;
 - (NSInteger)queryQuantityWithClass:(Class)cls;
+- (NSInteger)queryQuantityWithClass:(Class)cls quertyDict:(NSDictionary *)dict;
 
 - (NSArray<id<SJDBMapUseProtocol>> * _Nullable)fuzzyQueryDataWithClass:(Class)cls queryDict:(NSDictionary *)dict match:(SJDatabaseMapFuzzyMatch)match;
 - (NSArray<id<SJDBMapUseProtocol>> * _Nullable)fuzzyQueryDataWithClass:(Class)cls property:(NSString *)fields part1:(NSString *)part1 part2:(NSString *)part2;

SJDBMap/DatabaseMapping/SJDatabaseMap+RealTime.h

@@ -199,6 +199,48 @@ - (NSInteger)queryQuantityWithClass:(Class)cls {
     NSString *sql_str = [NSString stringWithFormat:@"SELECT count(*) FROM %s;", sj_table_name(cls)];
     return [sj_sql_query(self.database, sql_str.UTF8String, nil).firstObject[@"count(*)"] integerValue];
 }
+/*!
+ *  查询
+ *
+ *  dict:
+ *     @{
+ *          @"name": @"A",
+ *          @"tag": @"B"
+ *      }
+ *  or
+ *     @{
+ *          @"id" : @[@(0), @(2), @(3)],
+ *          @"name":@[@"A", @"B", @"C"]
+ *      } ==>>>> ... id in (0, 2, 3) and name in ('A', 'B', 'C')
+ */
+- (NSInteger)queryQuantityWithClass:(Class)cls quertyDict:(NSDictionary *)dict {
+    if ( dict.allKeys.count == 0 ) {
+        return [self queryQuantityWithClass:cls];
+    }
+    if ( !cls ) return 0;
+    NSMutableString *sql_str = [NSMutableString stringWithFormat:@"SELECT count(*) FROM %s WHERE ", sj_table_name(cls)];
+    if ( ![dict.allValues.firstObject isKindOfClass:[NSArray class]] ) {
+        [dict enumerateKeysAndObjectsUsingBlock:^(NSString * _Nonnull key, id  _Nonnull obj, BOOL * _Nonnull stop) {
+            [sql_str appendFormat:@"\"%@\" = '%@' AND ", key, sj_value_filter(obj)];
+        }];
+        [sql_str deleteCharactersInRange:NSMakeRange(sql_str.length - 5, 5)];
+        [sql_str appendString:@";"];
+    }
+    else {
+        [dict enumerateKeysAndObjectsUsingBlock:^(NSString *key, NSArray *values, BOOL * _Nonnull stop) {
+            [sql_str appendFormat:@"%@ IN (", key];
+            [values enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+                obj = sj_value_filter(obj);
+                [sql_str appendFormat:@"'%@',", obj];
+            }];
+            [sql_str deleteCharactersInRange:NSMakeRange(sql_str.length - 1, 1)];
+            [sql_str appendFormat:@") AND "];
+        }];
+        [sql_str deleteCharactersInRange:NSMakeRange(sql_str.length - 5, 5)];
+        [sql_str appendString:@";"];
+    }
+    return [sj_sql_query(self.database, sql_str.UTF8String, nil).firstObject[@"count(*)"] integerValue];
+}
 
 - (NSArray<id<SJDBMapUseProtocol>> * _Nullable)fuzzyQueryDataWithClass:(Class)cls queryDict:(NSDictionary *)dict match:(SJDatabaseMapFuzzyMatch)match {
     if ( !cls ) return nil;

SJDBMap/DatabaseMapping/SJDatabaseMap+RealTime.m

@@ -159,6 +159,21 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (void)queryQuantityWithClass:(Class)cls completeCallBlock:(void (^ __nullable)(NSInteger quantity))block;
 
+/*!
+ *  查记录的数量
+ *
+ *  dict:
+ *     @{
+ *          @"name": @"A",
+ *          @"tag": @"B"
+ *      }
+ *  or
+ *     @{
+ *          @"id" : @[@(0), @(2), @(3)],
+ *          @"name":@[@"A", @"B", @"C"]
+ *      } ==>>>> ... id in (0, 2, 3) and name in ('A', 'B', 'C')
+ */
+- (void)queryQuantityWithClass:(Class)cls queryDict:(NSDictionary *)dict completeCallBlock:(void (^ __nullable)(NSInteger quantity))block;
 
 /*!
  *  模糊查询

SJDBMap/DatabaseMapping/SJDatabaseMap.h

@@ -228,7 +228,14 @@ - (void)queryQuantityWithClass:(Class)cls completeCallBlock:(void (^ __nullable)
         if ( block ) block(quantity);
     }];
 }
-
+- (void)queryQuantityWithClass:(Class)cls queryDict:(NSDictionary *)dict completeCallBlock:(void (^ __nullable)(NSInteger quantity))block {
+    __block NSInteger quantity = 0;
+    [self performTasksWithSubThreadTask:^(SJDatabaseMap * _Nonnull mapper) {
+        quantity = [mapper queryQuantityWithClass:cls quertyDict:dict];
+    } mainTreadTask:^(SJDatabaseMap * _Nonnull mapper) {
+        if ( block ) block(quantity);
+    }];
+}
 - (void)fuzzyQueryDataWithClass:(Class)cls queryDict:(NSDictionary *)dict completeCallBlock:(void (^ __nullable)(NSArray<id<SJDBMapUseProtocol>> * _Nullable data))block {
     [self fuzzyQueryDataWithClass:cls queryDict:dict match:SJDatabaseMapFuzzyMatchBilateral completeCallBlock:block];
 }