Skip to content

Commit

Permalink
feat(db): extend log information with db error
Browse files Browse the repository at this point in the history 
SDK-223

Co-authored-by: davidSchuppa <[email protected]>
  • Loading branch information
@LasOri @davidSchuppa
LasOri and davidSchuppa committed Feb 3, 2025
1 parent 6543edb commit 13c09f2
Showing 1 changed file with 31 additions and 13 deletions.
44 changes: 31 additions & 13 deletions Sources/Core/Database/EMSSQLiteHelper.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@

typedef BOOL (^EMSSQLLiteTransactionBlock)(void);

const char *kBeginTransactionSQL = "BEGIN TRANSACTION;";
const char *kCommitTransactionSQL = "COMMIT;";
const char *kRollbackTransactionSQL = "ROLLBACK;";
const char *kBeginTransactionSQL = "BEGIN DEFERRED TRANSACTION;";
const char *kCommitTransactionSQL = "COMMIT TRANSACTION;";
const char *kRollbackTransactionSQL = "ROLLBACK TRANSACTION;";

@interface EMSSQLiteHelper ()

Expand Down Expand Up @@ -182,7 +182,9 @@ - (BOOL)removeFromTable:(NSString *)tableName
result = NO;
NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
parameters[@"sql"] = sql;
parameters[@"stepResult"] = @(stepResult);
parameters[@"stepResult"] = [NSString stringWithFormat:@"%@", @(stepResult)];
NSString *sqlDBError = [[NSString alloc] initWithUTF8String:sqlite3_errmsg(weakSelf.db)];
parameters[@"sqlDBError"] = sqlDBError;
EMSLog([[EMSStatusLog alloc] initWithClass:[weakSelf class]
sel:@selector(removeFromTable:selection:selectionArgs:)
parameters:parameters
Expand All @@ -192,7 +194,9 @@ - (BOOL)removeFromTable:(NSString *)tableName
result = NO;
NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
parameters[@"sql"] = sql;
parameters[@"prepareResult"] = @(prepareResult);
parameters[@"prepareResult"] = [NSString stringWithFormat:@"%@", @(prepareResult)];
NSString *sqlDBError = [[NSString alloc] initWithUTF8String:sqlite3_errmsg(weakSelf.db)];
parameters[@"sqlDBError"] = sqlDBError;
EMSLog([[EMSStatusLog alloc] initWithClass:[weakSelf class]
sel:@selector(removeFromTable:selection:selectionArgs:)
parameters:parameters
Expand Down Expand Up @@ -243,7 +247,9 @@ - (NSArray *)queryWithTable:(NSString *)tableName
result = NO;
NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
parameters[@"sql"] = sql;
parameters[@"stepResult"] = @(stepResult);
parameters[@"stepResult"] = [NSString stringWithFormat:@"%@", @(stepResult)];
NSString *sqlDBError = [[NSString alloc] initWithUTF8String:sqlite3_errmsg(weakSelf.db)];
parameters[@"sqlDBError"] = sqlDBError;
EMSLog([[EMSStatusLog alloc] initWithClass:[weakSelf class]
sel:@selector(queryWithTable:selection:selectionArgs:orderBy:limit:mapper:)
parameters:parameters
Expand All @@ -254,7 +260,9 @@ - (NSArray *)queryWithTable:(NSString *)tableName
result = NO;
NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
parameters[@"sql"] = sql;
parameters[@"prepareResult"] = @(prepareResult);
parameters[@"prepareResult"] = [NSString stringWithFormat:@"%@", @(prepareResult)];
NSString *sqlDBError = [[NSString alloc] initWithUTF8String:sqlite3_errmsg(weakSelf.db)];
parameters[@"sqlDBError"] = sqlDBError;
EMSLog([[EMSStatusLog alloc] initWithClass:[weakSelf class]
sel:@selector(queryWithTable:selection:selectionArgs:orderBy:limit:mapper:)
parameters:parameters
Expand Down Expand Up @@ -285,8 +293,10 @@ - (BOOL)insertModel:(id)model
result = NO;
NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
parameters[@"sql"] = insertSQL;
parameters[@"model"] = [model description];
parameters[@"stepResult"] = @(stepResult);
parameters[@"model"] = [model description];
NSString *sqlDBError = [[NSString alloc] initWithUTF8String:sqlite3_errmsg(weakSelf.db)];
parameters[@"sqlDBError"] = sqlDBError;
parameters[@"stepResult"] = [NSString stringWithFormat:@"%@", @(stepResult)];
EMSLog([[EMSStatusLog alloc] initWithClass:[weakSelf class]
sel:@selector(insertModel:withQuery:mapper:)
parameters:parameters
Expand All @@ -297,7 +307,9 @@ - (BOOL)insertModel:(id)model
NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
parameters[@"sql"] = insertSQL;
parameters[@"model"] = [model description];
parameters[@"prepareResult"] = @(prepareResult);
NSString *sqlDBError = [[NSString alloc] initWithUTF8String:sqlite3_errmsg(weakSelf.db)];
parameters[@"sqlDBError"] = sqlDBError;
parameters[@"prepareResult"] = [NSString stringWithFormat:@"%@", @(prepareResult)];
EMSLog([[EMSStatusLog alloc] initWithClass:[weakSelf class]
sel:@selector(insertModel:withQuery:mapper:)
parameters:parameters
Expand Down Expand Up @@ -347,7 +359,9 @@ - (NSArray *)executeQuery:(NSString *)query
result = NO;
NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
parameters[@"sql"] = query;
parameters[@"stepResult"] = @(stepResult);
NSString *sqlDBError = [[NSString alloc] initWithUTF8String:sqlite3_errmsg(weakSelf.db)];
parameters[@"sqlDBError"] = sqlDBError;
parameters[@"stepResult"] = [NSString stringWithFormat:@"%@", @(stepResult)];
EMSLog([[EMSStatusLog alloc] initWithClass:[weakSelf class]
sel:@selector(executeQuery:mapper:)
parameters:parameters
Expand All @@ -358,7 +372,9 @@ - (NSArray *)executeQuery:(NSString *)query
result = NO;
NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
parameters[@"sql"] = query;
parameters[@"prepareResult"] = @(prepareResult);
NSString *sqlDBError = [[NSString alloc] initWithUTF8String:sqlite3_errmsg(weakSelf.db)];
parameters[@"sqlDBError"] = sqlDBError;
parameters[@"prepareResult"] = [NSString stringWithFormat:@"%@", @(prepareResult)];
EMSLog([[EMSStatusLog alloc] initWithClass:[weakSelf class]
sel:@selector(executeQuery:mapper:)
parameters:parameters
Expand Down Expand Up @@ -465,8 +481,10 @@ - (void)logWithSel:(SEL)sel
sql:(NSString *)sql {
NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
parameters[@"sql"] = sql;
parameters[@"sqlResult"] = @(sqlResult);
parameters[@"sqlResult"] = [NSString stringWithFormat:@"%@", @(sqlResult)];
parameters[@"error"] = error;
NSString *sqlDBError = [[NSString alloc] initWithUTF8String:sqlite3_errmsg(self.db)];
parameters[@"sqlDBError"] = sqlDBError;
EMSLog([[EMSStatusLog alloc] initWithClass:[self class]
sel:sel
parameters:parameters
Expand Down

0 comments on commit 13c09f2

Please sign in to comment.