diff options
author | bamse16 <marius@marius.me.uk> | 2009-04-27 17:47:44 +0000 |
---|---|---|
committer | bamse16 <marius@marius.me.uk> | 2009-04-27 17:47:44 +0000 |
commit | a50f5bc1b5e4893ffefcc0ff38ca03851e106e0a (patch) | |
tree | eae0c9462577c887b1b6264850a7e53c4d58090d /Source/SPQueryConsole.m | |
parent | d84ab1d4372f54d04c6619061a2f2fb56f5d2097 (diff) | |
download | sequelpro-release-0.9.5.tar.gz sequelpro-release-0.9.5.tar.bz2 sequelpro-release-0.9.5.zip |
Added fix for issue #239 to release branchrelease-0.9.5
Added cleaned up html to release branch
Diffstat (limited to 'Source/SPQueryConsole.m')
-rw-r--r-- | Source/SPQueryConsole.m | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/SPQueryConsole.m b/Source/SPQueryConsole.m index 63fbee18..6e65b3a2 100644 --- a/Source/SPQueryConsole.m +++ b/Source/SPQueryConsole.m @@ -27,7 +27,7 @@ #define MESSAGE_TIME_STAMP_FORMAT @"%H:%M:%S" #define DEFAULT_CONSOLE_LOG_FILENAME @"untitled" -#define DEFAULT_CONSOLE_LOG_FILE_EXTENSION @"log" +#define DEFAULT_CONSOLE_LOG_FILE_EXTENSION @"sql" #define CONSOLE_WINDOW_AUTO_SAVE_NAME @"QueryConsole" @@ -454,7 +454,7 @@ static SPQueryConsole *sharedQueryConsole = nil; */ - (void)_addMessageToConsole:(NSString *)message isError:(BOOL)error { - SPConsoleMessage *consoleMessage = [SPConsoleMessage consoleMessageWithMessage:[[message stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] stringByAppendingString:@";"] date:[NSDate date]]; + SPConsoleMessage *consoleMessage = [SPConsoleMessage consoleMessageWithMessage:[[[message stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] stringByReplacingOccurrencesOfString:@"\n" withString:@" "] stringByAppendingString:@";"] date:[NSDate date]]; [consoleMessage setIsError:error]; @@ -479,7 +479,7 @@ static SPQueryConsole *sharedQueryConsole = nil; * and whether it should be hidden if the SELECT/SHOW toggle is off. */ - (BOOL)_messageMatchesCurrentFilters:(NSString *)message -{ +{ BOOL messageMatchesCurrentFilters = YES; // Check whether to hide the message based on the current filter text, if any @@ -492,7 +492,7 @@ static SPQueryConsole *sharedQueryConsole = nil; // If hiding SELECTs and SHOWs is toggled to on, check whether the message is a SELECT or SHOW if (messageMatchesCurrentFilters && showSelectStatementsAreDisabled - && ([message hasPrefix:@"SELECT"] || [message hasPrefix:@"SHOW"])) + && ([[message uppercaseString] hasPrefix:@"SELECT"] || [[message uppercaseString] hasPrefix:@"SHOW"])) { messageMatchesCurrentFilters = NO; } |