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/SPCustomQuery.h | |
| 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/SPCustomQuery.h')
| -rw-r--r-- | Source/SPCustomQuery.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Source/SPCustomQuery.h b/Source/SPCustomQuery.h index aa78a250..1e330682 100644 --- a/Source/SPCustomQuery.h +++ b/Source/SPCustomQuery.h @@ -23,7 +23,6 @@ // // More info at <http://code.google.com/p/sequel-pro/> -#import <MCPKit/MCPKit.h> #import <WebKit/WebKit.h> #import "SPCopyTable.h" @@ -47,9 +46,9 @@ #define SP_HISTORY_CLEAR_MENUITEM_TAG 300002 #ifndef SP_REFACTOR -@class SPCopyTable, SPQueryFavoriteManager, SPDataStorage, BWSplitView, SPFieldEditorController; +@class SPCopyTable, SPQueryFavoriteManager, SPDataStorage, BWSplitView, SPFieldEditorController, SPMySQLConnection, SPMySQLFastStreamingResult; #else -@class SPCopyTable, SPQueryFavoriteManager, SPDataStorage, NSSplitView, SPFieldEditorController; +@class SPCopyTable, SPQueryFavoriteManager, SPDataStorage, NSSplitView, SPFieldEditorController, SPMySQLConnection, SPMySQLFastStreamingResult; #endif @interface SPCustomQuery : NSObject @@ -129,7 +128,7 @@ SPQueryFavoriteManager *favoritesManager; NSUserDefaults *prefs; - MCPConnection *mySQLConnection; + SPMySQLConnection *mySQLConnection; NSString *usedQuery; NSRange currentQueryRange; @@ -221,7 +220,7 @@ - (IBAction)copyQueryHistory:(id)sender; - (IBAction)clearQueryHistory:(id)sender; - (IBAction)showCompletionList:(id)sender; -- (IBAction)toggleQueryInfoPaneCollapse:(id)sender; +- (IBAction)toggleQueryInfoPaneCollapse:(NSButton *)sender; // Query actions - (void)performQueries:(NSArray *)queries withCallback:(SEL)customQueryCallbackMethod; @@ -239,7 +238,7 @@ // Accessors - (NSArray *)currentResult; - (NSArray *)currentDataResultWithNULLs:(BOOL)includeNULLs; -- (void)processResultIntoDataStorage:(MCPStreamingResult *)theResult; +- (void)processResultIntoDataStorage:(SPMySQLFastStreamingResult *)theResult; // Retrieving and setting table state - (void) updateTableView; @@ -271,7 +270,7 @@ - (void)tableSortCallback; // Other -- (void)setConnection:(MCPConnection *)theConnection; +- (void)setConnection:(SPMySQLConnection *)theConnection; - (void)doPerformQueryService:(NSString *)query; - (void)doPerformLoadQueryService:(NSString *)query; - (void)selectCurrentQuery; |