Skip to content

Commit a50f5bc

Browse files
committed
Added fix for issue sequelpro#239 to release branch
Added cleaned up html to release branch
1 parent d84ab1d commit a50f5bc

File tree

2 files changed

+5
-13
lines changed

2 files changed

+5
-13
lines changed

Resources/sequel-pro-print-template.html

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@
77
html {
88
font-size:82%;
99
}
10-
input, select, textarea {
11-
font-size:1em;
12-
}
13-
div.item label {
14-
white-space:nowrap;
15-
}
1610
.nowrap {
1711
white-space:nowrap;
1812
}
@@ -24,9 +18,6 @@
2418
background-color:#FFFFFF;
2519
color:#000000;
2620
}
27-
img {
28-
border:0 none;
29-
}
3021
table, th, td {
3122
border:0.1em solid #000000;
3223
}
@@ -40,6 +31,7 @@
4031
th, td {
4132
padding:0.2em;
4233
}
34+
4335
th {
4436
background-color:#E5E5E5;
4537
font-weight:bold;

Source/SPQueryConsole.m

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#define MESSAGE_TIME_STAMP_FORMAT @"%H:%M:%S"
2828

2929
#define DEFAULT_CONSOLE_LOG_FILENAME @"untitled"
30-
#define DEFAULT_CONSOLE_LOG_FILE_EXTENSION @"log"
30+
#define DEFAULT_CONSOLE_LOG_FILE_EXTENSION @"sql"
3131

3232
#define CONSOLE_WINDOW_AUTO_SAVE_NAME @"QueryConsole"
3333

@@ -454,7 +454,7 @@ - (void)_updateFilterState
454454
*/
455455
- (void)_addMessageToConsole:(NSString *)message isError:(BOOL)error
456456
{
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]];
458458

459459
[consoleMessage setIsError:error];
460460

@@ -479,7 +479,7 @@ - (void)_addMessageToConsole:(NSString *)message isError:(BOOL)error
479479
* and whether it should be hidden if the SELECT/SHOW toggle is off.
480480
*/
481481
- (BOOL)_messageMatchesCurrentFilters:(NSString *)message
482-
{
482+
{
483483
BOOL messageMatchesCurrentFilters = YES;
484484

485485
// Check whether to hide the message based on the current filter text, if any
@@ -492,7 +492,7 @@ - (BOOL)_messageMatchesCurrentFilters:(NSString *)message
492492
// If hiding SELECTs and SHOWs is toggled to on, check whether the message is a SELECT or SHOW
493493
if (messageMatchesCurrentFilters
494494
&& showSelectStatementsAreDisabled
495-
&& ([message hasPrefix:@"SELECT"] || [message hasPrefix:@"SHOW"]))
495+
&& ([[message uppercaseString] hasPrefix:@"SELECT"] || [[message uppercaseString] hasPrefix:@"SHOW"]))
496496
{
497497
messageMatchesCurrentFilters = NO;
498498
}

0 commit comments

Comments
 (0)