diff options
author | rowanbeentje <rowan@beent.je> | 2012-02-23 02:13:56 +0000 |
---|---|---|
committer | rowanbeentje <rowan@beent.je> | 2012-02-23 02:13:56 +0000 |
commit | 05f1612cbb7e33cf9135a346fc2505cc0e87e853 (patch) | |
tree | 785824be4e44a61389271343d958851fa4ff7dd0 /Source/SPServerVariablesController.m | |
parent | a889340b9cb1eca0d3ff022e8e6e2c718480bf44 (diff) | |
download | sequelpro-05f1612cbb7e33cf9135a346fc2505cc0e87e853.tar.gz sequelpro-05f1612cbb7e33cf9135a346fc2505cc0e87e853.tar.bz2 sequelpro-05f1612cbb7e33cf9135a346fc2505cc0e87e853.zip |
Warning: this branch commit is largely untested, and known to throw exceptions as database structure retrieval is currently missing!
Further work on SPMySQLFramework integration:
- Improve SPMySQL framework build settings including correct ppc builds and a Distribution configuration for the build distributions to match
- Add new convenience querying and result methods to the framework
- Amend Sequel Pro source to use the new SPMySQL.framework methods everywhere, replacing MCPKit methods where they differ and improving some functions
- Remove MCPKit from the source
- Fix a number of warnings on Release-style builds
Diffstat (limited to 'Source/SPServerVariablesController.m')
-rw-r--r-- | Source/SPServerVariablesController.m | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/Source/SPServerVariablesController.m b/Source/SPServerVariablesController.m index 5b9114d8..50f03e31 100644 --- a/Source/SPServerVariablesController.m +++ b/Source/SPServerVariablesController.m @@ -26,6 +26,7 @@ #import "SPServerVariablesController.h" #import "SPDatabaseDocument.h" #import "SPAppController.h" +#import "SPMySQL.h" @interface SPServerVariablesController (PrivateAPI) @@ -287,20 +288,13 @@ */ - (void)_getDatabaseServerVariables { - NSUInteger i = 0; // Get processes - MCPResult *serverVariables = [connection queryString:@"SHOW VARIABLES"]; + SPMySQLResult *serverVariables = [connection queryString:@"SHOW VARIABLES"]; [serverVariables setReturnDataAsStrings:YES]; - if ([serverVariables numOfRows]) [serverVariables dataSeek:0]; - [variables removeAllObjects]; - - for (i = 0; i < [serverVariables numOfRows]; i++) - { - [variables addObject:[serverVariables fetchRowAsDictionary]]; - } + [variables addObjectsFromArray:[serverVariables getAllRows]]; } /** |