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/SPTableStructure.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/SPTableStructure.h')
| -rw-r--r-- | Source/SPTableStructure.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/Source/SPTableStructure.h b/Source/SPTableStructure.h index 63ac74b8..a97f70b2 100644 --- a/Source/SPTableStructure.h +++ b/Source/SPTableStructure.h @@ -23,9 +23,7 @@ // // More info at <http://code.google.com/p/sequel-pro/> -#import <MCPKit/MCPKit.h> - -@class SPDatabaseDocument, SPTableFieldValidation, SPTableData, SPDatabaseData, SPTablesList, SPIndexesController, SPTableView; +@class SPDatabaseDocument, SPTableFieldValidation, SPTableData, SPDatabaseData, SPTablesList, SPIndexesController, SPTableView, SPMySQLConnection, SPMySQLResult; @interface SPTableStructure : NSObject #ifdef SP_REFACTOR @@ -70,9 +68,7 @@ #endif IBOutlet NSPopUpButtonCell *encodingPopupCell; - MCPConnection *mySQLConnection; - MCPResult *tableSourceResult; - MCPResult *indexResult; + SPMySQLConnection *mySQLConnection; SPTableFieldValidation *fieldValidation; @@ -123,15 +119,15 @@ - (IBAction)resetAutoIncrement:(id)sender; - (void)resetAutoincrementSheetDidEnd:(NSWindow *)theSheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo; - (IBAction)showOptimizedFieldType:(id)sender; -- (IBAction)toggleColumnView:(id)sender; +- (IBAction)toggleColumnView:(NSMenuItem *)sender; - (BOOL)cancelRowEditing; // Index sheet methods - (IBAction)closeSheet:(id)sender; // Additional methods -- (void)setConnection:(MCPConnection *)theConnection; -- (NSArray *)fetchResultAsArray:(MCPResult *)theResult; +- (void)setConnection:(SPMySQLConnection *)theConnection; +- (NSArray *)convertIndexResultToArray:(SPMySQLResult *)theResult; - (BOOL)saveRowOnDeselect; - (BOOL)addRowToDB; - (void)addRowErrorSheetDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo; |