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, 27 insertions, 33 deletions

diff --git a/Source/SPTableInfo.m b/Source/SPTableInfo.m
index 7bab9322..80760278 100644
--- a/Source/SPTableInfo.m
+++ b/Source/SPTableInfo.m
@@ -25,6 +25,8 @@
 #import "CMMCPConnection.h"
 #import "CMMCPResult.h"
 #import "TableDocument.h"
+#import "TablesList.h"
+#import "SPTableData.h"
 #import "SPStringAdditions.h"
 
 #import <MCPKit_bundled/MCPKit_bundled.h>
@@ -101,72 +103,64 @@ objectValueForTableColumn:(NSTableColumn *)aTableColumn
 
 - (void)tableChanged:(NSNotification *)notification
 {
-	NSString *query;
-	CMMCPResult *theResult;
-	NSDictionary *theRow;
+	NSDictionary *tableStatus;
 	
 	[info removeAllObjects];
 	[info addObject:@"TABLE INFORMATION"];
 		
-	if ([tableListInstance table])
+	if ([tableListInstance tableName])
 	{
-		if ([(NSString *)[tableListInstance table] isEqualToString:@""]) {
+		if ([[tableListInstance tableName] isEqualToString:@""]) {
 			[info addObject:@"multiple tables"];
-			
+
 		} else {
-			// Notify that we are about to perform a query
-			[[NSNotificationCenter defaultCenter] postNotificationName:@"SMySQLQueryWillBePerformed" object:self];
 
-			// Create the query and get results
-			query = [NSString stringWithFormat:@"SHOW TABLE STATUS LIKE '%@'", [tableListInstance table]];
-			
-			// This line triggers a bug when opening a new window. but only after having closed a window
-			theResult = [[tableDocumentInstance sharedConnection] queryString:query];
+			// Retrieve the table status information via the data cache
+			tableStatus = [tableDataInstance statusValues];
 
 			// Check for errors
-			if (![[[tableDocumentInstance sharedConnection] getLastErrorMessage] isEqualToString:@""]) {
+			if (![tableStatus count]) {
 				[info addObject:@"error occurred"];
 				return;
 			}
-			
-			// Process result
-			theRow = [[theResult fetch2DResultAsType:MCPTypeDictionary] lastObject];
-			
+
 			// Check for "Create_time" == NULL
-			if (![[theRow objectForKey:@"Create_time"] isNSNull]) {
-				// Setup our data formatter
+			if (![[tableStatus objectForKey:@"Create_time"] isNSNull]) {
+
+				// Set up our data formatter
 				NSDateFormatter *createDateFormatter = [[[NSDateFormatter alloc] init] autorelease];
 				[createDateFormatter setDateStyle:NSDateFormatterShortStyle];
 				[createDateFormatter setTimeStyle:NSDateFormatterNoStyle];
-				
+
 				// Convert our string date from the result to an NSDate.
-				NSDate *create_date = [NSDate dateWithNaturalLanguageString:[theRow objectForKey:@"Create_time"]];
-				
+				NSDate *create_date = [NSDate dateWithNaturalLanguageString:[tableStatus objectForKey:@"Create_time"]];
+
 				// Add the creation date to the infoTable
 				[info addObject:[NSString stringWithFormat:@"created: %@", [createDateFormatter stringFromDate:create_date]]];
 			}
 
 			// Check for "Update_time" == NULL - InnoDB tables don't have an update time
-			if (![[theRow objectForKey:@"Update_time"] isNSNull]) {
+			if (![[tableStatus objectForKey:@"Update_time"] isNSNull]) {
+
 				// Setup our data formatter
 				NSDateFormatter *updateDateFormatter = [[[NSDateFormatter alloc] init] autorelease];
 				[updateDateFormatter setDateStyle:NSDateFormatterShortStyle];
 				[updateDateFormatter setTimeStyle:NSDateFormatterNoStyle];
-				
+
 				// Convert our string date from the result to an NSDate.
-				NSDate *update_date = [NSDate dateWithNaturalLanguageString:[theRow objectForKey:@"Update_time"]];
-				
+				NSDate *update_date = [NSDate dateWithNaturalLanguageString:[tableStatus objectForKey:@"Update_time"]];
+
 				// Add the update date to the infoTable
 				[info addObject:[NSString stringWithFormat:@"updated: %@", [updateDateFormatter stringFromDate:update_date]]];
 			}
 						
-			[info addObject:[NSString stringWithFormat:@"rows: %@", [theRow objectForKey:@"Rows"]]];
-			[info addObject:[NSString stringWithFormat:@"size: %@", [NSString stringForByteSize:[[theRow objectForKey:@"Data_length"] intValue]]]];
-			[info addObject:[NSString stringWithFormat:@"encoding: %@", [[[theRow objectForKey:@"Collation"] componentsSeparatedByString:@"_"] objectAtIndex:0]]];
-			[info addObject:[NSString stringWithFormat:@"auto_increment: %@", [theRow objectForKey:@"Auto_increment"]]];
+			[info addObject:[NSString stringWithFormat:@"rows: ~%@", [tableStatus objectForKey:@"Rows"]]];
+			[info addObject:[NSString stringWithFormat:@"size: %@", [NSString stringForByteSize:[[tableStatus objectForKey:@"Data_length"] intValue]]]];
+			[info addObject:[NSString stringWithFormat:@"encoding: %@", [tableDataInstance tableEncoding]]];
 			
-			// Notify that we've finished performing the query
-			[[NSNotificationCenter defaultCenter] postNotificationName:@"SMySQLQueryHasBeenPerformed" object:self];
+			if (![[tableStatus objectForKey:@"Auto_increment"] isNSNull]) {
+				[info addObject:[NSString stringWithFormat:@"auto_increment: %@", [tableStatus objectForKey:@"Auto_increment"]]];
+			}
 		}
 	}