diff options
| author | rowanbeentje <rowan@beent.je> | 2010-04-24 01:36:34 +0000 |
|---|---|---|
| committer | rowanbeentje <rowan@beent.je> | 2010-04-24 01:36:34 +0000 |
| commit | a329d031aac349c0ad2b0768cc24ce69dc09a577 (patch) | |
| tree | 12a58d877c97b742ecb9b00c8b707f9128543c42 /Source/SPQueryController.m | |
| parent | b7d6974ed6993727bd5bd39ec905c69eecb709b8 (diff) | |
| download | sequelpro-a329d031aac349c0ad2b0768cc24ce69dc09a577.tar.gz sequelpro-a329d031aac349c0ad2b0768cc24ce69dc09a577.tar.bz2 sequelpro-a329d031aac349c0ad2b0768cc24ce69dc09a577.zip | |
Merge in a number of fixes from trunk (r2065, r2066, r2067, r2068, r2069, r2074, r2075, r2076, r2078, r2079, r2081, r2083, r2084, r2085, r2089, r2090, r2100, r2110, r2117, r2118, r2119, r2120, r2128, r2132, r2133, r2134, r2137, r2138, r2139, r2140, r2142, r2150, r2152, r2153, r2154, r2155, r2158, and r2160)
Diffstat (limited to 'Source/SPQueryController.m')
| -rw-r--r-- | Source/SPQueryController.m | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/Source/SPQueryController.m b/Source/SPQueryController.m index d34655e7..b6a64636 100644 --- a/Source/SPQueryController.m +++ b/Source/SPQueryController.m @@ -777,7 +777,8 @@ static SPQueryController *sharedQueryController = nil; - (void)dealloc { messagesVisibleSet = nil; - + [NSObject cancelPreviousPerformRequestsWithTarget:self]; + [dateFormatter release], dateFormatter = nil; [messagesFullSet release], messagesFullSet = nil; @@ -941,8 +942,15 @@ static SPQueryController *sharedQueryController = nil; */ - (void)_addMessageToConsole:(NSString *)message connection:(NSString *)connection isError:(BOOL)error { - SPConsoleMessage *consoleMessage = [SPConsoleMessage consoleMessageWithMessage:[[[message stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] stringByReplacingOccurrencesOfString:@"\n" withString:@" "] stringByAppendingString:@";"] date:[NSDate date] connection:connection]; - + NSString *messageTemp = [[message stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] stringByReplacingOccurrencesOfString:@"\n" withString:@" "]; + + // Only append a semi-colon (;) if the supplied message is not an error + if (!error) { + messageTemp = [messageTemp stringByAppendingString:@";"]; + } + + SPConsoleMessage *consoleMessage = [SPConsoleMessage consoleMessageWithMessage:messageTemp date:[NSDate date] connection:connection]; + [consoleMessage setIsError:error]; [messagesFullSet addObject:consoleMessage]; |