From 993c84e2fd28eb0712cf3ab17cff0a073ab1a664 Mon Sep 17 00:00:00 2001 From: Tanner Bennett Date: Tue, 30 Jul 2019 15:33:29 -0500 Subject: [PATCH] Fix indentation --- .../FLEXSQLiteDatabaseManager.h | 4 +- .../FLEXSQLiteDatabaseManager.m | 92 +++++++++---------- .../FLEXSQLCommandExecutionViewController.h | 4 +- .../FLEXSQLCommandExecutionViewController.m | 54 +++++------ 4 files changed, 77 insertions(+), 77 deletions(-) diff --git a/Classes/GlobalStateExplorers/DatabaseBrowser/FLEXSQLiteDatabaseManager.h b/Classes/GlobalStateExplorers/DatabaseBrowser/FLEXSQLiteDatabaseManager.h index 130632f243..03d4e99db7 100644 --- a/Classes/GlobalStateExplorers/DatabaseBrowser/FLEXSQLiteDatabaseManager.h +++ b/Classes/GlobalStateExplorers/DatabaseBrowser/FLEXSQLiteDatabaseManager.h @@ -15,6 +15,6 @@ #import "FLEXDatabaseManager.h" @interface FLEXSQLiteDatabaseManager : NSObject - - (NSString *)executeNonSelectQuery:(NSString *)sql; - - (NSArray *> *)executeSelectionQuery:(NSString *)sql and: (NSString **)error; +- (NSString *)executeNonSelectQuery:(NSString *)sql; +- (NSArray *> *)executeSelectionQuery:(NSString *)sql error:(NSString **)error; @end diff --git a/Classes/GlobalStateExplorers/DatabaseBrowser/FLEXSQLiteDatabaseManager.m b/Classes/GlobalStateExplorers/DatabaseBrowser/FLEXSQLiteDatabaseManager.m index 451b589682..306416520a 100644 --- a/Classes/GlobalStateExplorers/DatabaseBrowser/FLEXSQLiteDatabaseManager.m +++ b/Classes/GlobalStateExplorers/DatabaseBrowser/FLEXSQLiteDatabaseManager.m @@ -14,21 +14,21 @@ static NSString *const QUERY_TABLENAMES_SQL = @"SELECT name FROM sqlite_master WHERE type='table' ORDER BY name"; @implementation FLEXSQLiteDatabaseManager - { - sqlite3* _db; - NSString* _databasePath; - } - +{ + sqlite3* _db; + NSString* _databasePath; +} + - (instancetype)initWithPath:(NSString*)aPath - { - self = [super init]; - - if (self) { - _databasePath = [aPath copy]; - } - return self; +{ + self = [super init]; + if (self) { + _databasePath = [aPath copy]; } + return self; +} + - (BOOL)open { if (_db) { return YES; @@ -51,7 +51,7 @@ - (BOOL)open { } return YES; } - + - (BOOL)close { if (!_db) { return YES; @@ -84,12 +84,12 @@ - (BOOL)close { _db = nil; return YES; } - - + + - (NSArray *> *)queryAllTables { return [self executeQuery:QUERY_TABLENAMES_SQL]; } - + - (NSArray *)queryAllColumnsWithTableName:(NSString *)tableName { NSString *sql = [NSString stringWithFormat:@"PRAGMA table_info('%@')",tableName]; NSArray *> *resultArray = [self executeQuery:sql]; @@ -100,12 +100,12 @@ - (BOOL)close { } return array; } - + - (NSArray *> *)queryAllDataWithTableName:(NSString *)tableName { NSString *sql = [NSString stringWithFormat:@"SELECT * FROM %@",tableName]; return [self executeQuery:sql]; } - + - (NSString *)executeNonSelectQuery:(NSString *)sql { NSString *error = nil; @@ -115,18 +115,18 @@ - (NSString *)executeNonSelectQuery:(NSString *)sql { if (sqlite3_prepare_v2(_db, [sql UTF8String], -1, &pstmt, NULL) != SQLITE_OK) { return [NSString stringWithFormat: @"Prepare failure: %s", sqlite3_errmsg(_db)]; } - + if (sqlite3_step(pstmt) != SQLITE_DONE) { return [NSString stringWithFormat: @"Step failure: %s", sqlite3_errmsg(_db)]; } - + sqlite3_finalize(pstmt); - + [self close]; - + return error; } - + - (NSArray *> *)executeSelectionQuery: (NSString *)sql and: (NSString **)error { [self open]; @@ -165,11 +165,11 @@ - (NSString *)executeNonSelectQuery:(NSString *)sql { return resultArray; } - - + + #pragma mark - #pragma mark - Private - + - (NSArray *> *)executeQuery:(NSString *)sql { [self open]; NSMutableArray *> *resultArray = [NSMutableArray array]; @@ -198,10 +198,10 @@ - (NSString *)executeNonSelectQuery:(NSString *)sql { return resultArray; } - + - (id)objectForColumnIndex:(int)columnIdx stmt:(sqlite3_stmt*)stmt { int columnType = sqlite3_column_type(stmt, columnIdx); - + id returnValue = nil; if (columnType == SQLITE_INTEGER) { @@ -224,7 +224,7 @@ - (id)objectForColumnIndex:(int)columnIdx stmt:(sqlite3_stmt*)stmt { return returnValue; } - + - (NSString *)stringForColumnIndex:(int)columnIdx stmt:(sqlite3_stmt *)stmt { if (sqlite3_column_type(stmt, columnIdx) == SQLITE_NULL || (columnIdx < 0)) { @@ -240,21 +240,21 @@ - (NSString *)stringForColumnIndex:(int)columnIdx stmt:(sqlite3_stmt *)stmt { return [NSString stringWithUTF8String:c]; } - - - (NSData *)dataForColumnIndex:(int)columnIdx stmt:(sqlite3_stmt *)stmt { - - if (sqlite3_column_type(stmt, columnIdx) == SQLITE_NULL || (columnIdx < 0)) { - return nil; - } - - const char *dataBuffer = sqlite3_column_blob(stmt, columnIdx); - int dataSize = sqlite3_column_bytes(stmt, columnIdx); - - if (dataBuffer == NULL) { - return nil; - } - - return [NSData dataWithBytes:(const void *)dataBuffer length:(NSUInteger)dataSize]; - } - + +- (NSData *)dataForColumnIndex:(int)columnIdx stmt:(sqlite3_stmt *)stmt { + + if (sqlite3_column_type(stmt, columnIdx) == SQLITE_NULL || (columnIdx < 0)) { + return nil; + } + + const char *dataBuffer = sqlite3_column_blob(stmt, columnIdx); + int dataSize = sqlite3_column_bytes(stmt, columnIdx); + + if (dataBuffer == NULL) { + return nil; + } + + return [NSData dataWithBytes:(const void *)dataBuffer length:(NSUInteger)dataSize]; +} + @end diff --git a/Classes/GlobalStateExplorers/SQLExecutionControllers/FLEXSQLCommandExecutionViewController.h b/Classes/GlobalStateExplorers/SQLExecutionControllers/FLEXSQLCommandExecutionViewController.h index f03d1b9fe1..88219017ec 100644 --- a/Classes/GlobalStateExplorers/SQLExecutionControllers/FLEXSQLCommandExecutionViewController.h +++ b/Classes/GlobalStateExplorers/SQLExecutionControllers/FLEXSQLCommandExecutionViewController.h @@ -10,6 +10,6 @@ #import "FLEXSQLiteDatabaseManager.h" @interface FLEXSQLCommandExecutionViewController: UIViewController - @property (nonatomic) BOOL isSelectionType; - @property (nonatomic) FLEXSQLiteDatabaseManager* dbManager; +@property (nonatomic) BOOL isSelectionType; +@property (nonatomic) FLEXSQLiteDatabaseManager* dbManager; @end diff --git a/Classes/GlobalStateExplorers/SQLExecutionControllers/FLEXSQLCommandExecutionViewController.m b/Classes/GlobalStateExplorers/SQLExecutionControllers/FLEXSQLCommandExecutionViewController.m index 57f794f854..6f76ede961 100644 --- a/Classes/GlobalStateExplorers/SQLExecutionControllers/FLEXSQLCommandExecutionViewController.m +++ b/Classes/GlobalStateExplorers/SQLExecutionControllers/FLEXSQLCommandExecutionViewController.m @@ -15,14 +15,14 @@ #import @interface FLEXSQLCommandExecutionViewController () - @property (nonatomic) UITextView* textView; - @property (nonatomic) UIButton* submitButton; - @property (nonatomic) UILabel* statusLabel; - @end +@property (nonatomic) UITextView* textView; +@property (nonatomic) UIButton* submitButton; +@property (nonatomic) UILabel* statusLabel; +@end @implementation FLEXSQLCommandExecutionViewController - @synthesize isSelectionType, dbManager, textView, submitButton, statusLabel; - +@synthesize isSelectionType, dbManager, textView, submitButton, statusLabel; + - (void)viewDidLoad { [super viewDidLoad]; @@ -31,11 +31,11 @@ - (void)viewDidLoad { [self addOtherUIElementsAndPositionThem]; } - + - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context { [self addOtherUIElementsAndPositionThem]; } - + - (void)addOtherUIElementsAndPositionThem { if(textView == nil) { textView = [UITextView new]; @@ -78,7 +78,7 @@ - (void)addOtherUIElementsAndPositionThem { statusLabel.frame = CGRectMake(sideMargin, textView.frame.origin.y + textViewHeight + sideMargin, width, statusLabelHeight); submitButton.frame = CGRectMake(sideMargin, statusLabel.frame.origin.y + statusLabelHeight + sideMargin, width, submitButtonHeight); } - + - (void)submitPressed { NSString* text = textView.text == nil ? @"" : textView.text; @@ -115,22 +115,22 @@ - (void)submitPressed { statusLabel.text = errorMessage == nil ? @"SUCCESS" : errorMessage; } } - - + + - (void)presentOnErrorAlert: (NSString *)message - { - UIAlertController * alert = [UIAlertController - alertControllerWithTitle:@"SQL Execution error !!!" - message: message - preferredStyle:UIAlertControllerStyleAlert]; - - UIAlertAction* okButton = [UIAlertAction - actionWithTitle:@"Ok" - style:UIAlertActionStyleDestructive - handler: nil]; - - [alert addAction:okButton]; - [self presentViewController:alert animated:YES completion:nil]; - } - - @end +{ + UIAlertController * alert = [UIAlertController + alertControllerWithTitle:@"SQL Execution error !!!" + message: message + preferredStyle:UIAlertControllerStyleAlert]; + + UIAlertAction* okButton = [UIAlertAction + actionWithTitle:@"Ok" + style:UIAlertActionStyleDestructive + handler: nil]; + + [alert addAction:okButton]; + [self presentViewController:alert animated:YES completion:nil]; +} + +@end