Update [ 完善错误提示 ]

Author: changsanjiang

SJDBMap/Category/SJDatabaseMap+Server.h

@@ -27,7 +27,7 @@ extern char *_sjmystrcat(char *dst, const char *src);
 /*!
  *  自动创建相关的表
  */
-- (void)sjAutoCreateOrAlterRelevanceTabWithClass:(Class)cls;
+- (BOOL)sjAutoCreateOrAlterRelevanceTabWithClass:(Class)cls;
 
 /*!
  *  查询表中的所有字段

SJDBMap/Category/SJDatabaseMap+Server.m

@@ -29,8 +29,13 @@ @implementation SJDatabaseMap (Server)
  *  执行SQL语句
  */
 - (void)sjExeSQL:(const char *)sql completeBlock:(void(^)(BOOL r))block {
-    BOOL r = (SQLITE_OK == sqlite3_exec(self.sqDB, sql, NULL, NULL, NULL));
+    char *error = NULL;
+    BOOL r = (SQLITE_OK == sqlite3_exec(self.sqDB, sql, NULL, NULL, &error));
     if ( block ) block(r);
+    if ( error != NULL ) {
+        NSLog(@"SJDatabaseMap Error ==> \n SQL  : %s\n Error: %s", sql, error);
+        sqlite3_free(error);
+    }
 }
 
 /*!
@@ -42,7 +47,7 @@ - (BOOL)sjCreateOrAlterTabWithClass:(Class)cls {
      *  如果表不存在创建表
      */
     NSMutableSet<NSString *> *fieldsSet = [self _sjQueryTabAllFields_Set_WithClass:cls];
-    if ( !fieldsSet ) {[self _sjCreateTab:cls]; return YES;}
+    if ( !fieldsSet ) {return [self _sjCreateTab:cls];}
 
     /*!
      *  如果表存在, 查看是否有更新字段
@@ -104,10 +109,15 @@ - (BOOL)sjCreateOrAlterTabWithClass:(Class)cls {
 /*!
  *  自动创建相关的表
  */
-- (void)sjAutoCreateOrAlterRelevanceTabWithClass:(Class)cls {
+- (BOOL)sjAutoCreateOrAlterRelevanceTabWithClass:(Class)cls {
+    __block BOOL result = YES;
     [[self sjGetRelevanceClasses:cls] enumerateObjectsUsingBlock:^(Class  _Nonnull relevanceCls, BOOL * _Nonnull stop) {
-        [self sjCreateOrAlterTabWithClass:relevanceCls];
+        result = [self sjCreateOrAlterTabWithClass:relevanceCls];
+        if ( result ) return;
+        result = NO;
+        *stop = YES;
     }];
+    return result;
 }
 
 /*!
@@ -770,26 +780,36 @@ - (BOOL)_sjCreateTab:(Class)cls {
 #endif
 
     __weak typeof(self) _self = self;
+    __block BOOL createResult = YES;
     [self sjExeSQL:sql completeBlock:^(BOOL result) {
-        if ( !result ) NSLog(@"[%@] 创建表失败", cls);
+        createResult = result;
+        if ( !result ) {
+            NSLog(@"[%@] 创建表失败", cls);
+            return;
+        }
         if ( !model.autoincrementPrimaryKey ) return;
-        
+
         __strong typeof(_self) self = _self;
         if ( !self ) return;
         /*!
          *  如果是自增键。由于 0 在OC 中为空。 遇到自增主键值为0时，不好判断出是插入还是更新。为了避免这种情况，让ID从1开始。
          */
-        [self sjExeSQL:[NSString stringWithFormat:@"dbcc checkident('%s', reseed, 0)", tabName].UTF8String completeBlock:nil];
+        [self sjExeSQL:[NSString stringWithFormat:@"dbcc checkident('%s', reseed, 0)", tabName].UTF8String completeBlock:^(BOOL r) {
+            createResult = result;
+            if ( !result ) {
+                NSLog(@"[%@] 自增键设置失败", cls);
+                return;
+            }
+        }];
     }];
 
-    
     free(sql);
     free(ivarList);
 
     sql = NULL;
     ivarList = NULL;
 
-    return YES;
+    return createResult;
 }
 
 /*!

SJDBMap/SJDatabaseMap.m

@@ -140,18 +140,26 @@ - (void)insertOrUpdateDataWithModels:(NSArray<id<SJDBMapUseProtocol>> *)models c
          *  归类整理
          */
         NSDictionary<NSString *, NSArray<id> *> *modelsDict = [self sjPutInOrderModels:models];
+        __block BOOL result = YES;
 
         /*!
          *  自动创建表
          */
         [modelsDict.allKeys enumerateObjectsUsingBlock:^(NSString * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
-            [self sjAutoCreateOrAlterRelevanceTabWithClass:NSClassFromString(obj)];
+            result = [self sjAutoCreateOrAlterRelevanceTabWithClass:NSClassFromString(obj)];
+            if ( result ) return;
+            result = NO;
+            *stop = YES;
         }];
 
+        if ( !result ) {
+            if ( block ) block(result);
+            return ;
+        }
+        
         /*!
          *  批量插入或更新
          */
-        __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;

SJDBMapProject/ViewController.m

@@ -66,8 +66,7 @@ - (void)viewDidLoad {
     NSLog(@"\n%@", NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES).lastObject);
 
 
-#warning - Please perform " pod update --no-repo-update " to update the project
-    
+#warning - if it can't run. please perform " pod update --no-repo-update " to update the project. The update may be a bit slow.
 
     // sample 1
     [self insertOrUpdate];
@@ -115,7 +114,7 @@ - (void)insertOrUpdate {
                      [PersonTag tagWithID:4 des:@"E"],];
 
     NSMutableArray <Person *> *arrM = [NSMutableArray new];
-    for ( int i = 0 ; i < 4000 ; i ++ ) {
+    for ( int i = 0 ; i < 3 ; i ++ ) {
         Person *sj = [Person new];
         sj.personID = i;
         sj.name = @"sj";
@@ -126,8 +125,9 @@ - (void)insertOrUpdate {
 
         sj.goods = goods;
         [arrM addObject:sj];
-    }
 
+    }
+
 
     // insert or update  sample
     [[SJDatabaseMap sharedServer] insertOrUpdateDataWithModels:arrM callBlock:^(BOOL r) {