Added ability to run sql queries on sqlite files #294

LesykMelnychuk · 2019-07-10T16:05:00Z

Added ability to run execution and selection sql queries during sqlite db exploration.

NSExceptional · 2019-07-25T22:00:11Z

There's a lot of changes here. so when I have time, I'm going to review this on my machine and clean up the commit history a bit. I do want to merge this eventually though!

LesykMelnychuk · 2019-07-30T09:43:49Z

Great

NSExceptional · 2019-07-30T20:16:08Z

~~Hmmm, it appears you didn't check the option to give maintainers access to your fork when you created it. Could you give me commit access to your fork?~~

~~At least, that's the error I'm getting:~~

 ! [remote rejected] LesykMelnychuk/execute_sql -> feature/execute_sql (permission denied)
error: failed to push some refs to 'https://[email protected]/LesykMelnychuk/FLEX.git'

Edit: I have access to master only, didn't know that. Never mind!

NSExceptional · 2019-07-30T20:39:34Z

Okay, I got everything squashed into a single commit on master and properly rebased.

After looking over your code, it doesn't match our coding conventions. Can you go through each of the files you've added or changed and make sure you're following the style set out in this codebase? Some examples:

Do not indent @property declarations (I took care of this already)
Never put spaces between arguments and their labels
- ❌[self foo: bar];
- ✅[self foo:bar];
Never put spaces after argument labels in method declarations
- ❌- (void)foo: (id)foo and: (NSString **)error
- ✅- (void)foo:(id)foo error:(NSString **)error
Pointer markers go with the variable name, not the type
- ❌UILabel* textLabel;
- ✅UILabel *textLabel;
There is no need to manually @synthesize properties unless you override the getter and the setter (so, use self.isSelectionType instead of isSelectionType)
Prefer properties over ivars in almost all cases
Use dot syntax for accessing properties
- ❌[str UTF8String]
- ✅str.UTF8String
- ✅[self notAProperty];

Also, what's SQLITE_HAS_CODEC for? Can we get rid of that preprocessor check?

LesykMelnychuk · 2019-07-31T09:05:39Z

Ok - I'll fix code style

NSExceptional · 2019-08-06T23:22:21Z

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXSQLiteDatabaseManager.m

+    return error;
+}
+
+- (NSArray<NSDictionary<NSString *, id> *> *)executeSelectionQuery: (NSString *)sql and: (NSString **)error {


Suggested change

- (NSArray<NSDictionary<NSString *, id> *> *)executeSelectionQuery: (NSString *)sql and: (NSString **)error {

- (NSArray<NSDictionary<NSString *, id> *> *)executeSelectionQuery:(NSString *)sql and:(NSString **)error {

Make sure you correct the spacing of method declarations

NSExceptional · 2019-08-06T23:22:59Z

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableListViewController.m

    }
    return self;
 }

+- (void)viewWillAppear: (BOOL)animated {
+    [super viewWillAppear: animated];


Suggested change

[super viewWillAppear: animated];

[super viewWillAppear:animated];

NSExceptional · 2019-08-06T23:23:51Z

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableListViewController.m

+
+    [alertController addAction: executeAction];
+    [alertController addAction: selectAction];
+    [alertController addAction: cancelAction];


Suggested change

[alertController addAction: cancelAction];

[alertController addAction:cancelAction];

Spacing on all three of these lines

NSExceptional · 2019-08-06T23:24:35Z

Classes/GlobalStateExplorers/SQLExecutionControllers/FLEXSQLCommandExecutionViewController.m

+
+- (void)submitPressed
+{
+    NSString *text = self.textView.text == nil ? @"" : self.textView.text;


Suggested change

NSString *text = self.textView.text == nil ? @"" : self.textView.text;

NSString *text = self.textView.text ?: @"";

Shorthand ternary syntax is preferred for clarity; it's similar to Swift's ?? nil coalescing operator

NSExceptional · 2019-08-06T23:27:25Z

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXSQLiteDatabaseManager.m

+                NSMutableDictionary<NSString *, id> *dict = [NSMutableDictionary dictionaryWithCapacity:num_cols];
+
+                int columnCount = sqlite3_column_count(pstmt);
+


Avoid excess whitespace, group lines together logically

NSExceptional · 2019-08-06T23:28:07Z

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableListViewController.m

+        actionWithTitle: @"Execute SQL"
+        style: UIAlertActionStyleDefault
+        handler: ^(UIAlertAction *action) {
+            FLEXSQLCommandExecutionViewController* controller = [FLEXSQLCommandExecutionViewController new];


Suggested change

FLEXSQLCommandExecutionViewController* controller = [FLEXSQLCommandExecutionViewController new];

FLEXSQLCommandExecutionViewController *controller = [FLEXSQLCommandExecutionViewController new];

There are still a lot of these

NSExceptional · 2019-08-06T23:29:46Z

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXSQLiteDatabaseManager.m

+                    NSString *columnName = [NSString stringWithUTF8String:sqlite3_column_name(pstmt, columnIdx)];
+                    id objectValue = [self objectForColumnIndex:columnIdx stmt:pstmt];
+
+                    [dict setObject:objectValue forKey:columnName];


Suggested change

[dict setObject:objectValue forKey:columnName];

dict[columnName] = objectValue;

Use subscripting syntax wherever possible

NSExceptional · 2019-08-06T23:35:55Z

I left some comments, there's a lot you missed 😅 I didn't mark them all, just a bunch I found.

Also, before you go any further, make sure your HEAD is at origin/master to avoid the merge commit. You don't need to merge, just fast forward. Lemme know if you need help with avoiding a merge commit.

LesykMelnychuk · 2019-08-07T09:51:57Z

I left some comments, there's a lot you missed 😅 I didn't mark them all, just a bunch I found.

Also, before you go any further, make sure your HEAD is at origin/master to avoid the merge commit. You don't need to merge, just fast forward. Lemme know if you need help with avoiding a merge commit.

Fixed comments you made - fixed, were could found.
Thanks, that you are interested in my pull request!

NSExceptional · 2019-08-07T16:20:13Z

@revolter Can you tell me what this macro and code segment is for? 😅I'm trying to decipher some of this old code, I've never used the sqlite APIs

https://github.com/Flipboard/FLEX/blame/0de3a9d65c54533848b6721d0d66bc3fb0d740fa/Classes/GlobalStateExplorers/DatabaseBrowser/FLEXSQLiteDatabaseManager.m#L38

revolter · 2019-08-07T16:45:26Z

That macro is set by the SQLCipher pod and the code is used to decrypt a crypted database after opening it, or else any query would fail.

NSExceptional · 2019-08-07T18:03:57Z

Thanks! I'm trying to add comments to these files

NSExceptional · 2019-08-07T19:16:35Z

@LesykMelnychuk Can I ask why you added executeNonSelectQuery: and executeSelectionQuery:error: instead of making use of executeQuery:?

I've read the code more thoroughly now and there seems to be a lot of duplication now. At the very least, would you be able to make those two methods call into executeQuery:?

LesykMelnychuk · 2019-08-12T10:26:58Z

@NSExceptional Hi, cause executeSelectionQuery:error returns result of selection and it has difference calling functions inside

NSExceptional · 2019-08-12T18:36:32Z

Your executeSelectionQuery:error: is almost identical to the original executeQuery: unless I'm overlooking something. You return an error in an argument but that's the only difference

LesykMelnychuk · 2019-08-13T12:12:40Z

Your executeSelectionQuery:error: is almost identical to the original executeQuery: unless I'm overlooking something. You return an error in an argument but that's the only difference

Understud, - fixed.

LesykMelnychuk · 2019-11-11T13:54:14Z

Hello @NSExceptional , can you please merge this pull ?

NSExceptional · 2019-11-11T15:11:34Z

Hey @LesykMelnychuk,

This PR isn't in a state where I'm ready to merge it. I have a fork of your branch I started working on a while back but I got sidetracked and it fell off my todo list. I will try to get it done and merged this week. (At the moment I don't even remember what I was working on specifically, probably adding comments or something.)

revolter · 2020-02-06T11:37:43Z

Shouldn't I fix the conflicts in #305, modify things if needed, merge it, and then rebase this, instead of having f7659a8 here?

NSExceptional · 2020-03-03T06:58:15Z

@revolter @LesykMelnychuk I'm currently in the process of rebasing and resolving conflicts between this branch and the 4.0 branch, should have it done tomorrow sometime

NSExceptional · 2020-03-03T18:51:43Z

Accidentally named the branch 4.0-flex when I meant to just name it 4.0, so I renamed it just now, FYI

revolter · 2020-03-03T19:42:59Z

What I meant was that this PR included #305, so you merged 2 things at the same time, while #305 looks now like it wasn't merged.

NSExceptional · 2020-03-03T19:48:12Z

Are you saying @LesykMelnychuk somehow included #305 in this original PR, and that I unknowingly discarded it when I made my changes and merged this just now?

revolter · 2020-03-03T19:50:39Z

Oooh, it was probably incorrectly rebased. Now it's ok, sorry I didn't check again, today. So it's all good 👍

NSExceptional · 2020-03-03T19:52:20Z

I'm so confused :P What's wrong?

revolter · 2020-03-03T19:53:47Z

I am what's wrong 😆 Sorry for the confusion, and completely disregard this conversation. As I said, everything is ok 😃

NSExceptional self-assigned this Jul 25, 2019

NSExceptional force-pushed the master branch 2 times, most recently from e33308b to 993c84e Compare July 30, 2019 20:38

NSExceptional force-pushed the master branch 3 times, most recently from 62d8526 to ac00197 Compare August 6, 2019 23:21

NSExceptional reviewed Aug 6, 2019

View reviewed changes

NSExceptional added 4.0 enhancement labels Mar 3, 2020

Add ability to run SQL queries

15d7d07

NSExceptional force-pushed the master branch from fcf7f91 to 15d7d07 Compare March 3, 2020 18:45

NSExceptional changed the base branch from master to 4.0-flex March 3, 2020 18:47

NSExceptional merged commit af12273 into FLEXTool:4.0-flex Mar 3, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added ability to run sql queries on sqlite files #294

Added ability to run sql queries on sqlite files #294

LesykMelnychuk commented Jul 10, 2019

NSExceptional commented Jul 25, 2019

LesykMelnychuk commented Jul 30, 2019

NSExceptional commented Jul 30, 2019 •

edited

Loading

NSExceptional commented Jul 30, 2019 •

edited

Loading

LesykMelnychuk commented Jul 31, 2019

NSExceptional Aug 6, 2019 •

edited

Loading

NSExceptional Aug 6, 2019

NSExceptional Aug 6, 2019 •

edited

Loading

NSExceptional Aug 6, 2019 •

edited

Loading

NSExceptional Aug 6, 2019

NSExceptional Aug 6, 2019

NSExceptional Aug 6, 2019

NSExceptional commented Aug 6, 2019

LesykMelnychuk commented Aug 7, 2019

NSExceptional commented Aug 7, 2019

revolter commented Aug 7, 2019

NSExceptional commented Aug 7, 2019

NSExceptional commented Aug 7, 2019

LesykMelnychuk commented Aug 12, 2019 •

edited

Loading

NSExceptional commented Aug 12, 2019

LesykMelnychuk commented Aug 13, 2019

LesykMelnychuk commented Nov 11, 2019

NSExceptional commented Nov 11, 2019

revolter commented Feb 6, 2020

NSExceptional commented Mar 3, 2020

NSExceptional commented Mar 3, 2020

revolter commented Mar 3, 2020

NSExceptional commented Mar 3, 2020

revolter commented Mar 3, 2020 •

edited

Loading

NSExceptional commented Mar 3, 2020

revolter commented Mar 3, 2020

	- (NSArray<NSDictionary<NSString , id> > )executeSelectionQuery: (NSString )sql and: (NSString **)error {
	- (NSArray<NSDictionary<NSString , id> > )executeSelectionQuery:(NSString )sql and:(NSString **)error {

	[super viewWillAppear: animated];
	[super viewWillAppear:animated];

	[alertController addAction: cancelAction];
	[alertController addAction:cancelAction];

	NSString *text = self.textView.text == nil ? @"" : self.textView.text;
	NSString *text = self.textView.text ?: @"";

		NSMutableDictionary<NSString , id> dict = [NSMutableDictionary dictionaryWithCapacity:num_cols];

		int columnCount = sqlite3_column_count(pstmt);

	FLEXSQLCommandExecutionViewController* controller = [FLEXSQLCommandExecutionViewController new];
	FLEXSQLCommandExecutionViewController *controller = [FLEXSQLCommandExecutionViewController new];

	[dict setObject:objectValue forKey:columnName];
	dict[columnName] = objectValue;

Added ability to run sql queries on sqlite files #294

Added ability to run sql queries on sqlite files #294

Conversation

LesykMelnychuk commented Jul 10, 2019

NSExceptional commented Jul 25, 2019

LesykMelnychuk commented Jul 30, 2019

NSExceptional commented Jul 30, 2019 • edited Loading

NSExceptional commented Jul 30, 2019 • edited Loading

LesykMelnychuk commented Jul 31, 2019

NSExceptional Aug 6, 2019 • edited Loading

Choose a reason for hiding this comment

NSExceptional Aug 6, 2019

Choose a reason for hiding this comment

NSExceptional Aug 6, 2019 • edited Loading

Choose a reason for hiding this comment

NSExceptional Aug 6, 2019 • edited Loading

Choose a reason for hiding this comment

NSExceptional Aug 6, 2019

Choose a reason for hiding this comment

NSExceptional Aug 6, 2019

Choose a reason for hiding this comment

NSExceptional Aug 6, 2019

Choose a reason for hiding this comment

NSExceptional commented Aug 6, 2019

LesykMelnychuk commented Aug 7, 2019

NSExceptional commented Aug 7, 2019

revolter commented Aug 7, 2019

NSExceptional commented Aug 7, 2019

NSExceptional commented Aug 7, 2019

LesykMelnychuk commented Aug 12, 2019 • edited Loading

NSExceptional commented Aug 12, 2019

LesykMelnychuk commented Aug 13, 2019

LesykMelnychuk commented Nov 11, 2019

NSExceptional commented Nov 11, 2019

revolter commented Feb 6, 2020

NSExceptional commented Mar 3, 2020

NSExceptional commented Mar 3, 2020

revolter commented Mar 3, 2020

NSExceptional commented Mar 3, 2020

revolter commented Mar 3, 2020 • edited Loading

NSExceptional commented Mar 3, 2020

revolter commented Mar 3, 2020

NSExceptional commented Jul 30, 2019 •

edited

Loading

NSExceptional commented Jul 30, 2019 •

edited

Loading

NSExceptional Aug 6, 2019 •

edited

Loading

NSExceptional Aug 6, 2019 •

edited

Loading

NSExceptional Aug 6, 2019 •

edited

Loading

LesykMelnychuk commented Aug 12, 2019 •

edited

Loading

revolter commented Mar 3, 2020 •

edited

Loading