Merge in the SPMySQL Framework. This new framework should provide much of the functionality required from MCPKit and is based around its interface for relatively easy integration.

Externally visible changes as a result of this merge:
 - Speed improvements, particularly when loading large data sets
 - Stability improvements, particularly related to connection state after the connection is dropped (eg Issue #1256)
 - Improved support for new MySQL data types, which should address Issue #1052.
 - Database structure retrieval and query cancellation now use a single persistent helper connection instead of lots of connections on-demand.  This should help Issue  #1097.
 - More internal commands now use queries instead of MySQL functions; for example USE queries are now used to trigger database selection, improving transcripts.  This addresses Issue #1247.
 - Improved internal encoding work; while this needs support within the UI, it lays the foundation for issues like Issue #1280.

Code improvements:
 - Much improved class layouts including extensive category usage
 - Improved documentation across framework methods
 - Support for fast enumeration across result objects
 - Rewrite fixes use of a number of deprecate functions
 - Much less code duplication across result set types
 - Improved encapsultation within the framework, limiting the number of methods exposed, and also not exposing all the MySQL headers

From the Readme file:

The SPMySQL Framework is intended to provide a stable MySQL connection framework, with the ability to run text-based queries and rapidly retrieve result sets with conversion from MySQL data types to Cocoa objects.

SPMySQL.framework has an interface loosely based around that provided by MCPKit by Serge Cohen and Bertrand Mansion (http://mysql-cocoa.sourceforge.net/), and in particular the heavily modified Sequel Pro version (http://www.sequelpro.com/).  It is a full rewrite of the original framework, although it includes code from patches implementing the following Sequel Pro functionality, largely contributed by Hans-Jörg Bibiko, Stuart Connolly, Jakob Egger, and Rowan Beentje:
        - Connection locking (Jakob et al)
        - Ping & keepalive (Rowan et al)
        - Query cancellation (Rowan et al)
        - Delegate setup (Stuart et al)
        - SSL support (Rowan et al)
        - Connection checking (Rowan et al)
        - Version state (Stuart et al)
        - Maximum packet size control (Hans et al)
        - Result multithreading and streaming (Rowan et al)
        - Improved encoding support & switching (Rowan et al)
        - Database structure; moved to inside the app (Hans et al)
        - Query reattempts and error-handling approach (Rowan et al)
        - Geometry result class (Hans et al)
        - Connection proxy (Stuart et al)

1 files changed, 13 insertions, 19 deletions

diff --git a/Source/SPXMLExporter.m b/Source/SPXMLExporter.m
index dfd55bf0..8ff99e0d 100644
--- a/Source/SPXMLExporter.m
+++ b/Source/SPXMLExporter.m
@@ -23,12 +23,11 @@
 //
 //  More info at <http://code.google.com/p/sequel-pro/>
 
-#import <MCPKit/MCPKit.h>
-
 #import "SPXMLExporter.h"
 #import "SPExportFile.h"
 #import "SPFileHandle.h"
 #import "SPExportUtilities.h"
+#import "SPMySQL.h"
 
 @implementation SPXMLExporter
 
@@ -73,9 +72,9 @@
 	NSString *dataConversionString = nil;
 	
 	// Result sets
-	MCPResult *statusResult = nil;
-	MCPResult *structureResult = nil;
-	MCPStreamingResult *streamingResult = nil;
+	SPMySQLResult *statusResult = nil;
+	SPMySQLResult *structureResult = nil;
+	SPMySQLFastStreamingResult *streamingResult = nil;
 	
 	NSMutableArray *xmlTags    = [NSMutableArray array];
 	NSMutableString *xmlString = [NSMutableString string];
@@ -107,7 +106,7 @@
 		
 		isTableExport = YES;
 		
-		totalRows       = [[[[connection queryString:[NSString stringWithFormat:@"SELECT COUNT(1) FROM %@", [[self xmlTableName] backtickQuotedString]]] fetchRowAsArray] objectAtIndex:0] integerValue];
+		totalRows       = [[connection getFirstFieldFromQuery:[NSString stringWithFormat:@"SELECT COUNT(1) FROM %@", [[self xmlTableName] backtickQuotedString]]] integerValue];
 		streamingResult = [connection streamingQueryString:[NSString stringWithFormat:@"SELECT * FROM %@", [[self xmlTableName] backtickQuotedString]] useLowMemoryBlockingStreaming:[self exportUsingLowMemoryBlockingStreaming]];
 	
 		// Only include the structure if necessary
@@ -118,17 +117,12 @@
 			[escapedTableName replaceOccurrencesOfString:@"\\" withString:@"\\\\\\\\" options:0 range:NSMakeRange(0, [escapedTableName length])];
 			statusResult    = [connection queryString:[NSString stringWithFormat:@"SHOW TABLE STATUS LIKE %@", escapedTableName]];
 			
-			if ([structureResult numOfRows] && [statusResult numOfRows]) {
-				
-				[statusResult dataSeek:0];
-				[structureResult dataSeek:0];
-				
+			if ([structureResult numberOfRows] && [statusResult numberOfRows]) {
+
 				[xmlString appendFormat:@"\t<table_structure name=\"%@\">\n", [self xmlTableName]];
 				
-				for (i = 0; i < [structureResult numOfRows]; i++)
+				for (NSDictionary *row in structureResult)
 				{
-					NSDictionary *row = [structureResult fetchRowAsDictionary];
-					
 					[xmlString appendFormat:@"\t\t<field field=\"%@\" type=\"%@\" null=\"%@\" key=\"%@\" default=\"%@\" extra=\"%@\" />\n",
 					 [row objectForKey:@"Field"],
 					 [row objectForKey:@"Type"],
@@ -138,7 +132,7 @@
 					 [row objectForKey:@"Extra"]];				
 				}
 				
-				NSDictionary *row = [statusResult fetchRowAsDictionary];
+				NSDictionary *row = [statusResult getRowAsDictionary];
 				
 				[xmlString appendFormat:@"\n\t\t<options name=\"%@\" engine=\"%@\" version=\"%@\" row_format=\"%@\" rows=\"%@\" avg_row_length=\"%@\" data_length=\"%@\" max_data_length=\"%@\" index_length=\"%@\" data_free=\"%@\" create_time=\"%@\" update_time=\"%@\" collation=\"%@\" create_options=\"%@\" comment=\"%@\" />\n",
 				 [row objectForKey:@"Name"],
@@ -175,7 +169,7 @@
 	if ((!isTableExport) || (isTableExport && [self xmlOutputIncludeContent])) {
 	
 		// Set up an array of encoded field names as opening and closing tags
-		fieldNames = ([self xmlDataArray]) ? NSArrayObjectAtIndex([self xmlDataArray], 0) : [streamingResult fetchFieldNames];
+		fieldNames = ([self xmlDataArray]) ? NSArrayObjectAtIndex([self xmlDataArray], 0) : [streamingResult fieldNames];
 		
 		for (i = 0; i < [fieldNames count]; i++) 
 		{
@@ -225,7 +219,7 @@
 			} 
 			// Or by reading an appropriate row from the streaming result
 			else {
-				xmlRow = [streamingResult fetchNextRowAsArray];
+				xmlRow = [streamingResult getRowAsArray];
 				
 				if (!xmlRow) break;
 			}
@@ -265,14 +259,14 @@
 					[xmlItem setString:[NSString stringWithString:dataConversionString]];
 					[dataConversionString release];
 				} 
-				else if ([data isKindOfClass:[NSNull class]]) {
+				else if (data == [NSNull null]) {
 					dataIsNULL = YES;
 					
 					if ([self xmlFormat] == SPXMLExportPlainFormat) {
 						[xmlItem setString:[self xmlNULLString]];
 					}
 				}
-				else if ([data isKindOfClass:[MCPGeometryData class]]) {
+				else if ([data isKindOfClass:[SPMySQLGeometryData class]]) {
 					[xmlItem setString:[data wktString]];
 				}
 				else {