添加了一个查询方法和一个更新方法

Author: changsanjiang

.DS_Store

@@ -1,7 +1,7 @@
 
 Pod::Spec.new do |s|
 s.name         = "SJDBMap"
-s.version      = "1.2.0.2"
+s.version      = "1.2.0.3"
 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 (0)
+#define DEBUG_CONDITION (1)
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -52,32 +52,42 @@ void sj_transaction(sqlite3 *database, void(^sync_task)(void)) {
 }
 void sj_transaction_begin(sqlite3 *database) {
     sqlite3_exec(database, "begin", 0, 0, 0);
+#if DEBUG_CONDITION
     printf("\n开启事物!\n");
+#endif
 }
 void sj_transaction_commit(sqlite3 *database) {
     sqlite3_exec(database, "commit", 0, 0, 0);
+#if DEBUG_CONDITION
     printf("\n提交事物!\n");
+#endif
 }
 
 #pragma mark sql
 static NSArray <id> *__nullable static_sj_sql_data(sqlite3_stmt *stmt, Class __nullable cls);
 
 bool sj_sql_exe(sqlite3 *database, const char *sql) {
-    char sql_str[strlen(sql) + 1];
+    char sql_str[(strlen(sql) + 1) * sizeof(char)];
     strcpy(sql_str, sql);
     char *error = NULL;
     bool r = (SQLITE_OK == sqlite3_exec(database, sql_str, NULL, NULL, &error));
     if ( error != NULL ) { printf("\nError ==> \n SQL  : %s\n Error: %s\n", sql_str, error); sqlite3_free(error);}
+#if DEBUG_CONDITION
+    printf("\n Exe: %s\n", sql_str);
+#endif
     return r;
 }
 extern NSArray<id> *__nullable sj_sql_query(sqlite3 *database, const char *sql, Class __nullable cls) {
-    char sql_str[strlen(sql) + 1];
+    char sql_str[(strlen(sql) + 1) * sizeof(char)];
     strcpy(sql_str, sql);
     sqlite3_stmt *pstmt = NULL;
     bool result = (SQLITE_OK == sqlite3_prepare_v2(database, sql_str, -1, &pstmt, NULL));
     NSArray <NSDictionary *> *dataArr = nil;
     if (result) dataArr = static_sj_sql_data(pstmt, cls);
     sqlite3_finalize(pstmt);
+#if DEBUG_CONDITION
+    printf("\n Query: %s \n", sql_str);
+#endif
     return dataArr;
 }
 
@@ -138,7 +148,6 @@ bool sj_table_create(sqlite3 *database, SJDatabaseMapTableCarrier * carrier) {
         printf("\n创建失败: %s \nSQL: %s\n", table_name, sql_strM.UTF8String);
     }
 #endif
-    
     return result;
 }
 bool sj_table_update(sqlite3 *database, SJDatabaseMapTableCarrier * carrier) {
@@ -330,14 +339,7 @@ bool sj_value_insert_or_update(sqlite3 *database, id<SJDBMapUseProtocol> model,
                     result = r;
                     return;
                 }
-                
-                if ( !carrier_arr.isUsingPrimaryKey ) {
-                    long long autoId = [[obj valueForKey:carrier_arr.autoincrementPrimaryKey] integerValue];
-                    if ( autoId == 0 ) { // 如果是自增主键, 防止重新插入, 在这里将其自增主键赋值
-                        autoId = sj_value_last_id(database, _arr_e_cls, carrier_arr);
-                        [obj setValue:@(autoId) forKey:carrier_arr.autoincrementPrimaryKey];
-                    }
-                }
+
                 [corkey_primary_key_idsM addObject:[obj valueForKey:carrier_arr.primaryKeyOrAutoincrementPrimaryKey]];
             }];
 
@@ -375,8 +377,15 @@ bool sj_value_insert_or_update(sqlite3 *database, id<SJDBMapUseProtocol> model,
     [sql_strM appendFormat:@") %@);", sql_valuesM];
 
     sj_sql_exe(database, sql_strM.UTF8String);
-    
-    printf("\n --- %s \n ", sql_strM.UTF8String);
+
+    // 如果是自增主键, 防止重新插入, 在这里将其自增主键赋值
+    if ( !carrier.isUsingPrimaryKey ) {
+        long long autoId = [[(id)model valueForKey:carrier.autoincrementPrimaryKey] integerValue];
+        if ( autoId == 0 ) {
+            autoId = sj_value_last_id(database, [model class], carrier);
+            [(id)model setValue:@(autoId) forKey:carrier.autoincrementPrimaryKey];
+        }
+    }
     return result;
 }
 long long sj_value_last_id(sqlite3 *database, Class<SJDBMapUseProtocol> cls, SJDatabaseMapTableCarrier *__nullable carrier) {

SJDBMap/DatabaseMapping/SJDatabaseFunctions.m

@@ -26,6 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (BOOL)insertOrUpdateDataWithModels:(NSArray<id<SJDBMapUseProtocol>> *)models;
 /// 提供需要更新的字段, 提高执行效率
 - (BOOL)update:(id<SJDBMapUseProtocol>)model properties:(NSArray<NSString *> *)properties;
+- (BOOL)updates:(NSArray<id<SJDBMapUseProtocol>> *)models properties:(NSArray<NSString *> *)properties;
 
 #pragma mark delete
 /// 根据主键删除
@@ -36,6 +37,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (BOOL)deleteDataWithClass:(Class)cls;
 
 #pragma mark query
+- (nullable NSArray<id<SJDBMapUseProtocol>> *)queryWithSqlStr:(NSString *)sql class:(Class<SJDBMapUseProtocol>)cls;
 - (nullable NSArray<id<SJDBMapUseProtocol>> *)queryAllDataWithClass:(Class<SJDBMapUseProtocol>)cls;
 - (nullable id<SJDBMapUseProtocol>)queryDataWithClass:(Class)cls primaryValue:(NSInteger)primaryValue;
 - (NSArray<id<SJDBMapUseProtocol>> * __nullable)queryDataWithClass:(Class)cls queryDict:(NSDictionary *)dict;

SJDBMap/DatabaseMapping/SJDatabaseMap+RealTime.h

@@ -82,16 +82,26 @@ - (BOOL)insertOrUpdateDataWithModels:(NSArray<id<SJDBMapUseProtocol>> *)models {
 
 - (BOOL)update:(id<SJDBMapUseProtocol>)model properties:(NSArray<NSString *> *)properties {
     if ( !model ) return NO;
+    return [self updates:@[model] properties:properties];
+}
+
+- (BOOL)updates:(NSArray<id<SJDBMapUseProtocol>> *)models properties:(NSArray<NSString *> *)properties {
+    if ( models.count == 0 ) return NO;
+    if ( properties.count == 0 ) return NO;
     NSMutableArray<SJDatabaseMapTableCarrier *> *container = [NSMutableArray array];
-    SJDatabaseMapTableCarrier *carrier = [[SJDatabaseMapTableCarrier alloc] initWithClass:[model class]];
+    SJDatabaseMapTableCarrier *carrier = [[SJDatabaseMapTableCarrier alloc] initWithClass:[[models firstObject] class]];
     [carrier parseCorrespondingKeysAddToContainer:container];
-    __block BOOL result = NO;
+    SJDatabaseMapCache *cache = [SJDatabaseMapCache new];
+    __block BOOL result = YES;
     sj_transaction(self.database, ^{
-        result = sj_value_update(self.database, model, properties, container, [SJDatabaseMapCache new]);
+        [models enumerateObjectsUsingBlock:^(id<SJDBMapUseProtocol>  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+            if ( sj_value_update(self.database, obj, properties, container, cache) ) return ;
+            result = NO;
+            *stop = YES;
+        }];
     });
     return result;
 }
-
 #pragma mark -
 
 - (BOOL)deleteDataWithClass:(Class)cls primaryValues:(NSArray<NSNumber *> *)primaryValues {
@@ -130,6 +140,10 @@ - (BOOL)deleteDataWithClass:(Class)cls {
 }
 
 #pragma mark -
+- (nullable NSArray<id<SJDBMapUseProtocol>> *)queryWithSqlStr:(NSString *)sql class:(Class<SJDBMapUseProtocol>)cls {
+    return sj_value_query(self.database, sql.UTF8String, cls, nil, nil);
+}
+
 - (nullable NSArray<id<SJDBMapUseProtocol>> *)queryAllDataWithClass:(Class<SJDBMapUseProtocol>)cls {
     if ( !cls ) return nil;
     NSString *sql_str = [NSString stringWithFormat:@"SELECT *FROM %s;", sj_table_name(cls)];

SJDBMap/DatabaseMapping/SJDatabaseMap+RealTime.m

@@ -67,7 +67,13 @@ NS_ASSUME_NONNULL_BEGIN
  *
  *  property:@[@"name", @"age"] // 需要更新的属性
  */
-- (void)update:(id<SJDBMapUseProtocol>)model properties:(NSArray<NSString *> *)properties callBlock:(void (^ __nullable)(BOOL result))block;
+- (void)update:(id<SJDBMapUseProtocol>)model
+    properties:(NSArray<NSString *> *)properties
+     callBlock:(void (^ __nullable)(BOOL result))block;
+
+- (void)updates:(NSArray<id<SJDBMapUseProtocol>> *)models
+     properties:(NSArray<NSString *> *)properties
+      callBlock:(void (^ __nullable)(BOOL result))block;
 @end
 
 
@@ -114,6 +120,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface SJDatabaseMap (Query)
 
+- (void)queryWithSqlStr:(NSString *)sql class:(Class<SJDBMapUseProtocol>)cls completeCallBlock:(void(^)(NSArray<id<SJDBMapUseProtocol>> *__nullable data))block;
+
 /*!
  *  查所有记录
  *  返回和这个类有关的所有数据

SJDBMap/DatabaseMapping/SJDatabaseMap.h

@@ -122,6 +122,14 @@ - (void)update:(id<SJDBMapUseProtocol>)model properties:(NSArray<NSString *> *)p
     }];
 }
 
+- (void)updates:(NSArray<id<SJDBMapUseProtocol>> *)models properties:(NSArray<NSString *> *)properties callBlock:(void (^ __nullable)(BOOL result))block {
+    __block BOOL result = NO;
+    [self performTasksWithSubThreadTask:^(SJDatabaseMap * _Nonnull mapper) {
+        result = [mapper updates:models properties:properties];
+    } mainTreadTask:^(SJDatabaseMap * _Nonnull mapper) {
+        if ( block ) block(result);
+    }];
+}
 @end
 
 // MARK: Delete
@@ -167,6 +175,15 @@ - (void)deleteDataWithClass:(Class)cls callBlock:(void (^ __nullable)(BOOL r))bl
 
 @implementation SJDatabaseMap (Query)
 
+- (void)queryWithSqlStr:(NSString *)sql class:(Class<SJDBMapUseProtocol>)cls completeCallBlock:(void(^)(NSArray<id<SJDBMapUseProtocol>> *__nullable data))block {
+    __block NSArray<id<SJDBMapUseProtocol>> *models = nil;
+    [self performTasksWithSubThreadTask:^(SJDatabaseMap * _Nonnull mapper) {
+        models = [mapper queryWithSqlStr:sql class:cls];
+    } mainTreadTask:^(SJDatabaseMap * _Nonnull mapper) {
+        if ( block ) block(models);
+    }];
+}
+
 - (void)queryAllDataWithClass:(Class<SJDBMapUseProtocol>)cls  completeCallBlock:(void(^ __nullable)(NSArray<id<SJDBMapUseProtocol>> * _Nullable data))block {
     __block NSArray<id<SJDBMapUseProtocol>> *models = nil;
     [self performTasksWithSubThreadTask:^(SJDatabaseMap * _Nonnull mapper) {