Update

Author: changsanjiang

SJDBMap/Category/SJDatabaseMap+Server.m

@@ -400,14 +400,17 @@ - (BOOL)sjInsertOrUpdateDataWithModels:(NSArray<id<SJDBMapUseProtocol>> *)models
     // 优先 插入自增主键类
     [hasAutoPrimaryKeyModelsSetM enumerateObjectsUsingBlock:^(id<SJDBMapUseProtocol>  _Nonnull model, BOOL * _Nonnull stop) {
         if ( [model class] != uM.ownerCls ) uM = [self sjGetUnderstandingWithClass:[model class]];
-        [self sjInsertOrUpdateDataWithModel:model uM:uM];
+        result = [self sjInsertOrUpdateDataWithModel:model uM:uM];
+        if ( !result ) *stop = YES;
     }];
 
-    // 插入 主键类
-    [hasPrimaryKeyModelsSetM enumerateObjectsUsingBlock:^(id<SJDBMapUseProtocol>  _Nonnull model, BOOL * _Nonnull stop) {
-        if ( [model class] != uM.ownerCls ) uM = [self sjGetUnderstandingWithClass:[model class]];
-        [self sjInsertOrUpdateDataWithModel:model uM:uM];
-    }];
+    if ( result ) {
+        // 插入 主键类
+        [hasPrimaryKeyModelsSetM enumerateObjectsUsingBlock:^(id<SJDBMapUseProtocol>  _Nonnull model, BOOL * _Nonnull stop) {
+            if ( [model class] != uM.ownerCls ) uM = [self sjGetUnderstandingWithClass:[model class]];
+            [self sjInsertOrUpdateDataWithModel:model uM:uM];
+        }];
+    }
 
     if ( enableTransaction ) [self _sjCommitTransaction];
     return result;
@@ -658,9 +661,10 @@ - (BOOL)_sjCreateTab:(Class)cls {
         _sjmystrcat(fieldSql, " ");
         _sjmystrcat(fieldSql, fieldType);
 
-        if ( NULL != strstr(sql, fieldSql) ) continue;
+        if ( NULL != strstr(sql, fieldSql) ) {free(fieldSql); continue;}
 
         _sjmystrcat(sql, fieldSql);
+        free(fieldSql);
 
         // 如果是自增主键
         if      ( NULL != model.autoincrementPrimaryKey &&
@@ -920,7 +924,7 @@ - (BOOL)_sjAlterFields:(Class)cls fields:(NSArray<NSString *> *)fields {
 /*!
  *  获取类中相关的私有变量
  */
-static NSMutableSet<NSString *> *_sjGetIvarNames(Class cls) {
+inline static NSMutableSet<NSString *> *_sjGetIvarNames(Class cls) {
     NSMutableSet<NSString *> *ivarListSetM = [NSMutableSet new];
     unsigned int outCount = 0;
     Ivar *ivarList = class_copyIvarList(cls, &outCount);
@@ -934,7 +938,6 @@ - (BOOL)_sjAlterFields:(Class)cls fields:(NSArray<NSString *> *)fields {
     return ivarListSetM;
 }
 
-
 @end
 
 /*!

SJDBMap/SJDatabaseMap.m

@@ -156,6 +156,7 @@ - (void)insertOrUpdateDataWithModels:(NSArray<id<SJDBMapUseProtocol>> *)models c
         __block BOOL result = YES;
         [modelsDict enumerateKeysAndObjectsUsingBlock:^(NSString * _Nonnull tabName, NSArray<id> * _Nonnull modelsArr, BOOL * _Nonnull stop) {
             result = [self sjInsertOrUpdateDataWithModels:modelsArr enableTransaction:YES];
+            if ( !result ) *stop = YES;
         }];
         dispatch_async(dispatch_get_main_queue(), ^{
             if ( block ) block(result);

SJDBMapProject/ViewController.m

@@ -198,7 +198,7 @@ - (void)query {
 - (void)queryWithDict:(NSDictionary *)dict {
     [[SJDatabaseMap sharedServer] queryDataWithClass:[Person class] queryDict:dict completeCallBlock:^(NSArray<id<SJDBMapUseProtocol>> * _Nullable data) {
 
-        // query result 
+        // query result
         [data enumerateObjectsUsingBlock:^(id<SJDBMapUseProtocol>  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
             NSLog(@"%@", obj);
         }];