27
27
#define MESSAGE_TIME_STAMP_FORMAT @" %H:%M:%S "
28
28
29
29
#define DEFAULT_CONSOLE_LOG_FILENAME @" untitled"
30
- #define DEFAULT_CONSOLE_LOG_FILE_EXTENSION @" log "
30
+ #define DEFAULT_CONSOLE_LOG_FILE_EXTENSION @" sql "
31
31
32
32
#define CONSOLE_WINDOW_AUTO_SAVE_NAME @" QueryConsole"
33
33
@@ -454,7 +454,7 @@ - (void)_updateFilterState
454
454
*/
455
455
- (void )_addMessageToConsole : (NSString *)message isError : (BOOL )error
456
456
{
457
- SPConsoleMessage *consoleMessage = [SPConsoleMessage consoleMessageWithMessage: [[message stringByTrimmingCharactersInSet: [NSCharacterSet whitespaceAndNewlineCharacterSet ]] stringByAppendingString: @" ;" ] date: [NSDate date ]];
457
+ SPConsoleMessage *consoleMessage = [SPConsoleMessage consoleMessageWithMessage: [[[ message stringByTrimmingCharactersInSet: [NSCharacterSet whitespaceAndNewlineCharacterSet ]] stringByReplacingOccurrencesOfString: @" \n " withString: @" " ] stringByAppendingString: @" ;" ] date: [NSDate date ]];
458
458
459
459
[consoleMessage setIsError: error];
460
460
@@ -479,7 +479,7 @@ - (void)_addMessageToConsole:(NSString *)message isError:(BOOL)error
479
479
* and whether it should be hidden if the SELECT/SHOW toggle is off.
480
480
*/
481
481
- (BOOL )_messageMatchesCurrentFilters : (NSString *)message
482
- {
482
+ {
483
483
BOOL messageMatchesCurrentFilters = YES ;
484
484
485
485
// Check whether to hide the message based on the current filter text, if any
@@ -492,7 +492,7 @@ - (BOOL)_messageMatchesCurrentFilters:(NSString *)message
492
492
// If hiding SELECTs and SHOWs is toggled to on, check whether the message is a SELECT or SHOW
493
493
if (messageMatchesCurrentFilters
494
494
&& showSelectStatementsAreDisabled
495
- && ([message hasPrefix: @" SELECT" ] || [message hasPrefix: @" SHOW" ]))
495
+ && ([[ message uppercaseString ] hasPrefix: @" SELECT" ] || [[ message uppercaseString ] hasPrefix: @" SHOW" ]))
496
496
{
497
497
messageMatchesCurrentFilters = NO ;
498
498
}
0 commit comments