Merge framework integration branch back to trunk. Summary of changes:

- Includes all custom code from subclasses CMMCPConnection and CMMCPResult, meaning they have subsequently been removed from the project.
- All previous Sequel Pro specific code in the above subclasses has been removed in favour of the delegate (currently set to TableDocumet) informing the framework of such information.
- All references to CMMCPConnection and CMMCPResult have subsequently been changed to MCPConnection and MCPResult.
- Framework includes MySQL 5.1.36 client libraries and source headers.
- Framework is now built as a 4-way (32/64 bit, i386/PPC arch) binary.
- All import references to <MCPKit_bundled/MCPKit_bundled.h> have been changed to <MCPKit/MCPKit.h>.
- New script 'build-mysql-client.sh' can be used to build the MySQL client libraries from the MySQL source. See the script's header for a list of available options or run it with no arguments to display it's usage.

Note that there are still a few changes to be made to the framework with regard to removing Sequel Pro specific calls to the delegate. These however can be made later on as they have no effect on functionality and are merely design changes. 

Also, note that any future development done on the framework should be made to be as 'generic' as possible, with no Sequel Pro specific references. This should allow the framework to be integrated into another project without the need for SP specific code.

1 files changed, 6 insertions, 8 deletions

diff --git a/Source/SPDatabaseData.m b/Source/SPDatabaseData.m
index a9c86ccc..f3fbc582 100644
--- a/Source/SPDatabaseData.m
+++ b/Source/SPDatabaseData.m
@@ -24,8 +24,6 @@
 //  More info at <http://code.google.com/p/sequel-pro/>
 
 #import "SPDatabaseData.h"
-#import "CMMCPConnection.h"
-#import "CMMCPResult.h"
 #import "SPStringAdditions.h"
 
 @interface SPDatabaseData (PrivateAPI)
@@ -236,7 +234,7 @@ const CHAR_SETS charsets[] =
 	if ([collations count] == 0) {
 		
 		// Check the information_schema.collations table is accessible
-		CMMCPResult *result = [connection queryString:@"SHOW TABLES IN information_schema LIKE 'collations'"];
+		MCPResult *result = [connection queryString:@"SHOW TABLES IN information_schema LIKE 'collations'"];
 		
 		if ([result numOfRows] == 1) {
 			// Table is accessible so get available collations
@@ -272,7 +270,7 @@ const CHAR_SETS charsets[] =
 		characterSetEncoding = [[NSString alloc] initWithString:encoding];
 		
 		// Check the information_schema.collations table is accessible
-		CMMCPResult *result = [connection queryString:@"SHOW TABLES IN information_schema LIKE 'collations'"];
+		MCPResult *result = [connection queryString:@"SHOW TABLES IN information_schema LIKE 'collations'"];
 		
 		if ([result numOfRows] == 1) {
 			// Table is accessible so get available collations for the supplied encoding
@@ -308,7 +306,7 @@ const CHAR_SETS charsets[] =
 			[storageEngines addObject:[NSDictionary dictionaryWithObject:@"MyISAM" forKey:@"Engine"]];
 			
 			// Check if InnoDB support is enabled
-			CMMCPResult *result = [connection queryString:@"SHOW VARIABLES LIKE 'have_innodb'"];
+			MCPResult *result = [connection queryString:@"SHOW VARIABLES LIKE 'have_innodb'"];
 			
 			if ([result numOfRows] == 1) {
 				if ([[[result fetchRowAsDictionary] objectForKey:@"Value"] isEqualToString:@"YES"]) {
@@ -350,7 +348,7 @@ const CHAR_SETS charsets[] =
 				([connection serverReleaseVersion] >= 5))
 			{
 				// Check the information_schema.engines table is accessible
-				CMMCPResult *result = [connection queryString:@"SHOW TABLES IN information_schema LIKE 'engines'"];
+				MCPResult *result = [connection queryString:@"SHOW TABLES IN information_schema LIKE 'engines'"];
 				
 				if ([result numOfRows] == 1) {
 					// Table is accessible so get available storage engines
@@ -388,7 +386,7 @@ const CHAR_SETS charsets[] =
 	if ([characterSetEncodings count] == 0) {
 		
 		// Check the information_schema.collations table is accessible
-		CMMCPResult *result = [connection queryString:@"SHOW TABLES IN information_schema LIKE 'character_sets'"];
+		MCPResult *result = [connection queryString:@"SHOW TABLES IN information_schema LIKE 'character_sets'"];
 		
 		if ([result numOfRows] == 1) {
 			// Table is accessible so get available encodings for the supplied encoding
@@ -439,7 +437,7 @@ const CHAR_SETS charsets[] =
 {
 	NSMutableArray *array = [NSMutableArray array];
 	
-	CMMCPResult *result = [connection queryString:query];
+	MCPResult *result = [connection queryString:query];
 	
 	// Log any errors
 	if ([[connection getLastErrorMessage] isEqualToString:@""]) {