Rework data loading in TableContent:

 - Data loading now only occurs in one place in the code.  This improves consistency and fixes a number of actions which used to trigger a full table reload followed instantly by a filter when the action was performed
 - If "Reload data after..." prefs are unticked, no longer load the data (ie the preference now works)
 - Make table count text more consistent and useful
 - Fix a number of small position-saving type problems with filters and limits active.  This fixes Issue #200.
 - Clean up and standardise the code dealing with data storage - only one data storage array is now used.

3 files changed, 364 insertions, 491 deletions

diff --git a/Source/TableContent.h b/Source/TableContent.h
index ba9d9b51..ea09a325 100644
--- a/Source/TableContent.h
+++ b/Source/TableContent.h
@@ -51,18 +51,17 @@
 	IBOutlet id limitRowsField;
 	IBOutlet id limitRowsButton;
 	IBOutlet id limitRowsStepper;
-	IBOutlet id limitRowsText;
 	
 	MCPConnection *mySQLConnection;
 	
 	NSString *selectedTable, *usedQuery;
-	NSMutableArray *fullResult, *filteredResult, *dataColumns, *keys, *oldRow;
+	NSMutableArray *tableValues, *dataColumns, *keys, *oldRow;
 	NSString *compareType;
 	NSNumber *sortCol;
 	BOOL isEditingRow, isEditingNewRow, isSavingRow, isDesc, setLimit;
+	BOOL isFiltered, isLimited;
 	NSUserDefaults *prefs;
 	int numRows, currentlyEditingRow, maxNumRowsOfCurrentTable;
-	bool areShowingAllRows;
 
 	BOOL sortColumnToRestoreIsAsc;
 	NSString *sortColumnToRestore;
@@ -72,15 +71,18 @@
 	NSString *filterFieldToRestore, *filterComparisonToRestore, *filterValueToRestore;
 }
 
-//table methods
-- (void)loadTable:(NSString *)aTable;
-- (IBAction)reloadTable:(id)sender;
-- (IBAction)reloadTableValues:(id)sender;
-- (IBAction)filterTable:(id)sender;
-- (IBAction)showAll:(id)sender;
-- (IBAction)toggleFilterField:(id)sender;
-- (NSString *)usedQuery;
-- (void)setUsedQuery:(NSString *)query;
+// Table loading methods and information
+- (void) loadTable:(NSString *)aTable;
+- (void) loadTableValues;
+- (NSString *) tableFilterString;
+- (void) updateCountText;
+
+// Table interface actions
+- (IBAction) reloadTable:(id)sender;
+- (IBAction) filterTable:(id)sender;
+- (IBAction) toggleFilterField:(id)sender;
+- (NSString *) usedQuery;
+- (void) setUsedQuery:(NSString *)query;
 
 //edit methods
 - (IBAction)addRow:(id)sender;
@@ -135,7 +137,6 @@ objectValueForTableColumn:(NSTableColumn *)aTableColumn
 //tableView delegate methods
 - (void)tableView:(NSTableView*)tableView didClickTableColumn:(NSTableColumn *)tableColumn;
 - (void)tableViewSelectionDidChange:(NSNotification *)aNotification;
-- (void)tableViewSelectionIsChanging:(NSNotification *)aNotification;
 - (void)tableViewColumnDidResize:(NSNotification *)aNotification;
 - (BOOL)tableView:(NSTableView *)aTableView shouldEditTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex;
 - (BOOL)tableView:(NSTableView *)tableView writeRows:(NSArray*)rows toPasteboard:(NSPasteboard*)pboard;
diff --git a/Source/TableContent.m b/Source/TableContent.m
index e94037f3..a6f647d7 100644
--- a/Source/TableContent.m
+++ b/Source/TableContent.m
@@ -52,8 +52,7 @@
 {
 	if ((self == [super init])) {
 		
-		fullResult     = [[NSMutableArray alloc] init];
-		filteredResult = [[NSMutableArray alloc] init];
+		tableValues      = [[NSMutableArray alloc] init];
 		dataColumns    = [[NSMutableArray alloc] init];
 		oldRow         = [[NSMutableArray alloc] init];
 		
@@ -63,7 +62,6 @@
 		// editData	  = nil;
 		keys		  = nil;
 
-		areShowingAllRows = false;
 		currentlyEditingRow = -1;
 
 		sortColumnToRestore = nil;
@@ -74,6 +72,8 @@
 		filterFieldToRestore = nil;
 		filterComparisonToRestore = nil;
 		filterValueToRestore = nil;
+		isFiltered = NO;
+		isLimited = NO;
 		
 		prefs = [NSUserDefaults standardUserDefaults];
 		
@@ -89,9 +89,12 @@
 	[tableContentView setGridStyleMask:([prefs boolForKey:@"DisplayTableViewVerticalGridlines"]) ? NSTableViewSolidVerticalGridLineMask : NSTableViewGridNone];
 }
 
+#pragma mark -
+#pragma mark Table loading methods and information
+
 /*
  * Loads aTable, retrieving column information and updating the tableViewColumns before
- * reloading table data into the fullResults array and redrawing the table.
+ * reloading table data into the data array and redrawing the table.
  */
 - (void)loadTable:(NSString *)aTable
 {
@@ -100,8 +103,6 @@
 	NSArray *columnNames;
 	NSDictionary *columnDefinition;
 	NSTableColumn	*theCol;
-	NSString	*query;
-	MCPResult	*queryResult;
 
 	// Clear the selection, and abort the reload if the user is still editing a row
 	[tableContentView deselectAll:self];
@@ -131,10 +132,10 @@
 	if ( [[[tableDataInstance statusValues] objectForKey:@"Rows"] isKindOfClass:[NSNull class]] || [aTable isEqualToString:@""] || !aTable || [tableDataInstance tableEncoding] == nil)
 	{
 		// Empty the stored data arrays
-		[fullResult removeAllObjects];
-		[filteredResult removeAllObjects];
+		[tableValues removeAllObjects];
 		[tableContentView reloadData];
-		areShowingAllRows = YES;
+		isFiltered = NO;
+		isLimited = NO;
 		[countText setStringValue:@""];
 
 		// Empty and disable filter options
@@ -150,7 +151,6 @@
 
 		// Empty and disable the limit field
 		[limitRowsField setStringValue:@""];
-		[limitRowsText setStringValue:NSLocalizedString(@"No limit", @"text showing that the result isn't limited")];
 		[limitRowsField setEnabled:NO];
 		[limitRowsButton setEnabled:NO];
 		[limitRowsStepper setEnabled:NO];
@@ -195,9 +195,8 @@
 	// to adjustify "Limit From:"
 	maxNumRowsOfCurrentTable = [[[tableDataInstance statusValues] objectForKey:@"Rows"] intValue];
 
-	// Retrieve the number of rows in the table and initially mark all as being visible.
+	// Retrieve the number of rows in the table
 	numRows = [self getNumberOfRows];
-	areShowingAllRows = YES;
 	
 	NSString *nullValue = [prefs objectForKey:@"NullValue"];
 	
@@ -318,7 +317,6 @@
 		{
 			if (filterComparisonToRestore) [compareField selectItemWithTitle:filterComparisonToRestore];
 			if (filterValueToRestore) [argumentField setStringValue:filterValueToRestore];
-			areShowingAllRows = NO;
 		}
 	}
 
@@ -335,59 +333,20 @@
 		[limitRowsField setEnabled:YES];
 		[limitRowsButton setEnabled:YES];
 		[limitRowsStepper setEnabled:YES];
-		[limitRowsText setStringValue:[NSString stringWithFormat:NSLocalizedString(@"Limited to %d rows starting with row", @"text showing the number of rows the result is limited to"),
-									   [prefs integerForKey:@"LimitResultsValue"]]];
-		if ([prefs integerForKey:@"LimitResultsValue"] < numRows)
-			areShowingAllRows = NO;
 	} else {
 		[limitRowsField setEnabled:NO];
 		[limitRowsButton setEnabled:NO];
 		[limitRowsStepper setEnabled:NO];
 		[limitRowsField setStringValue:@""];
-		[limitRowsText setStringValue:NSLocalizedString(@"No limit", @"text showing that the result isn't limited")];
 	}
 
-	// set the state of the table buttons
+	// Set the state of the table buttons
 	[addButton setEnabled:YES];
 	[copyButton setEnabled:NO];
 	[removeButton setEnabled:NO];
 
-	// Perform the data query and store the result as an array containing a dictionary per result row
-	query = [NSString stringWithFormat:@"SELECT %@ FROM %@", [self fieldListForQuery], [selectedTable backtickQuotedString]];
-	if ( sortCol ) {
-		query = [NSString stringWithFormat:@"%@ ORDER BY %@", query, [[[dataColumns objectAtIndex:[sortCol intValue]] objectForKey:@"name"] backtickQuotedString]];
-		if ( isDesc )
-			query = [query stringByAppendingString:@" DESC"];
-	}
-	
-	if ( [prefs boolForKey:@"LimitResults"] ) {
-		if ( [limitRowsField intValue] <= 0 ) {
-			[limitRowsField setStringValue:@"1"];
-		}
-		query = [query stringByAppendingString:
-					[NSString stringWithFormat:@" LIMIT %d,%d",
-						[limitRowsField intValue]-1, [prefs integerForKey:@"LimitResultsValue"]]];
-	}
-
-	[self setUsedQuery:query];
-	
-	queryResult = [mySQLConnection queryString:query];
-	if ( queryResult == nil ) {
-		NSLog(@"Loading table data for %@ failed, query string was: %@", aTable, query);
-		return;
-	}
-	
-	[fullResult setArray:[self fetchResultAsArray:queryResult]];
-	
-	// Apply any filtering and update the row count
-	if (!areShowingAllRows) {
-		[self filterTable:self];
-		[countText setStringValue:[NSString stringWithFormat:NSLocalizedString(@"%d rows of %d selected", @"text showing how many rows are in the filtered result"), [filteredResult count], numRows]];
-	}
-	else {
-		[filteredResult setArray:fullResult];
-		[countText setStringValue:[NSString stringWithFormat:NSLocalizedString(@"%d rows in table", @"text showing how many rows are in the result"), [fullResult count]]];
-	}
+	// Trigger a data refresh
+	[self loadTableValues];
 
 	// Restore the view origin if appropriate
 	if (!NSEqualRects(selectionViewportToRestore, NSZeroRect)) {
@@ -404,7 +363,7 @@
 	[tableContentView reloadData];
 	
 	// Init copyTable with necessary information for copying selected rows as SQL INSERT
-	[tableContentView setTableInstance:self withTableData:filteredResult withColumns:dataColumns withTableName:selectedTable withConnection:mySQLConnection];
+	[tableContentView setTableInstance:self withTableData:tableValues withColumns:dataColumns withTableName:selectedTable withConnection:mySQLConnection];
 
 	// Post the notification that the query is finished
 	[[NSNotificationCenter defaultCenter] postNotificationName:@"SMySQLQueryHasBeenPerformed" object:self];
@@ -413,112 +372,329 @@
 	[self clearDetailsToRestore];
 }
 
-/*
- * Reloads the current table data, performing a new SQL query. Now attempts to preserve sort order, filters, and viewport.
- */
-- (IBAction)reloadTable:(id)sender
-{
-	// Check whether a save of the current row is required.
-	if (![self saveRowOnDeselect]) return;
-
-	// Save view details to restore safely if possible
-	[self storeCurrentDetailsForRestoration];
-
-	// Clear the table data column cache
-	[tableDataInstance resetColumnData];
-
-	// Load the table's data
-	[self loadTable:selectedTable];
-}
-
-/*
- * Reload the table values without reconfiguring the tableView (with filter and limit if set)
+/**
+ * Reload the table data without reconfiguring the tableView,
+ * using filters and limits as appropriate.
+ * Will not refresh the table view itself.
  */
-- (IBAction)reloadTableValues:(id)sender
+- (void) loadTableValues
 {
-
-	//if no table is selected return
+	// If no table is selected, return
 	if(!selectedTable) return;
 
-	NSString *queryString;
+	NSMutableString *queryString;
+	NSString *queryStringBeforeLimit = nil;
+	NSString *filterString;
 	MCPResult *queryResult;
 	
-	//query started
+	// Notify any listeners that a query has started
 	[[NSNotificationCenter defaultCenter] postNotificationName:@"SMySQLQueryWillBePerformed" object:self];
 	
-	// Store the current first responder so filter field doesn't steal focus
-	id currentFirstResponder = [tableWindow firstResponder];
+	// Start construction of the query string
+	queryString = [NSMutableString stringWithFormat:@"SELECT %@ FROM %@", [self fieldListForQuery], [selectedTable backtickQuotedString]];
 
-	//enable or disable limit fields
-	if ( [prefs boolForKey:@"LimitResults"] ) {
-		[limitRowsField setEnabled:YES];
-		[limitRowsButton setEnabled:YES];
-		[limitRowsStepper setEnabled:YES];
-		[limitRowsText setStringValue:[NSString stringWithFormat:NSLocalizedString(@"Limited to %d rows starting with row", @"text showing the number of rows the result is limited to"),
-									   [prefs integerForKey:@"LimitResultsValue"]]];
+	// Add a filter string if appropriate
+	filterString = [self tableFilterString];
+	if (filterString) {
+		[queryString appendFormat:@" WHERE %@", filterString];
+		isFiltered = YES;
 	} else {
-		[limitRowsField setEnabled:NO];
-		[limitRowsButton setEnabled:NO];
-		[limitRowsStepper setEnabled:NO];
-		[limitRowsText setStringValue:NSLocalizedString(@"No limit", @"text showing that the result isn't limited")];
-		[limitRowsField setStringValue:@""];
+		isFiltered = NO;
 	}
 
-	[tableWindow makeFirstResponder:currentFirstResponder];
-	
-	//	queryString = [@"SELECT * FROM " stringByAppendingString:selectedTable];
-	queryString = [NSString stringWithFormat:@"SELECT %@ FROM %@", [self fieldListForQuery], [selectedTable backtickQuotedString]];
-	if ( sortCol ) {
-		queryString = [NSString stringWithFormat:@"%@ ORDER BY %@", queryString, [[[dataColumns objectAtIndex:[sortCol intValue]] objectForKey:@"name"] backtickQuotedString]];
-		//		queryString = [queryString stringByAppendingString:[NSString stringWithFormat:@" ORDER BY %@", [sortField backtickQuotedString]]];
-		if ( isDesc )
-			queryString = [queryString stringByAppendingString:@" DESC"];
+	// Add sorting details if appropriate
+	if (sortCol) {
+		[queryString appendFormat:@" ORDER BY @%", [[[dataColumns objectAtIndex:[sortCol intValue]] objectForKey:@"name"] backtickQuotedString]];
+		if (isDesc) [queryString appendString:@" DESC"];
 	}
-	if ( [prefs boolForKey:@"LimitResults"] ) {
-		if ( [limitRowsField intValue] <= 0 ) {
+
+	// Check to see if a limit needs to be applied
+	if ([prefs boolForKey:@"LimitResults"]) {
+
+		// Ensure the limit isn't negative
+		if ([limitRowsField intValue] <= 0) {
 			[limitRowsField setStringValue:@"1"];
 		}
-		queryString = [queryString stringByAppendingString:
-					   [NSString stringWithFormat:@" LIMIT %d,%d",
-						[limitRowsField intValue]-1, [prefs integerForKey:@"LimitResultsValue"]]];
-		[limitRowsField selectText:self];
+
+		// If the result set is being limited, take a copy of the string to allow resetting limit
+		// if no results are found
+		if ([limitRowsField intValue] > 1) {
+			queryStringBeforeLimit = [NSString stringWithString:queryString];
+		}
+
+		// Append the limit settings
+		[queryString appendFormat:@" LIMIT %d,%d", [limitRowsField intValue]-1, [prefs integerForKey:@"LimitResultsValue"]];
 	}
 	
 	[self setUsedQuery:queryString];
 	
+	// Run the query and capture the result
 	queryResult = [mySQLConnection queryString:queryString];
-	//	[fullResult setArray:[[self fetchResultAsArray:queryResult] retain]];
-	[fullResult setArray:[self fetchResultAsArray:queryResult]];
+	[tableValues setArray:[self fetchResultAsArray:queryResult]];
 	numRows = [self getNumberOfRows];
-	if ( !areShowingAllRows ) {
-		[self filterTable:self];
-		[countText setStringValue:[NSString stringWithFormat:NSLocalizedString(@"%d rows of %d selected", @"text showing how many rows are in the filtered result"), [filteredResult count], numRows]];
+
+	// If the result is empty, and a limit is active, reset the limit
+	if ([prefs boolForKey:@"LimitResults"] && queryStringBeforeLimit && ![tableValues count]) {
+		[limitRowsField setStringValue:@"1"];
+		queryString = [NSMutableString stringWithFormat:@"%@ LIMIT 0,%d", queryStringBeforeLimit, [prefs integerForKey:@"LimitResultsValue"]];
+		[self setUsedQuery:queryString];
+		queryResult = [mySQLConnection queryString:queryString];
+		[tableValues setArray:[self fetchResultAsArray:queryResult]];
+		numRows = [self getNumberOfRows];
+	}
+
+	if ([prefs boolForKey:@"LimitResults"]
+		&& ([limitRowsField intValue] > 1
+			|| [tableValues count] == [prefs integerForKey:@"LimitResultsValue"]))
+	{
+		isLimited = YES;
 	} else {
-		[filteredResult setArray:fullResult];
-		[countText setStringValue:[NSString stringWithFormat:NSLocalizedString(@"%d rows in table", @"text showing how many rows are in the result"), numRows]];
+		isLimited = NO;
 	}
-	[tableContentView reloadData];
+
+	// Set the filter text
+	[self updateCountText];
 	
-	//query finished
+	// Notify listenters that the query has finished
 	[[NSNotificationCenter defaultCenter] postNotificationName:@"SMySQLQueryHasBeenPerformed" object:self];
 }
 
+/**
+ * Returns the query string for the current filter settings,
+ * ready to be dropped into a WHERE clause, or nil if no filtering
+ * is active.
+ */
+- (NSString *) tableFilterString
+{
+	BOOL doQuote = YES;
+	BOOL ignoreArgument = NO;
+	int i;
+	int tag = [[compareField selectedItem] tag];
+	NSString *filterString;
+	NSString *compareOperator = @"";
+	NSMutableString *argument = [[NSMutableString alloc] initWithString:[argumentField stringValue]];
+
+	// If the filter field is empty and the selected filter is not looking
+	// for NULLs or NOT NULLs, then no filtering is required - return nil.
+	if (([argument length] == 0)
+		&& (![[[compareField selectedItem] title] hasSuffix:@"NULL"]))
+	{
+		[argument release];
+		return nil;
+	}
+
+	// Construct the filter string
+	if (![compareType isEqualToString:@""]) {
+		if ([compareType isEqualToString:@"string"]) {
+			// String comparision
+			switch (tag) {
+				case 0:
+					compareOperator = @"LIKE";
+					break;
+				case 1:
+					compareOperator = @"NOT LIKE";
+					break;
+				case 2:
+					compareOperator = @"LIKE";
+					[argument setString:[[@"%" stringByAppendingString:argument] stringByAppendingString:@"%"]];
+					break;
+				case 3:
+					compareOperator = @"NOT LIKE";
+					[argument setString:[[@"%" stringByAppendingString:argument] stringByAppendingString:@"%"]];
+					break;
+				case 4:
+					compareOperator = @"IN";
+					doQuote = NO;
+					[argument setString:[[@"(" stringByAppendingString:argument] stringByAppendingString:@")"]];
+					break;
+				case 5:
+					compareOperator = @"IS NULL";
+					doQuote = NO;
+					ignoreArgument = YES;
+					break;
+				case 6:
+					compareOperator = @"IS NOT NULL";
+					doQuote = NO;
+					ignoreArgument = YES;
+					break;
+			}
+		} else if ( [compareType isEqualToString:@"number"] ) {
+			//number comparision
+			switch ( tag ) {
+				case 0:
+					compareOperator = @"=";
+					break;
+				case 1:
+					compareOperator = @"!=";
+					break;
+				case 2:
+					compareOperator = @">";
+					break;
+				case 3:
+					compareOperator = @"<";
+					break;
+				case 4:
+					compareOperator = @">=";
+					break;
+				case 5:
+					compareOperator = @"<=";
+					break;
+				case 6:
+					compareOperator = @"IN";
+					doQuote = NO;
+					[argument setString:[[@"(" stringByAppendingString:argument] stringByAppendingString:@")"]];
+					break;
+				case 7:
+					compareOperator = @"LIKE";
+					doQuote = YES;
+					ignoreArgument = YES;
+					break;
+				case 8:
+					compareOperator = @"IS NULL";
+					doQuote = NO;
+					ignoreArgument = YES;
+					break;
+				case 9:
+					compareOperator = @"IS NOT NULL";
+					doQuote = NO;
+					ignoreArgument = YES;
+					break;
+			}
+		} else if ( [compareType isEqualToString:@"date"] ) {
+			//date comparision
+			switch ( tag ) {
+				case 0:
+					compareOperator = @"=";
+					break;
+				case 1:
+					compareOperator = @"!=";
+					break;
+				case 2:
+					compareOperator = @">";
+					break;
+				case 3:
+					compareOperator = @"<";
+					break;
+				case 4:
+					compareOperator = @">=";
+					break;
+				case 5:
+					compareOperator = @"<=";
+					break;
+				case 6:
+					compareOperator = @"IS NULL";
+					doQuote = NO;
+					ignoreArgument = YES;
+					break;
+				case 7:
+					compareOperator = @"IS NOT NULL";
+					doQuote = NO;
+					ignoreArgument = YES;
+					break;
+			}
+		} else {
+			doQuote = NO;
+			ignoreArgument = YES;
+			NSLog(@"ERROR: unknown compare type %@", compareType);
+		}
+		
+		if (doQuote) {
+			//escape special characters
+			for ( i = 0 ; i < [argument length] ; i++ ) {
+				if ( [argument characterAtIndex:i] == '\\' ) {
+					[argument insertString:@"\\" atIndex:i];
+					i++;
+				}
+			}
+			[argument setString:[mySQLConnection prepareString:argument]];
+			filterString = [NSString stringWithFormat:@"%@ %@ \"%@\"",
+							[[fieldField titleOfSelectedItem] backtickQuotedString], compareOperator, argument];			
+		} else {
+			filterString = [NSString stringWithFormat:@"%@ %@ %@",
+							[[fieldField titleOfSelectedItem] backtickQuotedString],
+							compareOperator, (ignoreArgument) ? @"" : argument];
+		}
+	}
+	
+	[argument release];
+
+	// Return the filter string
+	return filterString;
+}
+
+/*
+ * Update the table count/selection text
+ */
+- (void) updateCountText
+{
+	NSString *rowString;
+	NSMutableString *countString = [NSMutableString string];
+
+	// If no filter or limit is active, show just the count of rows in the table
+	if (!isFiltered && !isLimited) {
+		if ([tableValues count] == 1)
+			[countString appendFormat:NSLocalizedString(@"%d row in table", @"text showing a single row in the result"), [tableValues count]];
+		else
+			[countString appendFormat:NSLocalizedString(@"%d rows in table", @"text showing how many rows are in the result"), [tableValues count]];
+
+	// If a limit is active, display a string suggesting a limit is active
+	} else if (!isFiltered && isLimited) {
+		[countString appendFormat:NSLocalizedString(@"Rows %d-%d from table", @"text showing how many rows are in the limited result"), [limitRowsField intValue], [limitRowsField intValue]+[tableValues count]-1];
+
+	// If just a filter is active, show a count and an indication a filter is active
+	} else if (isFiltered && !isLimited) {
+		if ([tableValues count] == 1)
+			[countString appendFormat:NSLocalizedString(@"%d row matches filter", @"text showing how a single rows matched filter"), [tableValues count]];
+		else
+			[countString appendFormat:NSLocalizedString(@"%d rows match filter", @"text showing how many rows matched filter"), [tableValues count]];
+
+	// If both a filter and limit is active, display full string
+	} else {
+		[countString appendFormat:NSLocalizedString(@"Rows %d-%d rows from filter matches", @"text showing how many rows are in the limited filter match"), [limitRowsField intValue], [limitRowsField intValue]+[tableValues count]-1];
+	}
+
+	// If rows are selected, append selection count
+	if ([tableContentView numberOfSelectedRows] > 0) {
+		[countString appendString:@"; "];
+		if ([tableContentView numberOfSelectedRows] == 1)
+			rowString = [NSString stringWithString:NSLocalizedString(@"row", @"singular word for row")];
+		else
+			rowString = [NSString stringWithString:NSLocalizedString(@"rows", @"plural word for rows")];
+		[countString appendFormat:NSLocalizedString(@"%d %@ selected", @"text showing how many rows are selected"), [tableContentView numberOfSelectedRows], rowString];
+	}
+
+	[countText setStringValue:countString];
+}
+
+#pragma mark -
+#pragma mark Table interface actions
+
+/*
+ * Reloads the current table data, performing a new SQL query. Now attempts to preserve sort order, filters, and viewport.
+ */
+- (IBAction)reloadTable:(id)sender
+{
+	// Check whether a save of the current row is required.
+	if (![self saveRowOnDeselect]) return;
+
+	// Save view details to restore safely if possible
+	[self storeCurrentDetailsForRestoration];
+
+	// Clear the table data column cache
+	[tableDataInstance resetColumnData];
+
+	// Load the table's data
+	[self loadTable:selectedTable];
+}
 
 /*
  * Filter the table with arguments given by the user
  */
 - (IBAction)filterTable:(id)sender
 {
-	MCPResult *theResult;
-	int tag = [[compareField selectedItem] tag];
-	NSString *compareOperator = @"";
-	NSMutableString *argument = [[NSMutableString alloc] initWithString:[argumentField stringValue]];
-	NSString *queryString;
-	int i;
 
 	// Check whether a save of the current row is required.
 	if ( ![self saveRowOnDeselect] ) {
-		[argument release];
 		return;
 	}
 
@@ -530,222 +706,18 @@
 		[limitRowsField setStringValue:@"1"];
 	}
 
-	// If limitRowsField > number of total found rows show the last limitRowsValue rows
+	// If limitRowsField > number of total table rows show the last limitRowsValue rows
 	if ( [prefs boolForKey:@"LimitResults"] && [limitRowsField intValue] >= maxNumRowsOfCurrentTable ) {
 		int newLimit = maxNumRowsOfCurrentTable - [prefs integerForKey:@"LimitResultsValue"];
 		[limitRowsField setStringValue:[[NSNumber numberWithInt:(newLimit<1)?1:newLimit] stringValue]];
 	}
 
-	
-	// If the filter field is empty, the limit field is at 1, and the selected filter is not looking
-	// for NULLs or NOT NULLs, then don't allow filtering.
-	if (([argument length] == 0) && (![[[compareField selectedItem] title] hasSuffix:@"NULL"]) && (![prefs boolForKey:@"LimitResults"] || [limitRowsField intValue] == 1)) {
-		[argument release];
-		[self showAll:sender];
-		return;
-	}
-	
-	// Query started
-	[[NSNotificationCenter defaultCenter] postNotificationName:@"SMySQLQueryWillBePerformed" object:self];
-	
-	BOOL doQuote = YES;
-	BOOL ignoreArgument = NO;
-
-	// Start building the query string
-	queryString = [NSString stringWithFormat:@"SELECT %@ FROM %@", [self fieldListForQuery], [selectedTable backtickQuotedString]];			
-
-	// Add filter if appropriate
-	if (([argument length] > 0) || [[[compareField selectedItem] title] hasSuffix:@"NULL"]) {
-		if (![compareType isEqualToString:@""]) {
-			if ([compareType isEqualToString:@"string"]) {
-				// String comparision
-				switch (tag) {
-					case 0:
-						compareOperator = @"LIKE";
-						break;
-					case 1:
-						compareOperator = @"NOT LIKE";
-						break;
-					case 2:
-						compareOperator = @"LIKE";
-						[argument setString:[[@"%" stringByAppendingString:argument] stringByAppendingString:@"%"]];
-						break;
-					case 3:
-						compareOperator = @"NOT LIKE";
-						[argument setString:[[@"%" stringByAppendingString:argument] stringByAppendingString:@"%"]];
-						break;
-					case 4:
-						compareOperator = @"IN";
-						doQuote = NO;
-						[argument setString:[[@"(" stringByAppendingString:argument] stringByAppendingString:@")"]];
-						break;
-					case 5:
-						compareOperator = @"IS NULL";
-						doQuote = NO;
-						ignoreArgument = YES;
-						break;
-					case 6:
-						compareOperator = @"IS NOT NULL";
-						doQuote = NO;
-						ignoreArgument = YES;
-						break;
-				}
-			} else if ( [compareType isEqualToString:@"number"] ) {
-				//number comparision
-				switch ( tag ) {
-					case 0:
-						compareOperator = @"=";
-						break;
-					case 1:
-						compareOperator = @"!=";
-						break;
-					case 2:
-						compareOperator = @">";
-						break;
-					case 3:
-						compareOperator = @"<";
-						break;
-					case 4:
-						compareOperator = @">=";
-						break;
-					case 5:
-						compareOperator = @"<=";
-						break;
-					case 6:
-						compareOperator = @"IN";
-						doQuote = NO;
-						[argument setString:[[@"(" stringByAppendingString:argument] stringByAppendingString:@")"]];
-						break;
-					case 7:
-						compareOperator = @"LIKE";
-						doQuote = YES;
-						ignoreArgument = YES;
-						break;
-					case 8:
-						compareOperator = @"IS NULL";
-						doQuote = NO;
-						ignoreArgument = YES;
-						break;
-					case 9:
-						compareOperator = @"IS NOT NULL";
-						doQuote = NO;
-						ignoreArgument = YES;
-						break;
-				}
-			} else if ( [compareType isEqualToString:@"date"] ) {
-				//date comparision
-				switch ( tag ) {
-					case 0:
-						compareOperator = @"=";
-						break;
-					case 1:
-						compareOperator = @"!=";
-						break;
-					case 2:
-						compareOperator = @">";
-						break;
-					case 3:
-						compareOperator = @"<";
-						break;
-					case 4:
-						compareOperator = @">=";
-						break;
-					case 5:
-						compareOperator = @"<=";
-						break;
-					case 6:
-						compareOperator = @"IS NULL";
-						doQuote = NO;
-						ignoreArgument = YES;
-						break;
-					case 7:
-						compareOperator = @"IS NOT NULL";
-						doQuote = NO;
-						ignoreArgument = YES;
-						break;
-				}
-			} else {
-				doQuote = NO;
-				ignoreArgument = YES;
-				NSLog(@"ERROR: unknown compare type %@", compareType);
-			}
-			
-			if (doQuote) {
-				//escape special characters
-				for ( i = 0 ; i < [argument length] ; i++ ) {
-					if ( [argument characterAtIndex:i] == '\\' ) {
-						[argument insertString:@"\\" atIndex:i];
-						i++;
-					}
-				}
-				[argument setString:[mySQLConnection prepareString:argument]];
-				queryString = [NSString stringWithFormat:@"%@ WHERE %@ %@ \"%@\"",
-								queryString, [[fieldField titleOfSelectedItem] backtickQuotedString], compareOperator, argument];			
-			} else {
-				queryString = [NSString stringWithFormat:@"%@ WHERE %@ %@ %@",
-								queryString, [[fieldField titleOfSelectedItem] backtickQuotedString],
-								compareOperator, (ignoreArgument) ? @"" : argument];
-			}
-		}
-	}
-
-	// Add sorting details if appropriate
-	if ( sortCol ) {
-		queryString = [NSString stringWithFormat:@"%@ ORDER BY %@", queryString, [[[dataColumns objectAtIndex:[sortCol intValue]] objectForKey:@"name"] backtickQuotedString]];
-		if ( isDesc )
-			queryString = [queryString stringByAppendingString:@" DESC"];
-	}
-
-	// retain the query before LIMIT
-	// to redo the query if nothing found for LIMIT > 1
-	NSString* tempQueryString;
-	// LIMIT if appropriate
-	if ( [prefs boolForKey:@"LimitResults"] ) {
-		tempQueryString = [NSString stringWithString:queryString];
-		queryString = [NSString stringWithFormat:@"%@ LIMIT %d,%d", queryString,
-						[limitRowsField intValue]-1, [prefs integerForKey:@"LimitResultsValue"]];
-	}
-
-	[self setUsedQuery:queryString];
-	
-	theResult = [mySQLConnection queryString:queryString];
-	[filteredResult setArray:[self fetchResultAsArray:theResult]];
-	
-	// try it again if theResult is empty and limitRowsField > 1 by setting LIMIT to 0, limitRowsValue
-	if([prefs boolForKey:@"LimitResults"] && [limitRowsField intValue] > 1 && [filteredResult count] == 0) {
-		queryString = [NSString stringWithFormat:@"%@ LIMIT %d,%d", tempQueryString,
-						0, [prefs integerForKey:@"LimitResultsValue"]];
-		theResult = [mySQLConnection queryString:queryString];
-		[limitRowsField setStringValue:@"1"];
-		[filteredResult setArray:[self fetchResultAsArray:theResult]];
-	}
-	
-	[countText setStringValue:[NSString stringWithFormat:NSLocalizedString(@"%d rows of %d selected", @"text showing how many rows are in the filtered result"), [filteredResult count], numRows]];
+	// Reload data using the new filter settings
+	[self loadTableValues];
 	
 	// Reset the table view
 	[tableContentView scrollPoint:NSMakePoint(0.0, 0.0)];
 	[tableContentView reloadData];
-	areShowingAllRows = NO;
-	
-	//query finished
-	[[NSNotificationCenter defaultCenter] postNotificationName:@"SMySQLQueryHasBeenPerformed" object:self];
-	[argument release];
-}
-
-/**
- * reload tableView with all results shown (no new mysql-query, it uses simply the fullResult array)
- */
-- (IBAction)showAll:(id)sender
-{
-
-	// Check whether a save of the current row is required.
-	if ( ![self saveRowOnDeselect] ) return;
-
-	[filteredResult setArray:fullResult];
-	[tableContentView reloadData];
-	areShowingAllRows = YES;
-	
-	[countText setStringValue:[NSString stringWithFormat:NSLocalizedString(@"%d rows in table", @"text showing how many rows are in the result"), numRows]];
 }
 
 /**
@@ -791,7 +763,7 @@
 			[newRow addObject:[column objectForKey:@"default"]];
 		}
 	}
-	[filteredResult addObject:newRow];
+	[tableValues addObject:newRow];
 
 	[tableContentView reloadData];
 	[tableContentView selectRow:[tableContentView numberOfRows]-1 byExtendingSelection:NO];
@@ -824,8 +796,8 @@
 	}
 	
 	//copy row
-	tempRow = [NSMutableArray arrayWithArray:[filteredResult objectAtIndex:[tableContentView selectedRow]]];
-	[filteredResult insertObject:tempRow atIndex:[tableContentView selectedRow]+1];
+	tempRow = [NSMutableArray arrayWithArray:[tableValues objectAtIndex:[tableContentView selectedRow]]];
+	[tableValues insertObject:tempRow atIndex:[tableContentView selectedRow]+1];
 	
 	//if we don't show blobs, read data for this duplicate column from db
 	if ([prefs boolForKey:@"LoadBlobsAsNeeded"]) {
@@ -941,7 +913,7 @@
 		[tempRow removeAllObjects];
 		enumerator = [tableColumns objectEnumerator];
 		while ( (tableColumn = [enumerator nextObject]) ) {
-			id o = [NSArrayObjectAtIndex(fullResult, i) objectAtIndex:[[tableColumn identifier] intValue]];
+			id o = [NSArrayObjectAtIndex(tableValues, i) objectAtIndex:[[tableColumn identifier] intValue]];
 			if([o isKindOfClass:[NSNull class]])
 				[tempRow addObject:@"NULL"];
 			else if([o isKindOfClass:[NSString class]])
@@ -1024,11 +996,7 @@
 		[argumentField setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]];
 	}
 	[limitRowsStepper setEnabled:NO];
-	if ( [prefs boolForKey:@"LimitResults"] ) {
-		[limitRowsText setStringValue:[NSString stringWithFormat:NSLocalizedString(@"Limited to %d rows starting with row", @"text showing the number of rows the result is limited to"),
-									   [prefs integerForKey:@"LimitResultsValue"]]];
-	} else {
-		[limitRowsText setStringValue:NSLocalizedString(@"No limit", @"text showing that the result isn't limited")];
+	if ( ![prefs boolForKey:@"LimitResults"] ) {
 		[limitRowsField setStringValue:@""];
 	}
 }
@@ -1054,7 +1022,7 @@
 	[spHistoryControllerInstance updateHistoryEntries];
 
 	// Store the filter details to use when next loading the table
-	NSString *targetFilterValue = [[filteredResult objectAtIndex:[theArrowCell getClickedRow]] objectAtIndex:dataColumnIndex];
+	NSString *targetFilterValue = [[tableValues objectAtIndex:[theArrowCell getClickedRow]] objectAtIndex:dataColumnIndex];
 	NSDictionary *filterSettings = [NSDictionary dictionaryWithObjectsAndKeys:
 										[refDictionary objectForKey:@"column"], @"filterField",
 										targetFilterValue, @"filterValue",
@@ -1217,8 +1185,6 @@
 {
 	NSArray *columnNames;
 	NSMutableString *queryString;
-	NSString *query;
-	MCPResult *queryResult;
 	id rowObject;
 	NSMutableString *rowValue = [NSMutableString string];
 	NSString *currentTime = [[NSDate date] descriptionWithCalendarFormat:@"%H:%M:%S" timeZone:nil locale:nil];
@@ -1231,7 +1197,7 @@
 	[[NSNotificationCenter defaultCenter] postNotificationName:@"SMySQLQueryWillBePerformed" object:self];
 
 	// If editing, compare the new row to the old row and if they are identical finish editing without saving.
-	if (!isEditingNewRow && [oldRow isEqualToArray:[filteredResult objectAtIndex:currentlyEditingRow]]) {
+	if (!isEditingNewRow && [oldRow isEqualToArray:[tableValues objectAtIndex:currentlyEditingRow]]) {
 		isEditingRow = NO;
 		currentlyEditingRow = -1;
 		[[NSNotificationCenter defaultCenter] postNotificationName:@"SMySQLQueryHasBeenPerformed" object:self];
@@ -1245,7 +1211,7 @@
 	NSMutableArray *fieldValues = [[NSMutableArray alloc] init];
 	// Get the field values
 	for ( i = 0 ; i < [columnNames count] ; i++ ) {
-		rowObject = [NSArrayObjectAtIndex(filteredResult, currentlyEditingRow) objectAtIndex:i];
+		rowObject = [NSArrayObjectAtIndex(tableValues, currentlyEditingRow) objectAtIndex:i];
 		// Convert the object to a string (here we can add special treatment for date-, number- and data-fields)
 		if ( [[rowObject description] isEqualToString:[prefs stringForKey:@"NullValue"]]
 				|| ([rowObject isMemberOfClass:[NSString class]] && [[rowObject description] isEqualToString:@""]) ) {
@@ -1308,7 +1274,7 @@
 		} else {
 			NSBeep();
 		}
-		[filteredResult replaceObjectAtIndex:currentlyEditingRow withObject:[NSMutableArray arrayWithArray:oldRow]];
+		[tableValues replaceObjectAtIndex:currentlyEditingRow withObject:[NSMutableArray arrayWithArray:oldRow]];
 		isEditingRow = NO;
 		isEditingNewRow = NO;
 		currentlyEditingRow = -1;
@@ -1322,44 +1288,28 @@
 		// New row created successfully
 		if ( isEditingNewRow ) {
 			if ( [prefs boolForKey:@"ReloadAfterAddingRow"] ) {
-				[self reloadTableValues:self];
+				[self loadTableValues];
 				[tableWindow endEditingFor:nil];
+				[tableContentView reloadData];
 			} else {
 
 				// Set the insertId for fields with auto_increment
 				for ( i = 0; i < [dataColumns count] ; i++ ) {
 					if ([[NSArrayObjectAtIndex(dataColumns, i) objectForKey:@"autoincrement"] intValue]) {
-						[[filteredResult objectAtIndex:currentlyEditingRow] replaceObjectAtIndex:i withObject:[[NSNumber numberWithLong:[mySQLConnection insertId]] description]];
+						[[tableValues objectAtIndex:currentlyEditingRow] replaceObjectAtIndex:i withObject:[[NSNumber numberWithLong:[mySQLConnection insertId]] description]];
 					}
 				}
-				[fullResult addObject:[filteredResult objectAtIndex:currentlyEditingRow]];
 			}
 			isEditingNewRow = NO;
 
 		// Existing row edited successfully
 		} else {
+
+			// Reload table if set to - otherwise no action required.
 			if ( [prefs boolForKey:@"ReloadAfterEditingRow"] ) {
-				[self reloadTableValues:self];
+				[self loadTableValues];
 				[tableWindow endEditingFor:nil];
-
-			// TODO: this probably needs looking at... it's reloading it all itself?
-			} else {
-				query = [NSString stringWithFormat:@"SELECT %@ FROM %@", [self fieldListForQuery], [selectedTable backtickQuotedString]];
-				if ( sortCol ) {
-					query = [NSString stringWithFormat:@"%@ ORDER BY %@", query, [[[dataColumns objectAtIndex:[sortCol intValue]] objectForKey:@"name"] backtickQuotedString]];
-					if ( isDesc )
-						query = [query stringByAppendingString:@" DESC"];
-				}
-				if ( [prefs boolForKey:@"LimitResults"] ) {
-					if ( [limitRowsField intValue] <= 0 ) {
-						[limitRowsField setStringValue:@"1"];
-					}
-					query = [query stringByAppendingString:
-							 [NSString stringWithFormat:@" LIMIT %d,%d",
-							  [limitRowsField intValue]-1, [prefs integerForKey:@"LimitResultsValue"]]];
-				}
-				queryResult = [mySQLConnection queryString:query];
-				[fullResult setArray:[self fetchResultAsArray:queryResult]];
+				[tableContentView reloadData];
 			}
 		}
 		currentlyEditingRow = -1;
@@ -1463,7 +1413,7 @@
 
 		// Use the selected row if appropriate
 		if ( row >= 0 ) {
-			tempValue = [NSArrayObjectAtIndex(filteredResult, row) objectAtIndex:[[[tableDataInstance columnWithName:NSArrayObjectAtIndex(keys, i)] objectForKey:@"datacolumnindex"] intValue]];
+			tempValue = [NSArrayObjectAtIndex(tableValues, row) objectAtIndex:[[[tableDataInstance columnWithName:NSArrayObjectAtIndex(keys, i)] objectForKey:@"datacolumnindex"] intValue]];
 
 		// Otherwise use the oldRow
 		} else {
@@ -1547,8 +1497,7 @@
 	NSNumber *index;
 	NSMutableArray *tempArray = [NSMutableArray array];
 	NSMutableArray *tempResult = [NSMutableArray array];
-	NSString *queryString, *wherePart;
-	MCPResult *queryResult;
+	NSString *wherePart;
 	int i, errors;
 	
 	if ( [contextInfo isEqualToString:@"addrow"] ) {
@@ -1559,11 +1508,11 @@
 			[tableContentView editColumn:0 row:[tableContentView selectedRow] withEvent:nil select:YES];
 		} else {
 			if ( !isEditingNewRow ) {
-				[filteredResult replaceObjectAtIndex:[tableContentView selectedRow]
+				[tableValues replaceObjectAtIndex:[tableContentView selectedRow]
 										  withObject:[NSMutableArray arrayWithArray:oldRow]];
 				isEditingRow = NO;
 			} else {
-				[filteredResult removeObjectAtIndex:[tableContentView selectedRow]];
+				[tableValues removeObjectAtIndex:[tableContentView selectedRow]];
 				isEditingRow = NO;
 				isEditingNewRow = NO;
 			}
@@ -1572,11 +1521,6 @@
 		[tableContentView reloadData];
 	} else if ( [contextInfo isEqualToString:@"removeallrows"] ) {
 		if ( returnCode == NSAlertDefaultReturn ) {
-			/*
-			 if ( ([tableContentView numberOfSelectedRows] == [self numberOfRowsInTableView:tableContentView]) &&
-			 areShowingAllRows &&
-			 ([tableContentView numberOfSelectedRows] < [prefs integerForKey:@"LimitResultsValue"]) ) {
-			 */
 			[mySQLConnection queryString:[NSString stringWithFormat:@"DELETE FROM %@", [selectedTable backtickQuotedString]]];
 			if ( [[mySQLConnection getLastErrorMessage] isEqualToString:@""] ) {
 				[self reloadTable:self];
@@ -1624,44 +1568,16 @@
 
 			//do deleting (after enumerating)
 			if ( [prefs boolForKey:@"ReloadAfterRemovingRow"] ) {
-				[self reloadTableValues:self];
+				[self loadTableValues];
+				[tableContentView reloadData];
 			} else {
-				for ( i = 0 ; i < [filteredResult count] ; i++ ) {
+				for ( i = 0 ; i < [tableValues count] ; i++ ) {
 					if ( ![tempArray containsObject:[NSNumber numberWithInt:i]] )
-						[tempResult addObject:NSArrayObjectAtIndex(filteredResult, i)];
+						[tempResult addObject:NSArrayObjectAtIndex(tableValues, i)];
 				}
-				[filteredResult setArray:tempResult];
+				[tableValues setArray:tempResult];
 				numRows = [self getNumberOfRows];
-				if ( !areShowingAllRows ) {
-					//					queryString = [@"SELECT * FROM " stringByAppendingString:selectedTable];
-					queryString = [NSString stringWithFormat:@"SELECT %@ FROM %@", [self fieldListForQuery], [selectedTable backtickQuotedString]];
-					if ( sortCol ) {
-						//						queryString = [queryString stringByAppendingString:[NSString stringWithFormat:@" ORDER BY %@", [sortField backtickQuotedString]]];
-						queryString = [NSString stringWithFormat:@"%@ ORDER BY %@", queryString, [[[dataColumns objectAtIndex:[sortCol intValue]] objectForKey:@"name"] backtickQuotedString]];
-						if ( isDesc )
-							queryString = [queryString stringByAppendingString:@" DESC"];
-					}
-					if ( [prefs boolForKey:@"LimitResults"] ) {
-						if ( [limitRowsField intValue] <= 0 ) {
-							[limitRowsField setStringValue:@"1"];
-						}
-						queryString = [queryString stringByAppendingString:
-									   [NSString stringWithFormat:@" LIMIT %d,%d",
-										[limitRowsField intValue]-1, [prefs integerForKey:@"LimitResultsValue"]]];
-					}
-					
-					[self setUsedQuery:queryString];
-					queryResult = [mySQLConnection queryString:queryString];
-					//						[fullResult setArray:[[self fetchResultAsArray:queryResult] retain]];
-					[fullResult setArray:[self fetchResultAsArray:queryResult]];
-					[tableContentView reloadData];
-					[countText setStringValue:[NSString stringWithFormat:NSLocalizedString(@"%d rows of %d selected", @"text showing how many rows are in the filtered result"),
-											   [filteredResult count], numRows]];
-				} else {
-					[fullResult setArray:filteredResult];
-					[tableContentView reloadData];
-					[countText setStringValue:[NSString stringWithFormat:NSLocalizedString(@"%d rows in table", @"text showing how many rows are in the result"), numRows]];
-				}
+				[tableContentView reloadData];
 			}
 			[tableContentView deselectAll:self];
 		}
@@ -1837,7 +1753,7 @@
 	if ([prefs boolForKey:@"LimitResults"] && [prefs boolForKey:@"FetchCorrectRowCount"]) {
 		numRows = [self fetchNumberOfRows];
 	} else {
-		numRows = [fullResult count];
+		numRows = [tableValues count];
 	}
 		
 	// Update table data cache with the more accurate row count
@@ -1859,12 +1775,12 @@
 
 - (int)numberOfRowsInTableView:(NSTableView *)aTableView
 {
-	return [filteredResult count];
+	return [tableValues count];
 }
 
 - (id)tableView:(CMCopyTable *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex
 {
-	id theValue = NSArrayObjectAtIndex(NSArrayObjectAtIndex(filteredResult, rowIndex), [[aTableColumn identifier] intValue]);
+	id theValue = NSArrayObjectAtIndex(NSArrayObjectAtIndex(tableValues, rowIndex), [[aTableColumn identifier] intValue]);
 
 	if ([theValue isKindOfClass:[NSData class]])
 		return [theValue shortStringRepresentationUsingEncoding:[mySQLConnection encoding]];
@@ -1933,15 +1849,15 @@
 	// Catch editing events in the row and if the row isn't currently being edited,
 	// start an edit.  This allows edits including enum changes to save correctly.
 	if ( !isEditingRow ) {
-		[oldRow setArray:NSArrayObjectAtIndex(filteredResult, rowIndex)];
+		[oldRow setArray:NSArrayObjectAtIndex(tableValues, rowIndex)];
 		isEditingRow = YES;
 		currentlyEditingRow = rowIndex;
 	}
 	
 	if (anObject)
-		[NSArrayObjectAtIndex(filteredResult, rowIndex) replaceObjectAtIndex:[[aTableColumn identifier] intValue] withObject:anObject];
+		[NSArrayObjectAtIndex(tableValues, rowIndex) replaceObjectAtIndex:[[aTableColumn identifier] intValue] withObject:anObject];
 	else
-		[NSArrayObjectAtIndex(filteredResult, rowIndex) replaceObjectAtIndex:[[aTableColumn identifier] intValue] withObject:@""];
+		[NSArrayObjectAtIndex(tableValues, rowIndex) replaceObjectAtIndex:[[aTableColumn identifier] intValue] withObject:@""];
 
 }
 
@@ -1954,17 +1870,12 @@
  if clicked twice, order is descending
  */
 {
-	NSString *queryString;
-	MCPResult *queryResult;
 	
 	if ( [selectedTable isEqualToString:@""] || !selectedTable )
 		return;
 	
 	// Check whether a save of the current row is required.
 	if ( ![self saveRowOnDeselect] ) return;
-
-	//query started
-	[[NSNotificationCenter defaultCenter] postNotificationName:@"SMySQLQueryWillBePerformed" object:self];
 		
 	//sets order descending if a header is clicked twice
 	if ( [[tableColumn identifier] isEqualTo:sortCol] ) {
@@ -1980,23 +1891,8 @@
 	if (sortCol) [sortCol release];
 	sortCol = [[NSNumber alloc] initWithInt:[[tableColumn identifier] intValue]];
 
-	//make queryString and perform query
-	queryString = [NSString stringWithFormat:@"SELECT %@ FROM %@ ORDER BY %@", [self fieldListForQuery],
-				   [selectedTable backtickQuotedString], [[[dataColumns objectAtIndex:[sortCol intValue]] objectForKey:@"name"] backtickQuotedString]];
-	if ( isDesc )
-		queryString = [queryString stringByAppendingString:@" DESC"];
-	if ( [prefs boolForKey:@"LimitResults"] ) {
-		if ( [limitRowsField intValue] <= 0 ) {
-			[limitRowsField setStringValue:@"1"];
-		}
-		queryString = [queryString stringByAppendingString:
-					   [NSString stringWithFormat:@" LIMIT %d,%d",
-						[limitRowsField intValue]-1, [prefs integerForKey:@"LimitResultsValue"]]];
-	}
-	queryResult = [mySQLConnection queryString:queryString];
-	
-	//	[fullResult setArray:[[self fetchResultAsArray:queryResult] retain]];
-	[fullResult setArray:[self fetchResultAsArray:queryResult]];
+	// Update data using the new sort order
+	[self loadTableValues];
 	
 	if ( ![[mySQLConnection getLastErrorMessage] isEqualToString:@""] ) {
 		NSBeginAlertSheet(NSLocalizedString(@"Error", @"error"), NSLocalizedString(@"OK", @"OK button"), nil, nil, tableWindow, self, nil, nil, nil,
@@ -2011,17 +1907,8 @@
 	} else {
 		[tableContentView setIndicatorImage:[NSImage imageNamed:@"NSAscendingSortIndicator"] inTableColumn:tableColumn];
 	}
-	
-	//query finished
-	[[NSNotificationCenter defaultCenter] postNotificationName:@"SMySQLQueryHasBeenPerformed" object:self];
-	
-	//if filter is activated filters the result, otherwise shows fullResult
-	if ( !areShowingAllRows ) {
-		[self filterTable:self];
-	} else {
-		[filteredResult setArray:fullResult];
-		[tableContentView reloadData];
-	}
+
+	[tableContentView reloadData];
 }
 
 - (void)tableViewSelectionDidChange:(NSNotification *)aNotification
@@ -2038,28 +1925,14 @@
 	if ( [tableContentView numberOfSelectedRows] > 0 ) {
         [copyButton setEnabled:YES];
         [removeButton setEnabled:YES];
-		[countText setStringValue:[NSString stringWithFormat:NSLocalizedString(@"%d of %d rows selected", @"Text showing how many rows are selected"), [tableContentView numberOfSelectedRows], [tableContentView numberOfRows]]];
 	} else {
         [copyButton setEnabled:NO];
         [removeButton setEnabled:NO];
-		[countText setStringValue:[NSString stringWithFormat:NSLocalizedString(@"%d rows", @"Text showing how many rows are in the result"), [tableContentView numberOfRows]]];
 	}
-}
 
-- (void)tableViewSelectionIsChanging:(NSNotification *)aNotification
-{
-	// Check our notification object is our table content view
-	if ([aNotification object] != tableContentView)
-		return;
-	
-	if ( [tableContentView numberOfSelectedRows] > 0 ) {
-		[countText setStringValue:[NSString stringWithFormat:NSLocalizedString(@"%d of %d rows selected", @"Text showing how many rows are selected"), [tableContentView numberOfSelectedRows], [tableContentView numberOfRows]]];
-	} else {
-		[countText setStringValue:[NSString stringWithFormat:NSLocalizedString(@"%d rows", @"Text showing how many rows are in the result"), [tableContentView numberOfRows]]];
-	}
+	[self updateCountText];
 }
 
-
 - (void)tableViewColumnDidResize:(NSNotification *)aNotification
 /*
  saves the new column size in the preferences
@@ -2136,7 +2009,7 @@
 				[modifiedRow addObject:([[tempRow objectAtIndex:i] isMemberOfClass:[NSNull class]]) ? [prefs stringForKey:@"NullValue"] : [tempRow objectAtIndex:i]];
 			}
 						
-			[[filteredResult objectAtIndex:rowIndex] replaceObjectAtIndex:[[tableContentView tableColumns] indexOfObject:aTableColumn] withObject:[modifiedRow objectAtIndex:0]];
+			[[tableValues objectAtIndex:rowIndex] replaceObjectAtIndex:[[tableContentView tableColumns] indexOfObject:aTableColumn] withObject:[modifiedRow objectAtIndex:0]];
 			[tableContentView reloadData];
 		}
 	}
@@ -2148,7 +2021,7 @@
 		
 		SPFieldEditorController *fieldEditor = [[SPFieldEditorController alloc] init];
 		[fieldEditor setTextMaxLength:[[[aTableColumn dataCellForRow:rowIndex] formatter] textLimit]];
-		id editData = [[fieldEditor editWithObject:[[filteredResult objectAtIndex:rowIndex] objectAtIndex:[[aTableColumn identifier] intValue]] 
+		id editData = [[fieldEditor editWithObject:[[tableValues objectAtIndex:rowIndex] objectAtIndex:[[aTableColumn identifier] intValue]] 
 								 	 fieldName:[[aTableColumn headerCell] stringValue]
 								 usingEncoding:[mySQLConnection encoding] 
 								  isObjectBlob:isBlob 
@@ -2156,12 +2029,12 @@
 
 		if (editData) {
 			if (!isEditingRow) {
-				[oldRow setArray:[filteredResult objectAtIndex:rowIndex]];
+				[oldRow setArray:[tableValues objectAtIndex:rowIndex]];
 				isEditingRow = YES;
 				currentlyEditingRow = rowIndex;
 			}
 
-			[[filteredResult objectAtIndex:rowIndex] replaceObjectAtIndex:[[aTableColumn identifier] intValue] withObject:[editData copy]];
+			[[tableValues objectAtIndex:rowIndex] replaceObjectAtIndex:[[aTableColumn identifier] intValue] withObject:[editData copy]];
 		}
 
 		[fieldEditor release];
@@ -2279,11 +2152,11 @@
 		[control abortEditing];
 		if ( isEditingRow && !isEditingNewRow ) {
 			isEditingRow = NO;
-			[filteredResult replaceObjectAtIndex:row withObject:[NSMutableArray arrayWithArray:oldRow]];
+			[tableValues replaceObjectAtIndex:row withObject:[NSMutableArray arrayWithArray:oldRow]];
 		} else if ( isEditingNewRow ) {
 			isEditingRow = NO;
 			isEditingNewRow = NO;
-			[filteredResult removeObjectAtIndex:row];
+			[tableValues removeObjectAtIndex:row];
 			[tableContentView reloadData];
 		}
 		currentlyEditingRow = -1;
@@ -2328,8 +2201,7 @@
 // Last but not least
 - (void)dealloc
 {
-	[fullResult release];
-	[filteredResult release];
+	[tableValues release];
 	[dataColumns release];
 	[oldRow release];
 	// if (editData) [editData release];
diff --git a/Source/TableDump.m b/Source/TableDump.m
index 24f76a42..ac4cd666 100644
--- a/Source/TableDump.m
+++ b/Source/TableDump.m
@@ -741,7 +741,7 @@
 				[singleProgressSheet orderOut:nil];
 			}
 			
-			[tableContentInstance reloadTableValues:self];
+			[tableContentInstance loadTableValues];
 		}
 		
 		//display errors