Skip to content

Commit 1a17a74

Browse files
changsanjiangchangsanjiang
committed
Update [ Clear Updated Warning  ]
1 parent d84de73 commit 1a17a74

File tree

8 files changed

+93
-36
lines changed

8 files changed

+93
-36
lines changed

‎Pods/Pods.xcodeproj/project.pbxproj

Lines changed: 32 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Pods/SJVideoPlayer/SJVideoPlayer/Category/NSTimer+SJExtension.h

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎SJDBMap.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Pod::Spec.new do |s|
33
s.name = "SJDBMap"
4-
s.version = "1.1.1"
4+
s.version = "1.1.2"
55
s.summary = "Automatically create tables based on the model."
66
s.description = "https://github.com/changsanjiang/SJDBMap/blob/master/README.md"
77
s.homepage = "https://github.com/changsanjiang/SJDBMap"

‎SJDBMap/Category/SJDatabaseMap+Server.m

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,18 @@ - (BOOL)sjCreateOrAlterTabWithClass:(Class)cls {
9191

9292
if ( containerBol ) return;
9393

94-
if ( NULL == fields) fields = objF.UTF8String, dbType = _sjGetDatabaseIvarType(cls, [NSString stringWithFormat:@"_%@", objF].UTF8String);
94+
if ( NULL == fields) {
95+
fields = objF.UTF8String;
96+
dbType = _sjGetDatabaseIvarType(cls, [NSString stringWithFormat:@"_%@", objF].UTF8String);
97+
}
9598

9699
NSString *sql = [NSString stringWithFormat:@"ALTER TABLE '%s' ADD '%s' %s;", tabName, fields, dbType];
97100

98101
[self sjExeSQL:sql.UTF8String completeBlock:^(BOOL result) {
99-
if ( !result ) NSLog(@"[%@] 添加字段[%@]失败", cls, objF), exeSQLResultBol = NO;
102+
if ( !result ) {
103+
NSLog(@"[%@] 添加字段[%@]失败", cls, objF);
104+
exeSQLResultBol = NO;
105+
}
100106
}];
101107

102108
#ifdef _SJLog
@@ -508,7 +514,10 @@ - (BOOL)sjInsertOrUpdateDataWithModel:(id<SJDBMapUseProtocol>)obj uM:(SJDBMapUnd
508514
NSString *sql = [NSString stringWithFormat:@"%@ %@;", prefixSQL, subffixSQL];
509515

510516
[self sjExeSQL:sql.UTF8String completeBlock:^(BOOL r) {
511-
if ( !r ) result = NO, NSLog(@"[%@] 插入或更新失败", obj);
517+
if ( !r ) {
518+
result = NO;
519+
NSLog(@"[%@] 插入或更新失败", obj);
520+
}
512521
SJDBMapAutoincrementPrimaryKeyModel *aPKM = [self sjGetAutoincrementPrimaryKey:[obj class]];
513522
if ( !aPKM ) return;
514523
id aPKV = [(id)obj valueForKey:aPKM.ownerFields];
@@ -566,7 +575,10 @@ - (BOOL)_sjUpdate:(id<SJDBMapUseProtocol>)model commonFields:(NSArray<NSString *
566575
NSString *sql = [self sjGetCommonUpdateSQLWithFields:fiedls model:model];
567576
__block BOOL result = YES;
568577
[self sjExeSQL:sql.UTF8String completeBlock:^(BOOL r) {
569-
if ( !r ) result = NO, NSLog(@"[%@]- %@ 插入或更新失败", model, sql);
578+
if ( !r ) {
579+
result = NO;
580+
NSLog(@"[%@]- %@ 插入或更新失败", model, sql);
581+
}
570582
}];
571583
return result;
572584
}
@@ -821,7 +833,10 @@ - (BOOL)_sjAlterFields:(Class)cls fields:(NSArray<NSString *> *)fields {
821833
[fields enumerateObjectsUsingBlock:^(NSString * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
822834
NSString *sql = [NSString stringWithFormat:@"ALTER TABLE '%s' ADD '%@' %s;", [self sjGetTabName:cls], obj, _sjGetDatabaseIvarType(cls, [NSString stringWithFormat:@"_%@", obj].UTF8String)];
823835
[self sjExeSQL:sql.UTF8String completeBlock:^(BOOL r) {
824-
if ( !r ) NSLog(@"[%@] 添加字段[%@]失败", cls, obj), result = NO;
836+
if ( !r ) {
837+
NSLog(@"[%@] 添加字段[%@]失败", cls, obj);
838+
result = NO;
839+
}
825840
}];
826841

827842
#ifdef _SJLog

‎SJDBMap/SJDatabaseMap.m

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ - (dispatch_queue_t)operationQueue {
8181
return _operationQueue;
8282
}
8383

84-
- (void)addOperationWithBlock:(void(^)())block {
84+
- (void)addOperationWithBlock:(void(^)(void))block {
8585
dispatch_async(self.operationQueue, ^{
8686
if ( block ) block();
8787
});
@@ -104,7 +104,10 @@ - (void)createTabWithClass:(Class)cls callBlock:(void(^)(BOOL result))block {
104104
__block BOOL result = YES;
105105
[[self sjGetRelevanceClasses:cls] enumerateObjectsUsingBlock:^(Class _Nonnull relevanceCls, BOOL * _Nonnull stop) {
106106
BOOL r = [self sjCreateOrAlterTabWithClass:relevanceCls];
107-
if ( !r ) NSLog(@"[%@] 创建或更新表失败.", relevanceCls), result = NO;
107+
if ( !r ) {
108+
NSLog(@"[%@] 创建或更新表失败.", relevanceCls);
109+
result = NO;
110+
}
108111
}];
109112
dispatch_async(dispatch_get_main_queue(), ^{
110113
if ( block ) block(result);
@@ -250,7 +253,10 @@ - (void)deleteDataWithClass:(Class)cls primaryValue:(NSInteger)primaryValue call
250253
NSString *sql = [self sjGetDeleteSQL:cls uM:uM deletePrimary:primaryValue];
251254
__block BOOL result = YES;
252255
[self sjExeSQL:sql.UTF8String completeBlock:^(BOOL r) {
253-
if ( !r ) NSLog(@"[%@] 删除失败.", sql), result = NO;
256+
if ( !r ) {
257+
NSLog(@"[%@] 删除失败.", sql);
258+
result = NO;
259+
}
254260
}];
255261

256262
dispatch_async(dispatch_get_main_queue(), ^{
@@ -269,7 +275,10 @@ - (void)deleteDataWithClass:(Class)cls primaryValues:(NSArray<NSNumber *> *)prim
269275
__block BOOL r = YES;
270276
NSString *sql = [self sjGetBatchDeleteSQL:cls primaryValues:primaryValues];
271277
[self sjExeSQL:sql.UTF8String completeBlock:^(BOOL result) {
272-
if ( !result ) NSLog(@"[%@] 删除失败.", sql), r = NO;
278+
if ( !result ) {
279+
NSLog(@"[%@] 删除失败.", sql);
280+
r = NO;
281+
}
273282
}];
274283
dispatch_async(dispatch_get_main_queue(), ^{
275284
if ( block ) block(r);
@@ -287,7 +296,10 @@ - (void)deleteDataWithModels:(NSArray<id<SJDBMapUseProtocol>> *)models callBlock
287296
[[self sjPutInOrderModels:models] enumerateKeysAndObjectsUsingBlock:^(NSString * _Nonnull clsName, NSArray<id<SJDBMapUseProtocol>> * _Nonnull obj, BOOL * _Nonnull stop) {
288297
NSString *sql = [self sjGetBatchDeleteSQL:NSClassFromString(clsName) primaryValues:[self sjGetPrimaryValues:obj]];
289298
[self sjExeSQL:sql.UTF8String completeBlock:^(BOOL result) {
290-
if ( !result ) NSLog(@"[%@] 删除失败.", sql), r = NO;
299+
if ( !result ) {
300+
NSLog(@"[%@] 删除失败.", sql);
301+
r = NO;
302+
}
291303
}];
292304
}];
293305
dispatch_async(dispatch_get_main_queue(), ^{

‎SJDBMapProject.xcodeproj/project.pbxproj

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@
325325
7745B2101EE5D39B00EC4614 /* Project object */ = {
326326
isa = PBXProject;
327327
attributes = {
328-
LastUpgradeCheck = 0830;
328+
LastUpgradeCheck = 0900;
329329
ORGANIZATIONNAME = SanJiang;
330330
TargetAttributes = {
331331
7745B2171EE5D39B00EC4614 = {
@@ -482,15 +482,21 @@
482482
CLANG_CXX_LIBRARY = "libc++";
483483
CLANG_ENABLE_MODULES = YES;
484484
CLANG_ENABLE_OBJC_ARC = YES;
485+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
485486
CLANG_WARN_BOOL_CONVERSION = YES;
487+
CLANG_WARN_COMMA = YES;
486488
CLANG_WARN_CONSTANT_CONVERSION = YES;
487489
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
488490
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
489491
CLANG_WARN_EMPTY_BODY = YES;
490492
CLANG_WARN_ENUM_CONVERSION = YES;
491493
CLANG_WARN_INFINITE_RECURSION = YES;
492494
CLANG_WARN_INT_CONVERSION = YES;
495+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
496+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
493497
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
498+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
499+
CLANG_WARN_STRICT_PROTOTYPES = YES;
494500
CLANG_WARN_SUSPICIOUS_MOVE = YES;
495501
CLANG_WARN_UNREACHABLE_CODE = YES;
496502
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -531,15 +537,21 @@
531537
CLANG_CXX_LIBRARY = "libc++";
532538
CLANG_ENABLE_MODULES = YES;
533539
CLANG_ENABLE_OBJC_ARC = YES;
540+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
534541
CLANG_WARN_BOOL_CONVERSION = YES;
542+
CLANG_WARN_COMMA = YES;
535543
CLANG_WARN_CONSTANT_CONVERSION = YES;
536544
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
537545
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
538546
CLANG_WARN_EMPTY_BODY = YES;
539547
CLANG_WARN_ENUM_CONVERSION = YES;
540548
CLANG_WARN_INFINITE_RECURSION = YES;
541549
CLANG_WARN_INT_CONVERSION = YES;
550+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
551+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
542552
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
553+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
554+
CLANG_WARN_STRICT_PROTOTYPES = YES;
543555
CLANG_WARN_SUSPICIOUS_MOVE = YES;
544556
CLANG_WARN_UNREACHABLE_CODE = YES;
545557
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

‎SJDBMapProject.xcodeproj/xcuserdata/bluedancer.xcuserdatad/xcschemes/SJDBMapProject.xcscheme

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0830"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
</Testables>
@@ -45,6 +46,7 @@
4546
buildConfiguration = "Debug"
4647
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4748
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
49+
language = ""
4850
launchStyle = "0"
4951
useCustomWorkingDirectory = "NO"
5052
ignoresPersistentStateOnLaunch = "NO"

‎SJDBMapProject/ViewController.m

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,18 @@
77
//
88

99
#import "ViewController.h"
10-
1110
#import "SJDBMap.h"
12-
1311
#import "Person.h"
14-
1512
#import "PersonTag.h"
16-
1713
#import "Book.h"
18-
1914
#import "Goods.h"
2015

16+
17+
18+
19+
20+
21+
2122
@interface ViewController (InsertOrUpdate)
2223

2324
- (void)insertOrUpdate;

0 commit comments

Comments
 (0)