diff options
author | Stuart Connolly <stuart02@gmail.com> | 2014-08-28 19:08:14 +0100 |
---|---|---|
committer | Stuart Connolly <stuart02@gmail.com> | 2014-08-28 19:08:14 +0100 |
commit | 310fb079c75d551bf2a129b69c897905ca83e061 (patch) | |
tree | ae163e957f6e43c49fef9014a96f8cab7b99cbfa /Source/SPQueryController.h | |
parent | e3c342d623b24a55215fadb3b7c72f80df303e83 (diff) | |
download | sequelpro-310fb079c75d551bf2a129b69c897905ca83e061.tar.gz sequelpro-310fb079c75d551bf2a129b69c897905ca83e061.tar.bz2 sequelpro-310fb079c75d551bf2a129b69c897905ca83e061.zip |
Resolve #1938: In the query console display the database the query was executed in.
Diffstat (limited to 'Source/SPQueryController.h')
-rw-r--r-- | Source/SPQueryController.h | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/Source/SPQueryController.h b/Source/SPQueryController.h index ce48dced..8d128fe3 100644 --- a/Source/SPQueryController.h +++ b/Source/SPQueryController.h @@ -32,6 +32,7 @@ extern NSString *SPQueryConsoleWindowAutoSaveName; extern NSString *SPTableViewDateColumnID; extern NSString *SPTableViewConnectionColumnID; +extern NSString *SPTableViewDatabaseColumnID; #endif @interface SPQueryController : NSWindowController @@ -42,22 +43,26 @@ extern NSString *SPTableViewConnectionColumnID; IBOutlet NSSearchField *consoleSearchField; IBOutlet NSTextField *loggingDisabledTextField; IBOutlet NSProgressIndicator *progressIndicator; - IBOutlet NSButton *includeTimeStampsButton, *includeConnectionButton, *saveConsoleButton, *clearConsoleButton; - - NSFont *consoleFont; - NSMutableArray *messagesFullSet, *messagesFilteredSet, *messagesVisibleSet; + IBOutlet NSButton *includeTimeStampsButton; + IBOutlet NSButton *includeConnectionButton; + IBOutlet NSButton *includeDatabaseButton; + IBOutlet NSButton *saveConsoleButton; + IBOutlet NSButton *clearConsoleButton; + BOOL showSelectStatementsAreDisabled; BOOL showHelpStatementsAreDisabled; BOOL filterIsActive; BOOL allowConsoleUpdate; - + + NSFont *consoleFont; NSMutableString *activeFilterString; - + NSMutableArray *messagesFullSet, *messagesFilteredSet, *messagesVisibleSet; + // DocumentsController - NSUInteger untitledDocumentCounter; NSMutableDictionary *favoritesContainer; NSMutableDictionary *historyContainer; NSMutableDictionary *contentFilterContainer; + NSUInteger untitledDocumentCounter; NSUInteger numberOfMaxAllowedHistory; #endif @@ -84,6 +89,7 @@ extern NSString *SPTableViewConnectionColumnID; - (IBAction)saveConsoleAs:(id)sender; - (IBAction)toggleShowTimeStamps:(id)sender; - (IBAction)toggleShowConnections:(id)sender; +- (IBAction)toggleShowDatabases:(id)sender; - (IBAction)toggleShowSelectShowStatements:(id)sender; - (IBAction)toggleShowHelpStatements:(id)sender; @@ -92,8 +98,8 @@ extern NSString *SPTableViewConnectionColumnID; - (BOOL)allowConsoleUpdate; - (void)setAllowConsoleUpdate:(BOOL)allowUpdate; -- (void)showMessageInConsole:(NSString *)message connection:(NSString *)connection; -- (void)showErrorInConsole:(NSString *)error connection:(NSString *)connection; +- (void)showMessageInConsole:(NSString *)message connection:(NSString *)connection database:(NSString *)database; +- (void)showErrorInConsole:(NSString *)error connection:(NSString *)connection database:(NSString *)database; - (NSUInteger)consoleMessageCount; |