Visible improvements in this build:

 - Significantly reduce the queries that have to be performed, improving lag - especially over slow connections (Issue #118; see new controller info under headline code changes).
 - Fix Issue #117 properly (export numeric quoting - we now have access to column types and so can quote appropriately).
 - Fix Issue #145 (loss of unsigned/null/default attributes when reordering columns).
 - Fixes Issue #90 (support for filtering DECIMAL column types)
 - Improve table scrolling speed when the table contains long items. (Added a NSFormatter to automatically truncate strings > 150 chars for display purposes only)
 - Improved SQL compatibility - for example /* C style comments */ are now correctly ignored in imports and custom queries.
 - Add text and symbols emphasising that the table info pane / status view row count is an approximation (partially addresses Issue #141)
 - Fixes a major memory leak whenever opening or scrolling tables containing text/blob data.
 - SQL import is now faster (SQL parsing part is 3x faster).
 - Speed up SQL export (1.5x faster for numeric data; 1.1x faster for string data) and slightly speed up CSV export (~1.1x faster).
 - Display sizes on the status view using the byte size formatter, as per table info pane.
 

Headline code changes:
 - Add a new NSMutableString subclass, SPSQLParser.  See the header file for documentation and overview, but in short it's a centralised place for SQL parsing.  Centralises and improves parsing, improves comment support, improves quoting support.  Despite the improved featureset this is also faster than the previous distributed implementations - for example, when used to replace the old splitQueries:, > 3x speedup.
 - Implement a new controller which handles a structure and status cache for the current table, and provides structure parsing for specified tables.  This cache is now used throughout the code, reducing the queries that have to be performed and providing additional information about the table structure for use; I think it also improves column type format slightly.
 - The table info pane and the status view now draw all their data from the cache.


Tweaks:
 - Table encoding is now detected directly instead of being derived from the collation - increased accuracy and cope with the DEFAULT encoding.
 - Comments and formatting cleaned up in bits I was working on, obviously.
 - A couple of methods - particularly [tablesListInstance table] and [tableDocument encoding] - have been renamed to avoid conflicts and fix code warnings.


Future improvements now possible:
 - As we now have access to column types and other information, we can provide per-type behaviour where desired.
 - The table parsing doesn't currently pull out comments or table indices, together with one or two other attributes.  Some of this would be useful for display; some, such as indices, could be used to draw the table structure view as long as we're happy discarding a couple of columns (ie cardinality!)

1 files changed, 19 insertions, 19 deletions

diff --git a/Source/TablesList.m b/Source/TablesList.m
index 40ea87c5..e92c7b13 100644
--- a/Source/TablesList.m
+++ b/Source/TablesList.m
@@ -26,6 +26,7 @@
 #import "TableDocument.h"
 #import "TableSource.h"
 #import "TableContent.h"
+#import "SPTableData.h"
 #import "TableDump.h"
 #import "ImageAndTextCell.h"
 #import "CMMCPConnection.h"
@@ -295,7 +296,7 @@ selects customQuery tab and passes query to customQueryInstance
 /*
 returns the currently selected table or nil if no table or mulitple tables are selected
 */
-- (NSString *)table
+- (NSString *)tableName
 {
 	if ( [tablesListView numberOfSelectedRows] == 1 ) {
 		return [tables objectAtIndex:[tablesListView selectedRow]];
@@ -395,9 +396,8 @@ Mark the content table for refresh when it's next switched to
 					contentLoaded = NO;
 					statusLoaded = NO;
 				} else if ( [tabView indexOfTabViewItem:[tabView selectedTabViewItem]] == 1 ) {
-					[tableSourceInstance loadTable:anObject];
 					[tableContentInstance loadTable:anObject];
-					structureLoaded = YES;
+					structureLoaded = NO;
 					contentLoaded = YES;
 					statusLoaded = NO;
 				} else if ( [tabView indexOfTabViewItem:[tabView selectedTabViewItem]] == 3 ) {
@@ -451,9 +451,8 @@ Mark the content table for refresh when it's next switched to
 					contentLoaded = NO;
 					statusLoaded = NO;
 				} else if ( [tabView indexOfTabViewItem:[tabView selectedTabViewItem]] == 1 ) {
-					[tableSourceInstance loadTable:anObject];
 					[tableContentInstance loadTable:anObject];
-					structureLoaded = YES;
+					structureLoaded = NO;
 					contentLoaded = YES;
 					statusLoaded = NO;
 				} else if ( [tabView indexOfTabViewItem:[tabView selectedTabViewItem]] == 3 ) {
@@ -549,15 +548,27 @@ traps enter and esc and edit/cancel without entering next row
 - (void)tableViewSelectionDidChange:(NSNotification *)aNotification
 {
 	if ( [tablesListView numberOfSelectedRows] == 1 ) {
+		
+		// Reset the table information caches
+		[tableDataInstance resetAllData];
+
+		// If encoding is set to Autodetect, update the connection character set encoding
+		// based on the newly selected table's encoding - but only if it differs from the current encoding.
+		if ([[[NSUserDefaults standardUserDefaults] objectForKey:@"encoding"] isEqualToString:@"Autodetect"]) {
+			if (![[tableDataInstance tableEncoding] isEqualToString:[tableDocumentInstance connectionEncoding]]) {
+				[tableDocumentInstance setConnectionEncoding:[tableDataInstance tableEncoding] reloadingViews:NO];
+				[tableDataInstance resetAllData];
+			}
+		}
+
 		if ( [tabView indexOfTabViewItem:[tabView selectedTabViewItem]] == 0 ) {
 			[tableSourceInstance loadTable:[tables objectAtIndex:[tablesListView selectedRow]]];
 			structureLoaded = YES;
 			contentLoaded = NO;   
 			statusLoaded = NO;
 		} else if ( [tabView indexOfTabViewItem:[tabView selectedTabViewItem]] == 1 ) {
-			[tableSourceInstance loadTable:[tables objectAtIndex:[tablesListView selectedRow]]];
 			[tableContentInstance loadTable:[tables objectAtIndex:[tablesListView selectedRow]]];
-			structureLoaded = YES;
+			structureLoaded = NO;
 			contentLoaded = YES;
 			statusLoaded = NO;
 		} else if ( [tabView indexOfTabViewItem:[tabView selectedTabViewItem]] == 3 ) {
@@ -574,11 +585,6 @@ traps enter and esc and edit/cancel without entering next row
 		// set window title
 		[tableWindow setTitle:[NSString stringWithFormat:@"(MySQL %@) %@@%@/%@/%@", [tableDocumentInstance mySQLVersion], [tableDocumentInstance user],
 									[tableDocumentInstance host], [tableDocumentInstance database], [tables objectAtIndex:[tablesListView selectedRow]]]];
-		 
-		// Update connection characater set encoding based on the table's encoding if required
-		if ([[[NSUserDefaults standardUserDefaults] objectForKey:@"encoding"] isEqualToString:@"Autodetect"]) {
-			[tableDocumentInstance detectTableEncodingForTable:[tables objectAtIndex:[tablesListView selectedRow]]];
-		}
 	} else {
 		[tableSourceInstance loadTable:nil];
 		[tableContentInstance loadTable:nil];
@@ -646,18 +652,11 @@ loads structure or source if tab selected the first time
 	if ( [tablesListView numberOfSelectedRows] == 1 ) {
 		
 		if ( ([tabView indexOfTabViewItem:[tabView selectedTabViewItem]] == 0) && !structureLoaded ) {
-			
 			[tableSourceInstance loadTable:[tables objectAtIndex:[tablesListView selectedRow]]];
 			structureLoaded = YES;
 		}
 		
 		if ( ([tabView indexOfTabViewItem:[tabView selectedTabViewItem]] == 1) && !contentLoaded ) {
-			
-			if ( !structureLoaded ) {
-				[tableSourceInstance loadTable:[tables objectAtIndex:[tablesListView selectedRow]]];
-				structureLoaded = YES;
-			}
-			
 			[tableContentInstance loadTable:[tables objectAtIndex:[tablesListView selectedRow]]];
 			contentLoaded = YES;
 		}
@@ -683,6 +682,7 @@ loads structure or source if tab selected the first time
 	tables = [[NSMutableArray alloc] init];
 	structureLoaded = NO;
 	contentLoaded = NO;
+	statusLoaded = NO;
 	[tables addObject:NSLocalizedString(@"TABLES",@"header for table list")];
 	return self;
 }